Browse Source

automake: full ppp/ support

* Remove ppp/Makefile.legacy
* The ppp/Makefile.am includes complete functionality

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
master
Oron Peled 7 years ago
committed by Tzafrir Cohen
parent
commit
5ac7fef4b2
  1. 4
      Makefile.am
  2. 3
      configure.ac
  3. 17
      ppp/Makefile.am
  4. 29
      ppp/Makefile.legacy

4
Makefile.am

@ -7,6 +7,10 @@ LEGACY_MAKE = \
SUBDIRS = xpp
if PPPD
SUBDIRS += ppp
endif
all-local:
$(LEGACY_MAKE) all

3
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. *** ])

17
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

29
ppp/Makefile.legacy

@ -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
Loading…
Cancel
Save