X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fplugins%2Fradius%2FMakefile.linux;h=26bacec88b9373eeaee556c4517c73c3b9e76199;hp=30a3ac40de500653b20c1db1e9aeed3bec7151d8;hb=750475927f15964be39a8bdda8ea2f57c764f846;hpb=b2f8595268e72c1668eb8f2e4d942b6290266db5

diff --git a/pppd/plugins/radius/Makefile.linux b/pppd/plugins/radius/Makefile.linux
index 30a3ac4..26bacec 100644
--- a/pppd/plugins/radius/Makefile.linux
+++ b/pppd/plugins/radius/Makefile.linux
@@ -3,9 +3,21 @@
 # Copyright 2002 Roaring Penguin Software Inc.
 #
 
-MANDIR=/usr/man
-PLUGIN=radius.so radattr.so
-CFLAGS=-I../.. -I../../../include -Iradiusclient/include -O2
+CROSS_COMPILE=@CROSS_COMPILE@
+CC=$(CROSS_COMPILE)@CC@
+COPTS=@CFLAGS@
+
+PREFIX = @DESTDIR@
+DESTDIR = $(INSTROOT)$(PREFIX)
+MANDIR = $(DESTDIR)/share/man/man8
+LIBDIR = $(INSTROOT)@LIBDIR@
+VERSION = @VERSION@
+PLUGINDIR = $(LIBDIR)/pppd/$(VERSION)
+
+INSTALL	= install
+
+PLUGIN=radius.so radattr.so radrealms.so
+CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
 
 # Uncomment the next line to include support for Microsoft's
 # MS-CHAP authentication protocol.
@@ -28,40 +40,31 @@ endif
 all: $(PLUGIN)
 
 install: all
-	$(MAKE) $(MFLAGS) -C radiusclient install
-	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
-	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)/man8
-	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)/man8
+	$(INSTALL) -d -m 755 $(PLUGINDIR)
+	$(INSTALL) -c -m 755 radius.so $(PLUGINDIR)
+	$(INSTALL) -c -m 755 radattr.so $(PLUGINDIR)
+	$(INSTALL) -c -m 755 radrealms.so $(PLUGINDIR)
+	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
+	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
 
-radius.so: radiusclient/lib/.libs/libradiusclient.a radius.o
-	gcc -o radius.so -shared radius.o radiusclient/lib/.libs/libradiusclient.a
+radius.so: radius.o libradiusclient.a
+	$(CC) $(LDFLAGS) -o radius.so -shared radius.o libradiusclient.a
 
 radattr.so: radattr.o
-	gcc -o radattr.so -shared radattr.o
-
-radius.o: radius.c
-	gcc $(CFLAGS) -c -o radius.o -fPIC radius.c
+	$(CC) $(LDFLAGS) -o radattr.so -shared radattr.o
 
-radattr.o: radattr.c
-	gcc $(CFLAGS) -c -o radattr.o -fPIC radattr.c
+radrealms.so: radrealms.o
+	$(CC) $(LDFLAGS) -o radrealms.so -shared radrealms.o
 
-radiusclient/lib/.libs/libradiusclient.a:
-	test -r radiusclient/Makefile ||           \
-		(cd radiusclient;                  \
-		 ./configure --prefix=/usr         \
-			     --sysconfdir=/etc     \
-			     --enable-shared       \
-			     --enable-static)
-	$(MAKE) -C radiusclient
+CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
+	clientid.o sendserver.o lock.o util.o md5.o
+libradiusclient.a: $(CLIENTOBJS)
+	$(AR) rv $@ $?
 
 clean:
-	$(MAKE) $(MFLAGS) -C radiusclient clean
-	rm -f *.o *.so
+	rm -f *.o *.so *.a
 
 distclean:
-	rm -f *.o *.so
-	$(MAKE) $(MFLAGS) -C radiusclient distclean
+	rm -f *.o *.so *.a
 
 dist-clean: distclean