diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-28 01:23:19 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-28 01:23:19 +0000 |
| commit | ff8823199f375d709a689dd017950d575b649df6 (patch) | |
| tree | 7244e80bb45da5f27b747c8bc9aee36b984dd5cd /xpp/Makefile | |
| parent | 121cb4b570046fe612938d1eb401181c970b4636 (diff) | |
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
Diffstat (limited to 'xpp/Makefile')
| -rw-r--r-- | xpp/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xpp/Makefile b/xpp/Makefile index bf4b14b..2162ab3 100644 --- a/xpp/Makefile +++ b/xpp/Makefile @@ -1,5 +1,7 @@ +ZAPTEL_DIR = $(SUBDIRS) + EXTRA_CFLAGS = $(XPP_LOCAL_CFLAGS) \ - -g3 -I$(SUBDIRS) \ + -g3 -I$(ZAPTEL_DIR) \ -DDEBUG \ -DPOLL_DIGITAL_INPUTS \ -DWITH_ECHO_SUPPRESSION \ @@ -8,9 +10,6 @@ EXTRA_CFLAGS = $(XPP_LOCAL_CFLAGS) \ ifneq (,$(filter y m,$(CONFIG_DEBUG_FS))) EXTRA_CFLAGS += -DXPP_DEBUGFS endif - -ZAPTEL_DIR = $(SUBDIRS) - ifneq (,$(shell grep -w echo_can_state_t $(ZAPTEL_DIR)/zaptel.h)) EXTRA_CFLAGS += -DZAPTEL_EC_TYPEDEF endif @@ -42,6 +41,7 @@ clean-files := xpp_version.h $(obj)/card_fxs.o $(obj)/card_fxo.o $(obj)/card_bri.o $(obj)/xpp_usb.o $(obj)/xpp.o: $(obj)/xpp_version.h $(obj)/xpp_version.h: FORCE + $(Q)echo "Compile for $(XPP_VERSION_STR)" $(Q)echo '#define XPP_VERSION $(XPP_VERSION_STR)' > $@.tmp $(Q)if cmp -s $@.tmp $@ ; then echo; else \ mv $@.tmp $@ ; \ |