[zaptel-commits] tzafrir: branch 1.4 r3921 - in /branches/1.4: Makefile kernel/GNUmakefile

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Mon Mar  3 16:04:02 2008
New Revision: 3921

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3921
Log:
* Pass some extra variables explicitly in the 2.4 build.
* Clean up the 2.4 kernel GNUMakefile.

Should hopefully fix issue #12056.

Modified:
    branches/1.4/Makefile
    branches/1.4/kernel/GNUmakefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=3921&r1=3920&r2=3921
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Mon Mar  3 16:04:02 2008
@@ -165,6 +165,8 @@
 CFLAGS+=-DSTANDALONE_ZAPATA
 ifeq ($(BUILDVER),linux24)
 KMAKE	= $(MAKE) -C kernel HOTPLUG_FIRMWARE=no \
+  HOSTCC=$(HOSTCC) ARCH=$(ARCH) KSRC=$(KSRC) LD=$(LD) CC=$(CC) \
+  UNAME_M=$(UNAME_M) \
   BUILD_TOPDIR_MODULES="$(BUILD_TOPDIR_MODULES)" BUILD_SUBDIR_MODULES="$(BUILD_SUBDIR_MODULES)"
 else
 KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/kernel \

Modified: branches/1.4/kernel/GNUmakefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/GNUmakefile?view=diff&rev=3921&r1=3920&r2=3921
==============================================================================
--- branches/1.4/kernel/GNUmakefile (original)
+++ branches/1.4/kernel/GNUmakefile Mon Mar  3 16:04:02 2008
@@ -67,7 +67,10 @@
 
 KFLAGS+=-DSTANDALONE_ZAPATA
 
-MOD_DIR:=$(DESTDIR)/lib/modules/$(KVERS)/misc
+MOD_DIR:=/lib/modules/$(KVERS)/misc
+
+MAKE_SUBDIR	= $(MAKE) CC=$(CC) LD=$(LD) \
+		  KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
 
 all: modules
 
@@ -99,7 +102,7 @@
 modules: $(ALL_MODULES)
 
 wct4xxp/wct4xxp.o:
-	$(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+	$(MAKE_SUBDIR) -C wct4xxp
 
 tor2.o: tor2-hw.h tor2fw.h
 
@@ -110,10 +113,10 @@
 wctdm.o: wctdm.h
 
 wctdm24xxp/wctdm24xxp.o:
-	$(MAKE) -C wctdm24xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+	$(MAKE_SUBDIR) -C wctdm24xxp
 
 wcte12xp/wcte12xp.o:
-	$(MAKE) -C wcte12xp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
+	$(MAKE_SUBDIR) -C wcte12xp
 
 pciradio.o: radfw.h
 
@@ -125,30 +128,11 @@
 $(filter-out zaptel.o,$(BUILD_TOPDIR_MODULES:%=%.o)) zaptel-base.o: %.o: %.c zaptel.h
 	$(CC) $(KFLAGS) -o $@ -c $<
 
-install: all devices install-modules install-programs install-firmware
-	@echo "###################################################"
-	@echo "###"
-	@echo "### Zaptel installed successfully."
-	@echo "### If you have not done so before, install init scripts with:"
-	@echo "###"
-	@echo "###   make config"
-	@echo "###"
-	@echo "###################################################"
-
-BASENAMES=$(sort $(shell for x in $(ALL_MODULES); do basename $x; done))
-uninstall-modules:
-
-BASENAMES=$(sort $(shell for mod in $(ALL_MODULES); do basename $$mod; done))
-
-install-modules: $(INSTALL_MODULES) uninstall-modules
-	$(INSTALL) -d $(DESTDIR)$(MOD_DIR)
-	$(INSTALL) -m 644 $(INSTALL_MODULES) $(DESTDIR)$(MOD_DIR)
-	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
 
 clean:
 	rm -f makefw tor2fw.h radfw.h
 	rm -f *.o 
-	$(MAKE) -C wct4xxp clean
+	$(MAKE_SUBDIR) -C wct4xxp clean
 	rm -rf .tmp_versions
 	rm -f core
 
@@ -156,5 +140,5 @@
 
 dist-clean: clean
 
-.PHONY: menuselect distclean dist-clean clean all _all install modules config install-modules uninstall-modules
+.PHONY: distclean dist-clean clean all modules