X-Git-Url: https://git.openfabrics.org/?p=~tnikolova%2Fcompat%2F.git;a=blobdiff_plain;f=Makefile;h=05a7d7250ecaa5365e0b4f0dc0c635573cc1252e;hp=46fda21aa29895fbeeb77e56b8ce7456b39d46e0;hb=600ec7a68cb871efa3e9c2b178839d530dddd468;hpb=fc5c8fc1c1360f3fe62d02d9bb5796fed81b2352;ds=sidebyside

diff --git a/Makefile b/Makefile
index 46fda21..05a7d72 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,8 @@ export KLIB:=          /lib/modules/$(shell uname -r)
 endif
 export KLIB_BUILD ?=    $(KLIB)/build
 
-export PWD := $(shell pwd)
-
 ifeq ($(KERNELRELEASE),)
+export PWD := $(shell pwd)
 export COMPAT_BASE_TREE := "linux-next.git"
 # For this specific tree this is only relevant in
 # terms of the last time we synched code up with upstream
@@ -18,45 +17,62 @@ export COMPAT_BASE_TREE := "linux-next.git"
 # working with.
 export COMPAT_BASE_TREE_VERSION := "next-20100517"
 export COMPAT_VERSION := $(shell git describe)
-endif
-
-# This generates a bunch of CONFIG_COMPAT_KERNEL_22 CONFIG_COMPAT_KERNEL_23 .. etc for
-# each kernel release you need an object for.
-ifneq ($(wildcard $(KLIB_BUILD)/Makefile),)
-COMPAT_LATEST_VERSION = 33
-KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
-COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
-$(foreach ver,$(COMPAT_VERSIONS),$(eval export CONFIG_COMPAT_KERNEL_$(ver)=y))
-endif
 
-ifeq ($(CONFIG_COMPAT_KERNEL_33),y)
-ifneq ($(CONFIG_FW_LOADER),)
- export CONFIG_COMPAT_FIRMWARE_CLASS=m
-endif
-endif
+# This is used to annotate what version of
+# compat.git was used.
+export COMPAT_BASE := $(shell git describe)
 
-obj-y += compat/
+# to check config and compat autoconf
+export COMPAT_CONFIG=$(PWD)/.config
+export COMPAT_AUTOCONF=$(PWD)/include/linux/compat_autoconf.h
+export MAKE
 
+else
+# By stuffing this hear we avoid using
+# this hackery on modpost, the 2nd section of module building.
+#
 # This hack lets us put our include path first than the kernel's
 # when building our compat modules. Your own makefile would look
 # the same.
 NOSTDINC_FLAGS := -I$(M)/include/ \
 	-include $(M)/include/linux/compat-2.6.h \
 	$(CFLAGS) \
-	-DCOMPAT_BASE_TREE=\"$(COMPAT_BASE_TREE)\" \
-	-DCOMPAT_BASE_TREE_VERSION=\"$(COMPAT_BASE_TREE_VERSION)\" \
+	-DCOMPAT_BASE="\"$(COMPAT_BASE)\"" \
+	-DCOMPAT_BASE_TREE="\"$(COMPAT_BASE_TREE)\"" \
+	-DCOMPAT_BASE_TREE_VERSION="\"$(COMPAT_BASE_TREE_VERSION)\"" \
 	-DCOMPAT_PROJECT="\"Generic kernel\"" \
-	-DCOMPAT_VERSION=\"$(COMPAT_VERSION)\"
+	-DCOMPAT_VERSION="\"$(COMPAT_VERSION)\""
+
+# Technicallay we can require the inclusion of COMPAT_CONFIG for
+# all targets except clean, so avoid the warnings at clean time.
+-include $(COMPAT_CONFIG)
+endif
 
-modules:
+obj-y += compat/
+
+all: modules
+
+modules: $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
 	$(MAKE) -C $(KLIB_BUILD) M=$(PWD) modules
+	@touch modules
+
 install: modules
 	$(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) \
 		modules_install
 	depmod -a
-	@./scripts/compat_firmware_install
+
+$(COMPAT_AUTOCONF): $(COMPAT_CONFIG)
+	+@$(PWD)/scripts/gen-compat-autoconf.sh $(COMPAT_CONFIG) > $(COMPAT_AUTOCONF)
+
+$(COMPAT_CONFIG):
+	+@$(PWD)/scripts/gen-compat-config.sh > $(COMPAT_CONFIG)
+
+install: modules
+
 clean:
 	$(MAKE) -C $(KLIB_BUILD) M=$(PWD) clean
-all: modules
 
 clean-files := Module.symvers modules.order Module.markers compat/modules.order
+clean-files += modules $(COMPAT_CONFIG) $(COMPAT_AUTOCONF)
+
+.PHONY: all install clean modules Makefile