[Pkg-voip-commits] [dahdi-tools] 230/285: automake: full ppp/ support

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-tools.

commit 5ac7fef4b2440fd62be63896ed54e349f51290da
Author: Oron Peled <oron.peled at xorcom.com>
Date:   Sun Dec 21 09:11:11 2014 -0500

    automake: full ppp/ support
    
    * Remove ppp/Makefile.legacy
    * The ppp/Makefile.am includes complete functionality
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
---
 Makefile.am         |  4 ++++
 configure.ac        |  3 +++
 ppp/Makefile.am     | 17 +++++------------
 ppp/Makefile.legacy | 29 -----------------------------
 4 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6dc1595..fe4e28f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,10 @@ LEGACY_MAKE	= \
 
 SUBDIRS	= xpp
 
+if PPPD
+SUBDIRS	+= ppp
+endif
+
 all-local:
 	$(LEGACY_MAKE)  all
 
diff --git a/configure.ac b/configure.ac
index b4c2a5b..0baec5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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. *** ])
diff --git a/ppp/Makefile.am b/ppp/Makefile.am
index 6f8fc04..5430953 100644
--- a/ppp/Makefile.am
+++ b/ppp/Makefile.am
@@ -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
index 3ad91a0..0000000
--- a/ppp/Makefile.legacy
+++ /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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-tools.git