]>
Commit | Line | Data |
---|---|---|
9b7c3eb8 JK |
1 | diff -dur freeradius-1.0.1.orig/src/lib/Makefile freeradius-1.0.1/src/lib/Makefile |
2 | --- freeradius-1.0.1.orig/src/lib/Makefile 2004-05-28 09:20:14.000000000 +0200 | |
3 | +++ freeradius-1.0.1/src/lib/Makefile 2004-10-13 15:35:16.352063360 +0200 | |
4 | @@ -40,7 +40,7 @@ | |
5 | ||
6 | $(TARGET).a: $(STATIC_OBJS) | |
7 | $(LIBTOOL) --mode=link $(LD) \ | |
8 | - -module -static $(CFLAGS) $^ -o $@ | |
9 | + -static $(CFLAGS) $^ -lcrypt -o $@ | |
10 | ||
11 | ||
12 | ifneq ($(USE_SHARED_LIBS),yes) | |
13 | @@ -49,7 +49,7 @@ | |
14 | ||
15 | $(TARGET).la: $(DYNAMIC_OBJS) | |
16 | $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ | |
17 | - -module $(LINK_MODE) $(CFLAGS) -o $@ -rpath $(libdir) $^ | |
18 | + $(LINK_MODE) $(CFLAGS) -lcrypt -o $@ -rpath $(libdir) $^ | |
19 | ||
20 | static: $(TARGET).a | |
21 | ||
22 | diff -dur freeradius-1.0.1.orig/src/main/Makefile.in freeradius-1.0.1/src/main/Makefile.in | |
23 | --- freeradius-1.0.1.orig/src/main/Makefile.in 2004-06-02 18:17:06.000000000 +0200 | |
24 | +++ freeradius-1.0.1/src/main/Makefile.in 2004-10-13 15:35:16.353063344 +0200 | |
25 | @@ -57,94 +57,94 @@ | |
26 | $(PTHREADLIB) $(LIBLTDL) $(LCRYPT) | |
27 | ||
28 | radiusd.o: radiusd.c $(INCLUDES) ../include/request_list.h ../include/modules.h ../include/modcall.h ../include/modpriv.h | |
29 | - $(CC) $(CFLAGS) -c radiusd.c | |
30 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radiusd.c | |
31 | ||
32 | acct.o: acct.c $(INCLUDES) ../include/modules.h | |
33 | - $(CC) $(CFLAGS) -c acct.c | |
34 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c acct.c | |
35 | ||
36 | files.o: files.c $(INCLUDES) | |
37 | - $(CC) $(CFLAGS) -c files.c | |
38 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c files.c | |
39 | ||
40 | util.o: util.c $(INCLUDES) | |
41 | - $(CC) $(CFLAGS) -c util.c | |
42 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c util.c | |
43 | ||
44 | nas.o: nas.c $(INCLUDES) | |
45 | - $(CC) $(CFLAGS) -c nas.c | |
46 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c nas.c | |
47 | ||
48 | log.o: log.c $(INCLUDES) | |
49 | - $(CC) $(CFLAGS) -c log.c | |
50 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c log.c | |
51 | ||
52 | conffile.o: conffile.c $(INCLUDES) ../include/modules.h | |
53 | - $(CC) $(CFLAGS) -c conffile.c | |
54 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c conffile.c | |
55 | ||
56 | mainconfig.o: mainconfig.c $(INCLUDES) ../include/modules.h | |
57 | - $(CC) $(CFLAGS) -c mainconfig.c | |
58 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c mainconfig.c | |
59 | ||
60 | timestr.o: timestr.c $(INCLUDES) | |
61 | - $(CC) $(CFLAGS) -c timestr.c | |
62 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c timestr.c | |
63 | ||
64 | modules.o: modules.c $(INCLUDES) | |
65 | - $(CC) $(CFLAGS) $(VFLAGS) $(INCLTDL) -c modules.c | |
66 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(VFLAGS) $(INCLTDL) -c modules.c | |
67 | ||
68 | modcall.o: modcall.c $(INCLUDES) | |
69 | - $(CC) $(CFLAGS) $(INCLTDL) -c modcall.c | |
70 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLTDL) -c modcall.c | |
71 | ||
72 | session.o: session.c $(INCLUDES) ../include/modules.h | |
73 | - $(CC) $(CFLAGS) -c session.c | |
74 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c session.c | |
75 | ||
76 | request_list.o: request_list.c $(INCLUDES) | |
77 | - $(CC) $(CFLAGS) -c request_list.c | |
78 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c request_list.c | |
79 | ||
80 | proxy.o: proxy.c $(INCLUDES) | |
81 | - $(CC) $(CFLAGS) -c proxy.c | |
82 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c proxy.c | |
83 | ||
84 | exec.o: exec.c $(INCLUDES) | |
85 | - $(CC) $(CFLAGS) -c exec.c | |
86 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c exec.c | |
87 | ||
88 | auth.o: auth.c $(INCLUDES) ../include/modules.h | |
89 | - $(CC) $(CFLAGS) -c auth.c | |
90 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c auth.c | |
91 | ||
92 | valuepair.o: valuepair.c $(INCLUDES) | |
93 | - $(CC) $(CFLAGS) -c valuepair.c | |
94 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c valuepair.c | |
95 | ||
96 | version.o: version.c $(INCLUDES) | |
97 | - $(CC) $(CFLAGS) -o version.o -c version.c | |
98 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -o version.o -c version.c | |
99 | ||
100 | xlat.o: xlat.c $(INCLUDES) | |
101 | - $(CC) $(CFLAGS) -o xlat.o -c xlat.c | |
102 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -o xlat.o -c xlat.c | |
103 | ||
104 | threads.o: threads.c $(INCLUDES) | |
105 | - $(CC) $(CFLAGS) -o threads.o -c threads.c | |
106 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -o threads.o -c threads.c | |
107 | ||
108 | smux.o: smux.c $(INCLUDES) | |
109 | - $(CC) $(CFLAGS) -o smux.o -c smux.c | |
110 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -o smux.o -c smux.c | |
111 | ||
112 | radius_snmp.o: radius_snmp.c $(INCLUDES) | |
113 | - $(CC) $(CFLAGS) -o radius_snmp.o -c radius_snmp.c | |
114 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -o radius_snmp.o -c radius_snmp.c | |
115 | ||
116 | radclient: radclient.o ../lib/libradius.a | |
117 | - $(CC) $(CFLAGS) $(LDFLAGS) -o radclient radclient.o $(LIBS) | |
118 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o radclient radclient.o $(LIBS) | |
119 | ||
120 | radclient.o: radclient.c $(INCLUDES) | |
121 | - $(CC) $(CFLAGS) -c radclient.c | |
122 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radclient.c | |
123 | ||
124 | radrelay: radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o ../lib/libradius.a | |
125 | - $(CC) $(CFLAGS) $(LDFLAGS) -o radrelay radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS) | |
126 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o radrelay radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS) | |
127 | ||
128 | radrelay.o: radrelay.c $(INCLUDES) | |
129 | - $(CC) $(CFLAGS) -c radrelay.c | |
130 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radrelay.c | |
131 | ||
132 | radwho.o: radwho.c $(INCLUDES) | |
133 | - $(CC) $(CFLAGS) -c radwho.c | |
134 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radwho.c | |
135 | ||
136 | radwho: radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o | |
137 | - $(CC) $(LDFLAGS) -o radwho radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS) | |
138 | + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o radwho radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS) | |
139 | ||
140 | radzap.o: radzap.c $(INCLUDES) | |
141 | - $(CC) $(CFLAGS) -c radzap.c | |
142 | + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radzap.c | |
143 | ||
144 | radzap: radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o | |
145 | - $(CC) $(CFLAGS) $(LDFLAGS) -o radzap radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o $(LIBS) | |
146 | + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o radzap radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o $(LIBS) | |
147 | ||
148 | clean: | |
149 | rm -rf *.o *.so *~ $(BINARIES) .libs | |
150 | diff -dur freeradius-1.0.1.orig/src/modules/rlm_eap/Makefile.in freeradius-1.0.1/src/modules/rlm_eap/Makefile.in | |
151 | --- freeradius-1.0.1.orig/src/modules/rlm_eap/Makefile.in 2004-01-28 16:38:40.000000000 +0100 | |
152 | +++ freeradius-1.0.1/src/modules/rlm_eap/Makefile.in 2004-10-13 15:36:58.340017666 +0200 | |
153 | @@ -3,7 +3,7 @@ | |
154 | HEADERS = eap.h rlm_eap.h | |
155 | RLM_CFLAGS = $(INCLTDL) -I@srcdir@/libeap | |
156 | CLIENTLIBS = -Llibeap -leap -L../../lib -lradius | |
157 | -RLM_LIBS = -Llibeap -leap | |
158 | +RLM_LIBS = $(top_builddir)/src/modules/rlm_eap/libeap/libeap.la | |
159 | #RLM_LIBS = $(shell for x in types/rlm_eap*/rlm_eap*.la;do echo -dlpreopen $$x;done) | |
160 | RLM_INSTALL = install-types | |
161 | RLM_SUBDIRS = libeap @eaptypes@ | |
162 | diff -dur freeradius-1.0.1.orig/src/modules/rlm_eap/libeap/Makefile freeradius-1.0.1/src/modules/rlm_eap/libeap/Makefile | |
163 | --- freeradius-1.0.1.orig/src/modules/rlm_eap/libeap/Makefile 2003-10-29 03:49:18.000000000 +0100 | |
164 | +++ freeradius-1.0.1/src/modules/rlm_eap/libeap/Makefile 2004-10-13 15:35:16.354063327 +0200 | |
165 | @@ -31,7 +31,7 @@ | |
166 | ||
167 | $(TARGET).a: $(STATIC_OBJS) | |
168 | $(LIBTOOL) --mode=link $(LD) \ | |
169 | - -module -static $(CFLAGS) $^ -o $@ | |
170 | + -static $(CFLAGS) $^ -o $@ | |
171 | ||
172 | ||
173 | ifneq ($(USE_SHARED_LIBS),yes) | |
174 | @@ -40,7 +40,7 @@ | |
175 | ||
176 | $(TARGET).la: $(DYNAMIC_OBJS) | |
177 | $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ | |
178 | - -module $(LINK_MODE) $(CFLAGS) -o $@ -rpath $(libdir) $^ | |
179 | + $(LINK_MODE) $(CFLAGS) -o $@ -rpath $(libdir) $^ | |
180 | ||
181 | static: $(TARGET).a | |
182 | ||
c92c9122 JK |
183 | diff -dur freeradius-1.0.1.orig/src/main/Makefile.in freeradius-1.0.1/src/main/Makefile.in |
184 | --- freeradius-1.0.1.orig/src/main/Makefile.in 2004-10-15 10:46:40.000000000 +0200 | |
185 | +++ freeradius-1.0.1/src/main/Makefile.in 2004-10-15 10:49:00.465445152 +0200 | |
186 | @@ -150,11 +150,11 @@ | |
187 | rm -rf *.o *.so *~ $(BINARIES) .libs | |
188 | ||
189 | install: | |
190 | - $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radiusd$(EXEEXT) $(R)$(sbindir) | |
191 | - $(INSTALL) -m 755 $(INSTALLSTRIP) radwho$(EXEEXT) $(R)$(bindir) | |
192 | - $(INSTALL) -m 755 $(INSTALLSTRIP) radzap$(EXEEXT) $(R)$(bindir) | |
193 | + $(LIBTOOL) --mode=install $(INSTALL) -m 755 radiusd $(R)$(sbindir) | |
194 | + $(LIBTOOL) --mode=install $(INSTALL) -m 755 radwho $(R)$(bindir) | |
195 | + $(LIBTOOL) --mode=install $(INSTALL) -m 755 radzap $(R)$(bindir) | |
196 | $(INSTALL) -m 755 radlast $(R)$(bindir) | |
197 | - $(INSTALL) -m 755 radclient$(EXEEXT) $(R)$(bindir) | |
198 | - $(INSTALL) -m 755 radrelay$(EXEEXT) $(R)$(bindir) | |
199 | + $(LIBTOOL) --mode=install $(INSTALL) -m 755 radclient $(R)$(bindir) | |
200 | + $(LIBTOOL) --mode=install $(INSTALL) -m 755 radrelay $(R)$(bindir) | |
201 | $(INSTALL) -m 755 radtest $(R)$(bindir) | |
202 | $(INSTALL) -m 755 checkrad.pl $(R)$(sbindir)/checkrad |