diff options
author | russell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-20 20:19:15 +0000 |
---|---|---|
committer | russell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-20 20:19:15 +0000 |
commit | 9e2ec942aca54fb485136946caa845573f5c7b91 (patch) | |
tree | 18a9e249ff1c2a095701afc4517cf6b22065d463 | |
parent | fa01672f9f3f36146036acb1add4a3bf2f839186 (diff) |
Merged revisions 2180 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
........
r2180 | russell | 2007-02-20 14:17:46 -0600 (Tue, 20 Feb 2007) | 3 lines
Fix the check that ran the install for xpp/utils. Also, add a target to build
them, and clean the directory in the clean target. (issue #8894, tzafrir)
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2181 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r-- | Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -7,7 +7,7 @@ .EXPORT_ALL_VARIABLES: -.PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules linux24 linux26 xpp tests devel data stackcheck install-udev config update install-programs install-modules install-linux24 install-linux26 firmware install-include install-libs xpp-install +.PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules linux24 linux26 xpp tests devel data stackcheck install-udev config update install-programs install-modules install-linux24 install-linux26 firmware install-include install-libs xpp-install xpp-utils PWD=$(shell pwd) @@ -179,7 +179,12 @@ all: menuselect.makeopts _all: $(if $(MODULES),modules) programs $(LTZ_SO) $(LTZ_A) -programs: $(BINS) +xpp-utils: +ifeq (yes,$(BUILD_XPP)) + @$(MAKE) -C xpp/utils +endif + +programs: $(BINS) xpp-utils modules: $(BUILDVER) @@ -368,7 +373,7 @@ hotplug-uninstall: $(MAKE) -C firmware hotplug-uninstall xpp-install: -ifneq (,$(findstring xpp,$(obj-m))) +ifeq (yes,$(BUILD_XPP)) @$(MAKE) -C xpp/utils install endif @@ -502,6 +507,7 @@ else $(MAKE) -C datamods clean endif $(MAKE) -C firmware clean + -@$(MAKE) -C xpp/utils clean rm -f xpp/*.ko xpp/*.mod.c xpp/.*o.cmd rm -f xpp/*.o xpp/*.mod.o rm -rf .tmp_versions |