XPP revision 3965:

* Tested with zaptel-1.2.17.1
* Add D-Channel TX, RX and BAD frames count in /proc/xpp/XBUS-*/XPD-*/bri_info
* Adjust output of xpp_sync script. Pad for 8 port BRI.
* Added a debugging module parport_debug (not compiled by default).
* Added an optional patch to zaptel:
    - compiles only if ZAPTEL_SYNC_TICK is defined
    - Allow interested driver to register for "sync" notification.
    - Does not affect drivers that do not use this feature.
* Added external synchronization feature:
    - Only if ZAPTEL_SYNC_TICK feature is compiled in
    - Than XPP may be synchronized by another card (e.g: an Astribank
      with FXS can be synchronized by a Digium PRI card).
    - May be enabled/disabled in runtime via the 'sync_tick_active' module
      parameter to the xpp.ko module.
* Fixed a potential bug in D-Channel hexdump printing.
* New visual indications in BRI leds:
    - Constant ON RED/GREEN: Shows the port type -- NT/TE.
    - Very fast "double blink": Layer1 work, no D-Channel yet.
    - Steady blinking (1/2 sec): D-Channel trafic detected.
* xpp_fxloader moved to /usr/share/zaptel .
* adj_clock removed: never really used.
* Now we have Zaptel::Hardware and a sample zaptel_hardware script (not
  (installed by default).
* We also have a sample perl zapconf (not installed by default) which
  aims at replacing genzaptelconf (sans the modules detection).


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

1 files changed, 10 insertions, 9 deletions

diff --git a/xpp/utils/Makefile b/xpp/utils/Makefile
index 03ea61c..f9d034a 100644
--- a/xpp/utils/Makefile
+++ b/xpp/utils/Makefile
@@ -23,12 +23,14 @@ 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")
+PERL_DIRS	:= Zaptel Zaptel/Hardware Zaptel/Xpp
+PERL_MODS_PAT	:= *.pm $(PERL_DIRS:%=%/*.pm)
+PERL_MODS	:= $(shell cd zconf; echo $(PERL_MODS_PAT))
 
 XPD_FIRMWARE	= $(wildcard ../firmwares/*.hex)
 XPD_INIT_DATA	= $(XPD_FIRMWARE) init_fxo_modes
-XPD_INIT	= $(wildcard ../init_card_?_*) ../calibrate_slics
+XPD_INIT	= $(wildcard ../init_card_?_*) ../calibrate_slics xpp_fxloader
 
 # Variables that should be defined above, but need sane defaults:
 # FIXME: Are those values really sane?
@@ -50,16 +52,14 @@ PERL_SCRIPTS	= zt_registration xpp_sync lszaptel xpp_blink
 PERL_MANS	= $(PERL_SCRIPTS:%=%.8)
 
 TARGETS	= init_fxo_modes print_modes
-PROG_INSTALL	= genzaptelconf 
-MAN_INSTALL	= genzaptelconf.8
+PROG_INSTALL	= genzaptelconf
+MAN_INSTALL	= $(PROG_INSTALL:%=%.8)
 ifeq	(1,$(PBX_LIBUSB))
 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)
 TARGETS		+= $(PERL_MANS)
 endif
 
@@ -77,16 +77,17 @@ install: all
 	$(INSTALL_DATA) $(MAN_INSTALL) $(DESTDIR)$(MANDIR)/
 	$(INSTALL) -d $(DESTDIR)$(HOTPLUG_USB_DIR)
 	$(INSTALL_DATA) xpp_fxloader.usermap $(DESTDIR)$(HOTPLUG_USB_DIR)/
-	$(INSTALL) xpp_fxloader $(DESTDIR)$(HOTPLUG_USB_DIR)/
+	# for backward compatibility and for hotplug users:
+	ln -sf $(DATADIR)/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; \
+	for i in $(PERL_DIRS); \
 	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; \
+	for i in $(PERL_MODS); \
 	do \
 		$(INSTALL_DATA) "zconf/$$i" "$(DESTDIR)$(PERLLIBDIR)/$$i"; \
 	done