diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | kernel/GNUmakefile | 34 |
2 files changed, 11 insertions, 25 deletions
@@ -165,6 +165,8 @@ KFLAGS+=-DSTANDALONE_ZAPATA 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 \ diff --git a/kernel/GNUmakefile b/kernel/GNUmakefile index 3ec8aa6..6da0928 100644 --- a/kernel/GNUmakefile +++ b/kernel/GNUmakefile @@ -67,7 +67,10 @@ MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp 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 @@ makefw: makefw.c 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 @@ wcusb.o: wcusb.h 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 @@ zaptel.o: zaptel-base.o $(ZAPTEL_HPEC) $(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 @@ distclean: dist-clean 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 |