]>
Commit | Line | Data |
---|---|---|
67872052 JR |
1 | --- fvwm-1.24r/modules/GoodStuff/Imakefile.orig Wed Sep 14 14:18:20 1994 |
2 | +++ fvwm-1.24r/modules/GoodStuff/Imakefile Thu Nov 2 20:57:05 1995 | |
3 | @@ -16,7 +16,7 @@ | |
4 | ||
5 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
6 | ||
7 | -#ifdef AlphaArchitecture | |
8 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
9 | LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib | |
10 | #else | |
11 | LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib | |
12 | --- fvwm-1.24r/modules/FvwmBanner/Imakefile.orig Wed Sep 14 14:11:32 1994 | |
13 | +++ fvwm-1.24r/modules/FvwmBanner/Imakefile Thu Nov 2 20:56:20 1995 | |
14 | @@ -15,7 +15,7 @@ | |
15 | ||
16 | DEPLIBS = $(DEPXLIB) | |
17 | ||
18 | -#ifdef AlphaArchitecture | |
19 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
20 | LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib | |
21 | #else | |
22 | LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib | |
23 | --- fvwm-1.24r/modules/FvwmDebug/Imakefile.orig Wed Sep 14 14:16:45 1994 | |
24 | +++ fvwm-1.24r/modules/FvwmDebug/Imakefile Thu Nov 2 20:56:27 1995 | |
25 | @@ -12,7 +12,7 @@ | |
26 | ||
27 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
28 | ||
29 | -#ifdef AlphaArchitecture | |
30 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
31 | LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib | |
32 | #else | |
33 | LOCAL_LIBRARIES = -L../../libs -lfvwmlib | |
34 | --- fvwm-1.24r/modules/FvwmClean/Imakefile.orig Wed Sep 14 14:16:37 1994 | |
35 | +++ fvwm-1.24r/modules/FvwmClean/Imakefile Thu Nov 2 20:56:23 1995 | |
36 | @@ -13,7 +13,7 @@ | |
37 | ||
38 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
39 | ||
40 | -#ifdef AlphaArchitecture | |
41 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
42 | LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib | |
43 | #else | |
44 | LOCAL_LIBRARIES = -L../../libs -lfvwmlib | |
45 | --- fvwm-1.24r/modules/FvwmSave/Imakefile.orig Wed Sep 14 14:17:41 1994 | |
46 | +++ fvwm-1.24r/modules/FvwmSave/Imakefile Thu Nov 2 20:56:45 1995 | |
47 | @@ -12,7 +12,7 @@ | |
48 | ||
49 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
50 | ||
51 | -#ifdef AlphaArchitecture | |
52 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
53 | LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib | |
54 | #else | |
55 | LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib | |
56 | --- fvwm-1.24r/modules/FvwmIdent/Imakefile.orig Wed Sep 14 14:17:18 1994 | |
57 | +++ fvwm-1.24r/modules/FvwmIdent/Imakefile Thu Nov 2 20:56:35 1995 | |
58 | @@ -12,7 +12,7 @@ | |
59 | ||
60 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
61 | ||
62 | -#ifdef AlphaArchitecture | |
63 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
64 | LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib | |
65 | #else | |
66 | LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib | |
67 | --- fvwm-1.24r/modules/FvwmPager/Imakefile.orig Fri Oct 7 12:49:27 1994 | |
68 | +++ fvwm-1.24r/modules/FvwmPager/Imakefile Thu Nov 2 20:56:39 1995 | |
69 | @@ -13,7 +13,7 @@ | |
70 | ||
71 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
72 | ||
73 | -#ifdef AlphaArchitecture | |
74 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
75 | LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib | |
76 | #else | |
77 | LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib | |
78 | --- fvwm-1.24r/modules/FvwmWinList/Imakefile.orig Wed Sep 14 14:18:10 1994 | |
79 | +++ fvwm-1.24r/modules/FvwmWinList/Imakefile Thu Nov 2 20:57:01 1995 | |
80 | @@ -14,7 +14,7 @@ | |
81 | ||
82 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
83 | ||
84 | -#ifdef AlphaArchitecture | |
85 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
86 | LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib | |
87 | #else | |
88 | LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib | |
89 | --- fvwm-1.24r/modules/FvwmScroll/Imakefile.orig Wed Sep 14 14:17:59 1994 | |
90 | +++ fvwm-1.24r/modules/FvwmScroll/Imakefile Thu Nov 2 20:56:57 1995 | |
91 | @@ -12,7 +12,7 @@ | |
92 | ||
93 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
94 | ||
95 | -#ifdef AlphaArchitecture | |
96 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
97 | LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib | |
98 | #else | |
99 | LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib | |
100 | --- fvwm-1.24r/modules/FvwmBacker/Imakefile.orig Wed Sep 21 19:21:05 1994 | |
101 | +++ fvwm-1.24r/modules/FvwmBacker/Imakefile Thu Nov 2 20:56:12 1995 | |
102 | @@ -14,7 +14,7 @@ | |
103 | ||
104 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
105 | ||
106 | -#ifdef AlphaArchitecture | |
107 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
108 | LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib | |
109 | #else | |
110 | LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib | |
111 | --- fvwm-1.24r/modules/FvwmAudio/Imakefile.orig Wed Sep 14 14:13:44 1994 | |
112 | +++ fvwm-1.24r/modules/FvwmAudio/Imakefile Thu Nov 2 20:55:45 1995 | |
113 | @@ -29,7 +29,7 @@ | |
114 | ||
115 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
116 | ||
117 | -#ifdef AlphaArchitecture | |
118 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
119 | LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib | |
120 | #else | |
121 | LOCAL_LIBRARIES = -L../../libs -lfvwmlib | |
122 | --- fvwm-1.24r/modules/FvwmIconBox/Imakefile.orig Wed Sep 14 14:17:06 1994 | |
123 | +++ fvwm-1.24r/modules/FvwmIconBox/Imakefile Thu Nov 2 20:56:31 1995 | |
124 | @@ -16,7 +16,7 @@ | |
125 | ||
126 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
127 | ||
128 | -#ifdef AlphaArchitecture | |
129 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
130 | LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib | |
131 | #else | |
132 | LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib | |
133 | --- fvwm-1.24r/modules/FvwmSaveDesk/Imakefile.orig Wed Sep 14 14:17:50 1994 | |
134 | +++ fvwm-1.24r/modules/FvwmSaveDesk/Imakefile Thu Nov 2 20:56:49 1995 | |
135 | @@ -12,7 +12,7 @@ | |
136 | ||
137 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
138 | ||
139 | -#ifdef AlphaArchitecture | |
140 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
141 | LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib | |
142 | #else | |
143 | LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib | |
144 | --- fvwm-1.24r/modules/FvwmAuto/Imakefile.orig Fri Dec 2 19:04:02 1994 | |
145 | +++ fvwm-1.24r/modules/FvwmAuto/Imakefile Thu Nov 2 20:56:09 1995 | |
146 | @@ -13,7 +13,7 @@ | |
147 | ||
148 | DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a | |
149 | ||
150 | -#ifdef AlphaArchitecture | |
151 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
152 | LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib | |
153 | #else | |
154 | LOCAL_LIBRARIES = -L../../libs -lfvwmlib | |
155 | --- fvwm-1.24r/fvwm/Imakefile.orig Fri Sep 16 14:36:44 1994 | |
156 | +++ fvwm-1.24r/fvwm/Imakefile Thu Nov 2 20:54:35 1995 | |
157 | @@ -17,7 +17,11 @@ | |
158 | DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a | |
159 | ||
160 | #ifdef AlphaArchitecture | |
161 | +#ifdef LinuxArchitecture | |
162 | +LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -lfvwmlib -L../libs | |
163 | +#else | |
164 | LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib | |
165 | +#endif /* LinuxArchitecture */ | |
166 | #else | |
167 | #ifdef HPArchitecture | |
168 | LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -lV3 -L../libs -lfvwmlib | |
169 | --- fvwm-1.24r/fvwm/alpha_header.h.orig Thu Nov 2 21:03:37 1995 | |
170 | +++ fvwm-1.24r/fvwm/alpha_header.h Thu Nov 2 21:03:53 1995 | |
171 | @@ -1,3 +1,5 @@ | |
172 | +#ifndef __linux__ | |
173 | + | |
174 | /**************************************************************************/ | |
175 | /* If I do ALL this, I can compile OK with -Wall -Wstrict-prototypes on the | |
176 | * alpha's */ | |
177 | @@ -16,3 +18,4 @@ | |
178 | extern int gethostname (char *, int); | |
179 | /**************************************************************************/ | |
180 | ||
181 | +#endif | |
182 | --- fvwm-1.24r/xpmroot/Imakefile.orig Fri Nov 3 13:25:08 1995 | |
183 | +++ fvwm-1.24r/xpmroot/Imakefile Fri Nov 3 13:25:09 1995 | |
184 | @@ -15,7 +15,7 @@ | |
185 | ||
186 | DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a | |
187 | ||
188 | -#ifdef AlphaArchitecture | |
189 | +#if defined(AlphaArchitecture) && !defined(LinuxArchitecture) | |
190 | LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib | |
191 | #else | |
192 | LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../libs -lfvwmlib |