automake: full ppp/ support
authorOron Peled <oron.peled@xorcom.com>
Sun, 21 Dec 2014 14:11:11 +0000 (09:11 -0500)
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>
Tue, 19 May 2015 13:31:57 +0000 (16:31 +0300)
* Remove ppp/Makefile.legacy
* The ppp/Makefile.am includes complete functionality

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

Makefile.am
configure.ac
ppp/Makefile.am
ppp/Makefile.legacy [deleted file]

index 6dc1595..fe4e28f 100644 (file)
@@ -7,6 +7,10 @@ LEGACY_MAKE    = \
 
 SUBDIRS        = xpp
 
+if PPPD
+SUBDIRS        += ppp
+endif
+
 all-local:
        $(LEGACY_MAKE)  all
 
index b4c2a5b..0baec5b 100644 (file)
@@ -209,6 +209,9 @@ case "$with_ppp" in
        ;;
 esac
 
+AC_SUBST(PPPD_VERSION)
+AM_CONDITIONAL([PPPD], [test "$PPPD_VERSION" != ''])
+
 if test "x${PBX_DAHDI}" != "x1"; then
    AC_MSG_NOTICE([***])
    AC_MSG_NOTICE([*** Building this package requires DAHDI support. *** ])
index 6f8fc04..5430953 100644 (file)
@@ -1,14 +1,7 @@
-LEGACY_MAKE    = \
-        $(MAKE) -f $(srcdir)/Makefile.legacy \
-               top_srcdir=$(top_srcdir) \
-               srcdir=$(srcdir)
+plugindir              = $(libdir)/pppd/$(PPPD_VERSION)
+plugin_LTLIBRARIES     = dahdi.la
 
-all-local:
-       $(LEGACY_MAKE)  all
+dahdi_la_CFLAGS                = $(DAHDI_INCLUDE)
+dahdi_la_LDFLAGS       = -module -avoid-version
 
-clean-local:
-       $(LEGACY_MAKE)  clean
-
-# Cannot allow this yet
-distclean:
-maintainer-clean:
+CLEANFILES             = dahdi.so
diff --git a/ppp/Makefile.legacy b/ppp/Makefile.legacy
deleted file mode 100644 (file)
index 3ad91a0..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#COPTS = -O2 -g
-
--include ../makeopts
-
-CFLAGS         += $(COPTS) -fPIC $(DAHDI_INCLUDE)
-LDFLAGS                += -shared
-
-INCLUDE_DIR    = $(includedir)/pppd
-
-LIBDIR         = $(libdir)/pppd/$(PPPD_VERSION)
-
-PLUGINS := dahdi.so
-
-all:   $(PLUGINS)
-
-%.so: %.c
-ifeq (,$(PPPD_VERSION))
-       @echo "pppd version not found (in patchlevel.h)."
-       @echo "Install ppp source/headers and/or ./configure --with-ppp=PATH."
-       exit 1
-endif
-       $(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) 
-
-install: $(PLUGINS)
-       $(INSTALL) -d $(DESTDIR)$(LIBDIR)
-       $(INSTALL) -m 0644 $? $(DESTDIR)$(LIBDIR)
-
-clean:
-       rm -f *.o *.so *.a