[Pkg-voip-commits] [dahdi-tools] 237/285: automake: migrate tools from Makefile.legacy
tzafrir at debian.org
tzafrir at debian.org
Thu Jul 7 19:19:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master
in repository dahdi-tools.
commit bf9500ab32eb2f17e3e0f8f93b31d50acb434798
Author: Oron Peled <oron.peled at xorcom.com>
Date: Sun Dec 21 15:10:31 2014 -0500
automake: migrate tools from Makefile.legacy
Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
---
Makefile.am | 65 +++++++++++++++++++++++++++
Makefile.legacy | 137 +++-----------------------------------------------------
configure.ac | 3 ++
3 files changed, 75 insertions(+), 130 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index ef38b0a..571653d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,12 +5,75 @@ LEGACY_MAKE = \
top_srcdir=$(top_srcdir) \
srcdir=$(srcdir)
+CFLAGS = -g -Wall $(DAHDI_INCLUDE)
+
SUBDIRS = xpp doc
if PPPD
SUBDIRS += ppp
endif
+sbin_PROGRAMS = \
+ dahdi_test \
+ dahdi_maint \
+ dahdi_monitor \
+ dahdi_cfg \
+ dahdi_speed \
+ dahdi_scan \
+ fxotune
+
+noinst_PROGRAMS = \
+ fxstest \
+ patgen \
+ pattest \
+ patlooptest \
+ dahdi_diag \
+ timertest
+
+sbin_SCRIPTS = \
+ dahdi_span_assignments \
+ dahdi_waitfor_span_assignments \
+ dahdi_span_types
+
+if PBX_HDLC
+sbin_PROGRAMS += sethdlc
+noinst_PROGRAMS += hdlcstress hdlctest hdlcgen hdlcverify
+endif
+
+# Libtool versioning for libtonezone:
+# Bump when interface changes
+LTZ_CURRENT = 2
+# Bump if interface change is backward compatible
+LTZ_AGE = 0
+# Bump if only implementation change
+LTZ_REVISION = 0
+
+lib_LTLIBRARIES = libtonezone.la
+
+libtonezone_la_SOURCES = \
+ zonedata.c \
+ tonezone.c \
+ version.c
+pkginclude_HEADERS = tonezone.h
+libtonezone_la_CFLAGS = $(CFLAGS) -I$(srcdir) -DBUILDING_TONEZONE
+libtonezone_la_LDFLAGS = -version-info "$(LTZ_CURRENT):$(LTZ_REVISION):$(LTZ_AGE)"
+
+patlooptest_LDADD = libtonezone.la -lm
+fxstest_LDADD = libtonezone.la -lm
+fxotune_LDADD = -lm
+dahdi_speed_CFLAGS = -O2
+
+dahdi_maint_SOURCES = dahdi_maint.c version.c
+
+if PBX_NEWT
+sbin_PROGRAMS += dahdi_tool
+dahdi_tool_CFLAGS = $(CFLAGS) $(NEWT_INCLUDE)
+dahdi_tool_LDADD = $(NEWT_LIB)
+endif
+
+dahdi_cfg_LDFLAGS = -lm -lpthread
+dahdi_cfg_LDADD = libtonezone.la
+
all-local:
$(LEGACY_MAKE) all
@@ -19,6 +82,8 @@ clean-local:
install-exec-hook:
$(LEGACY_MAKE) install
+ @echo "Compatibility symlinks (should be removed in the future)"
+ ln -s libtonezone.so.2.0.0 $(DESTDIR)$(libdir)/libtonezone.so.2.0
dist:
$(LEGACY_MAKE) dist
diff --git a/Makefile.legacy b/Makefile.legacy
index b8b5070..7bbd412 100644
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -5,10 +5,10 @@
#
#
-ifeq ($(strip $(foreach var,clean distclean dist-clean,$(findstring $(var),$(MAKECMDGOALS)))),)
+ifeq ($(strip $(foreach var,clean,$(findstring $(var),$(MAKECMDGOALS)))),)
endif
-ifeq ($(strip $(foreach var,clean distclean dist-clean,$(findstring $(var),$(MAKECMDGOALS)))),)
+ifeq ($(strip $(foreach var,clean,$(findstring $(var),$(MAKECMDGOALS)))),)
ifneq ($(wildcard makeopts),)
include makeopts
endif
@@ -68,39 +68,15 @@ endif
TOOLSVERSION=$(shell build_tools/make_version . dahdi/tools)
-LTZ_A:=libtonezone.a
-LTZ_A_OBJS:=zonedata.o tonezone.o version.o
-LTZ_SO:=libtonezone.so
-LTZ_SO_OBJS:=zonedata.lo tonezone.lo version.o
-LTZ_SO_MAJOR_VER:=2
-LTZ_SO_MINOR_VER:=0
-
# sbindir, libdir, includedir and mandir are defined in makeopts
# (from configure).
-BIN_DIR:=$(sbindir)
LIB_DIR:=$(libdir)
-INC_DIR:=$(includedir)/dahdi
DATA_DIR:=${datadir}/dahdi
CONFIG_DIR:=$(sysconfdir)/dahdi
CONFIG_FILE:=$(CONFIG_DIR)/system.conf
UDEVRULES_DIR:=$(sysconfdir)/udev/rules.d
-# Utilities we build with a standard build procedure:
-UTILS = dahdi_tool dahdi_test dahdi_monitor dahdi_speed sethdlc dahdi_cfg \
- fxstest fxotune dahdi_diag dahdi_scan
-
-# some tests:
-UTILS += patgen pattest patlooptest hdlcstress hdlctest hdlcgen \
- hdlcverify timertest dahdi_maint
-
-BINS:=fxotune dahdi_cfg dahdi_monitor dahdi_speed dahdi_test dahdi_scan dahdi_maint
-ifeq (1,$(PBX_NEWT))
- BINS += dahdi_tool
-endif
-ifeq (1,$(PBX_HDLC))
- BINS += sethdlc
-endif
ASSIGNED_DATA_SCRIPTS:=\
dahdi_handle_device \
dahdi_span_config \
@@ -111,64 +87,20 @@ ASSIGNED_DATA_SCRIPTS:=\
handle_device.d/10-span-types \
handle_device.d/20-span-assignments
-ASSIGNED_UTILS:=dahdi_span_assignments dahdi_span_types \
- dahdi_waitfor_span_assignments
ASSIGNED_CONF:=assigned-spans.conf.sample span-types.conf.sample
-TEST_BINS:=patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest dahdi_maint
# All the man pages. Not just installed ones:
GROFF_PAGES := $(wildcard doc/*.8 xpp/*.8)
GROFF_HTML := $(GROFF_PAGES:%=%.html)
GENERATED_DOCS := $(GROFF_HTML) README.html README.Astribank.html
-all: prereq programs
-
-libs: $(LTZ_SO) $(LTZ_A)
-
-programs: libs utils
-
-utils: $(BINS)
-
-tests: $(TEST_BINS)
-
-$(UTILS): %: %.o
-
-$(UTILS): version.o
-
-%.o: %.c
- $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
-
-%.lo: %.c
- $(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
-
-%: %.o
- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
-
-prereq: config.status
+all:
-dahdi_tool: CFLAGS+=$(NEWT_INCLUDE)
-dahdi_tool: LIBS+=$(NEWT_LIB)
-
-dahdi_speed: CFLAGS+=-O0
-
-$(LTZ_A): $(LTZ_A_OBJS)
- ar rcs $@ $^
- ranlib $@
-
-$(LTZ_SO): $(LTZ_SO_OBJS)
- $(CC) $(CFLAGS) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ -lm
-
-dahdi_cfg: $(LTZ_A)
-dahdi_cfg: LIBS+=-lm -lpthread
dahdi_pcap:
$(CC) $(CFLAGS) dahdi_pcap.c -lpcap -o $@ $<
-fxstest: $(LTZ_SO)
-fxstest: LIBS+=-lm
-fxotune: LIBS+=-lm
-
tonezones.txt: zonedata.c
perl -ne 'next unless (/\.(country|description) = *"([^"]*)/); \
print (($$1 eq "country")? "* $$2\t":"$$2\n");' $< \
@@ -211,58 +143,23 @@ install: all install-programs
install-programs: install-utils install-libs
-install-utils: utils
-ifneq (,$(BINS))
- install -d $(DESTDIR)$(BIN_DIR)
- install $(BINS) $(DESTDIR)$(BIN_DIR)/
-endif
+install-utils:
ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
$(INSTALL) -d $(DESTDIR)$(CONFIG_DIR)
$(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE)
endif
install -d $(DESTDIR)$(DATA_DIR)
tar cf - -C hotplug $(ASSIGNED_DATA_SCRIPTS) | tar xf - -C $(DESTDIR)$(DATA_DIR)/
- install $(ASSIGNED_UTILS) $(DESTDIR)/$(BIN_DIR)/
install -m 644 $(ASSIGNED_CONF) $(DESTDIR)/$(CONFIG_DIR)/
install -d $(DESTDIR)$(BASH_COMP_DIR)
install -m 644 dahdi-bash-completion $(DESTDIR)$(BASH_COMP_FILE)
-install-libs: libs
- $(INSTALL) -d -m 755 $(DESTDIR)/$(LIB_DIR)
- $(INSTALL) -m 755 $(LTZ_A) $(DESTDIR)$(LIB_DIR)/
- $(INSTALL) -m 755 $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
-ifeq (,$(DESTDIR))
- if [ `id -u` = 0 ]; then \
- /sbin/ldconfig || : ;\
- fi
-endif
- rm -f $(DESTDIR)$(LIB_DIR)/$(LTZ_SO)
- $(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
- $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER)
- $(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
- $(DESTDIR)$(LIB_DIR)/$(LTZ_SO)
- # Overwrite the 1.0 links out there. dahdi-tools 2.0.0 installed
- # 1.0 links but dahdi-tools changed them to 2.0 in order to explicitly
- # break applications linked with zaptel. But, this also meant that
- # applications linked with libtonezone.so.1.0 broke when dahdi-tools
- # 2.1.0 was installed.
- $(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
- $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).1.0
- $(LN) -sf $(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) \
- $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).1
+install-libs:
ifneq (no,$(USE_SELINUX))
ifeq (,$(DESTDIR))
/sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO)
endif
endif
- $(INSTALL) -d -m 755 $(DESTDIR)/$(INC_DIR)
- $(INSTALL) -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/
-
-install-tests: tests
-ifneq (,$(TEST_BINS))
- install -d $(DESTDIR)$(BIN_DIR)
- install $(TEST_BINS) $(DESTDIR)$(BIN_DIR)/
-endif
config:
ifneq (,$(COPY_INITD))
@@ -309,32 +206,12 @@ dist:
@./build_tools/make_dist "dahdi-tools" "$(TOOLSVERSION)"
clean:
- rm -f $(BINS) $(TEST_BINS)
- rm -f *.o dahdi_cfg tzdriver sethdlc
- rm -f $(LTZ_SO) $(LTZ_A) *.lo
- rm -f libtonezone*
- rm -f fxotune
+ rm -f *.o tzdriver
rm -f core
- rm -f dahdi_cfg-shared fxstest
rm -rf $(GENERATED_DOCS) *.asciidoc tonezones.txt
rm -f dahdi_pcap
-distclean: dist-clean
-
-dist-clean: clean
- rm -f makeopts
- rm -f config.log config.status
- rm -f .*.d
-
-config.status: configure
- @CFLAGS="" ./configure
- @echo "****"
- @echo "**** The configure script was just executed, so 'make' needs to be"
- @echo "**** restarted."
- @echo "****"
- @exit 1
-
-.PHONY: distclean dist-clean clean all install programs tests devel data config install-programs install-libs prereq dist
+.PHONY: clean all install devel data config install-programs install-libs dist
FORCE:
diff --git a/configure.ac b/configure.ac
index 6ed7c64..f476105 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,8 @@ AST_C_DEFINE_CHECK([DAHDI23], [DAHDI_CONFIG_NTTE], [dahdi/user.h])
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h])
+AM_CONDITIONAL([PBX_NEWT], [test "$PBX_NEWT" = "1"])
+
AC_CHECK_FUNCS([semtimedop])
PBX_HDLC=0
@@ -166,6 +168,7 @@ if test "x${PBX_HDLC}" != "x1"; then
fi
AC_SUBST(PBX_HDLC)
+AM_CONDITIONAL([PBX_HDLC], [test "$PBX_HDLC" = "1"])
AC_ARG_WITH(selinux,
[AS_HELP_STRING([--with-selinux],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-tools.git
More information about the Pkg-voip-commits
mailing list