diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-07 21:20:30 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-07 21:20:30 +0000 |
| commit | 12adaa05721959bf0400a5194d33fa2eeeb60c20 (patch) | |
| tree | 34f18a19326dcc820944332323af2744e0bd21a2 /xpp/Makefile | |
| parent | f0c640e9744f955d52f11ffba02d2397f0c23cfe (diff) | |
don't reference ZAPTEL_DIR before it has been defined
don't print a pointless 'Compile for Unknown' message (if you want a version string, use the top-level version string that we've already created)
use a simpler method of conforming to the 2.6.20 workqueue API... there is no need to document the change in the code, nor #define entries that are only used in one place
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2118 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/Makefile')
| -rw-r--r-- | xpp/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xpp/Makefile b/xpp/Makefile index 1588416..bf4b14b 100644 --- a/xpp/Makefile +++ b/xpp/Makefile @@ -8,12 +8,13 @@ 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 -ZAPTEL_DIR = $(SUBDIRS) - obj-m += xpp.o xpd_fxs.o xpd_fxo.o HAS_BRISTUFF := $(shell cpp $(CPPFLAGS) -dM $(ZAPTEL_DIR)/zconfig.h | sed -n 's/^.*CONFIG_ZAPATA_BRI_DCHANS/y/p') @@ -41,7 +42,6 @@ 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 $@ ; \ |