Merge xpp rev. 3495:

------------------------------------------------------------------------
r2243 | tzafrir | 2007-02-28 02:05:59 +0200 (Wed, 28 Feb 2007) | 4 lines

* xpp rev. 3495: fix a race in the FXO driver of recent weeks.
* Add the Astribank BRI driver (though still needs bristuffed zaptel
  to build and thus will not build by default)

------------------------------------------------------------------------
r2239 | tzafrir | 2007-02-27 08:14:18 +0200 (Tue, 27 Feb 2007) | 18 lines

Xorcom rev. 3491:
 * Version of xpp modules is set from xpp/.version, rather than "unknown".
 * Astribank devices are now initialized in parallel: faster startup
   when there are multiple Astribanks.
 * Re-added support for the old format of /proc/xpp/sync write:
   (echo N 0 > /proc/xpp/sync ) . The new format (SYNC=NN) is preffered.
 * Firmware update to fix a PCM issue.
 * Fixed a build issue with kernel 2.6.8 .
 * Fixed missing initialization in Zaptel::Xpp::Xbus .
 * genzaptelconf will now set FXS ports as LS by default. To set them as 
   KS, use fxs_default_start=ks in /etc/default/zaptel / /etc/sysconfig/zaptel
   (Also a workaround for #7755 ).
 * Groundwork for sync from zaptel master span: if zaptel is built with
   ZAPTEL_SYNC_TIC (see zaptel/team/tzafrir/sync ), xpp will report its 
   drift from the zaptel sync master.
 * USB firmware update: had bad lines checksums (and fxload did not report).
 * fpga_load can now better report bad hex file checksum ;-) .

------------------------------------------------------------------------
r2223 | tzafrir | 2007-02-24 03:05:05 +0200 (Sat, 24 Feb 2007) | 3 lines

Add the Zaptel and Zaptel::Xpp perl modules, and some simple 
utilities that use them. disabled by default for now.

------------------------------------------------------------------------
r2222 | tzafrir | 2007-02-24 02:55:05 +0200 (Sat, 24 Feb 2007) | 2 lines

Make the xpp/utils/Makefile in 1.2 closer to the one in 1.4 .


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2247 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 37 insertions, 3 deletions

diff --git a/xpp/utils/Makefile b/xpp/utils/Makefile
index ef6325d..d54848b 100644
--- a/xpp/utils/Makefile
+++ b/xpp/utils/Makefile
@@ -27,6 +27,8 @@ DATADIR   = $(datadir)/zaptel
 MANDIR    = $(mandir)/man8
 HOTPLUG_USB_DIR = /etc/hotplug/usb
 UDEV_RULES_DIR	= /etc/udev/rules.d
+# Perl disabled by default, until we see it is safe:
+#PERLLIBDIR	= $(shell eval `perl -V:sitelib`; echo "$$sitelib")
 
 XPD_FIRMWARE	= $(wildcard ../firmwares/*.hex)
 XPD_INIT_DATA	= $(XPD_FIRMWARE) init_fxo_modes
@@ -37,10 +39,21 @@ XPD_INIT	= $(wildcard ../init_card_?_*) ../calibrate_slics
 HOSTCC		?= $(CC)
 ZAPTEL_DIR	?= ../..
 
+ifeq	(,$(PBX_LIBUSB))
+# No PBX_LIBUSB? Maybe we compile against zaptel-1.2
+# Let's make a poor man detection of libusb
+PBX_LIBUSB	= $(shell if [ -r /usr/include/usb.h ]; then echo 1; else echo 0; fi)
+endif
+
 WCTDM=$(ZAPTEL_DIR)/wctdm.c
 
 CFLAGS		= -g -Wall $(EXTRA_CFLAGS)
 
+%.8: %
+	pod2man --section 8 $^ > $@ || $(RM) $@
+PERL_SCRIPTS	= zt_registration xpp_sync lszaptel
+PERL_MANS	= zt_registration.8 xpp_sync.8 lszaptel.8
+
 TARGETS	= init_fxo_modes print_modes adj_clock
 PROG_INSTALL	= genzaptelconf adj_clock
 MAN_INSTALL	= genzaptelconf.8 adj_clock.8
@@ -49,12 +62,22 @@ TARGETS	+= libhexfile.a fpga_load test_parse
 PROG_INSTALL	+= fpga_load
 MAN_INSTALL	+= fpga_load.8
 endif
+ifneq	(,$(PERLLIBDIR))
+PROG_INSTALL	+= $(PERL_SCRIPTS)
+MAN_INSTALL	+= $(PERL_MANS)
+endif
 
 all: $(TARGETS)
 
-install: all
-	$(INSTALL) -d $(DESTDIR)$(BINDIR)
-	$(INSTALL) $(PROG_INSTALL) $(DESTDIR)$(BINDIR)/
+docs: $(PERL_MANS)
+
+# give an ugly warning if Timer::Hires is missing:
+sanity_checks:
+	perl -c ../calibrate_slics >/dev/null || true
+
+install: all sanity_checks
+	$(INSTALL) -d $(DESTDIR)$(SBINDIR)
+	$(INSTALL) $(PROG_INSTALL) $(DESTDIR)$(SBINDIR)/
 	$(INSTALL) -d $(DESTDIR)$(DATADIR)
 	$(INSTALL_DATA) $(XPD_INIT_DATA) $(DESTDIR)$(DATADIR)/
 	$(INSTALL) $(XPD_INIT) $(DESTDIR)$(DATADIR)/
@@ -65,6 +88,17 @@ install: all
 	$(INSTALL) xpp_fxloader $(DESTDIR)$(HOTPLUG_USB_DIR)/
 	$(INSTALL) -d $(DESTDIR)$(UDEV_RULES_DIR)
 	$(INSTALL_DATA) xpp.rules $(DESTDIR)$(UDEV_RULES_DIR)/
+ifneq	(,$(PERLLIBDIR))
+	$(INSTALL) -d $(DESTDIR)$(PERLLIBDIR)
+	for i in Zaptel Zaptel/Xpp; \
+	do \
+		$(INSTALL) -d "$(DESTDIR)$(PERLLIBDIR)/$$i"; \
+	done
+	for i in Zaptel.pm Zaptel/Xpp/Xbus.pm Zaptel/Xpp/Xpd.pm Zaptel/Xpp.pm Zaptel/Span.pm Zaptel/Chans.pm; \
+	do \
+		$(INSTALL_DATA) "zconf/$$i" "$(DESTDIR)$(PERLLIBDIR)/$$i"; \
+	done
+endif
 
 libhexfile.a: hexfile.o
 	$(AR) cru $@ $^