rearrange, add pppoe

diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
index a64256461ba48a2689b8dcc583f221fe509dec28..320f708c04447b7c8b3bffb2907095e98f84c390 100644 (file)
--- a/pppd/plugins/Makefile.linux
+++ b/pppd/plugins/Makefile.linux
@@ -1,19 +1,34 @@
 CC     = gcc
 CC     = gcc

-CFLAGS = -g -O2 -I.. -I../../include -fPIC
+CFLAGS = -g -O2 -I.. -I../../include -D_linux_=1 -fPIC

 LDFLAGS        = -shared
 LDFLAGS        = -shared

-INSTALL        = install
+INSTALL        = install -o root

 
 

-all:   minconn.so passprompt.so
+SUBDIRS = pppoe
+PLUGINS = minconn.so passprompt.so

 
 

-minconn.so: minconn.c
-       $(CC) -o $@ $(LDFLAGS) $(CFLAGS) minconn.c
+# include dependencies if present
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif

 
 

-passprompt.so: passprompt.c
-       $(CC) -o $@ $(LDFLAGS) $(CFLAGS) passprompt.c
+all:   $(PLUGINS)
+       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done

 
 

-LIBDIR = /usr/lib/pppd
+%.so: %.c
+       $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^

 
 

-install: minconn.so passprompt.so
-       version=`awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h`; \
-       $(INSTALL) -d $(LIBDIR)/$$version; \
-       $(INSTALL) $? $(LIBDIR)/$$version
\ No newline at end of file
+VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
+LIBDIR = /usr/lib/pppd/$(VERSION)
+
+install: $(PLUGINS)
+       $(INSTALL) -d $(LIBDIR)
+       $(INSTALL) $? $(LIBDIR)
+       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d LIBDIR=$(LIBDIR) install; done
+
+clean:
+       rm -f *.o *.so *.a
+       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d clean; done
+
+depend:
+       $(CPP) -M $(CFLAGS) *.c >.depend
+       for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d depend; done