nps: nws_mc/makefile.2_6 - some cleanup and simplifications

baggins baggins at pld-linux.org
Sun Jul 31 01:45:41 CEST 2005


Author: baggins                      Date: Sat Jul 30 23:45:41 2005 GMT
Module: nps                           Tag: HEAD
---- Log message:
- some cleanup and simplifications

---- Files affected:
nps/nws_mc:
   makefile.2_6 (1.1.1.1 -> 1.2) 

---- Diffs:

================================================================
Index: nps/nws_mc/makefile.2_6
diff -u nps/nws_mc/makefile.2_6:1.1.1.1 nps/nws_mc/makefile.2_6:1.2
--- nps/nws_mc/makefile.2_6:1.1.1.1	Mon Jul 25 21:42:56 2005
+++ nps/nws_mc/makefile.2_6	Sun Jul 31 01:45:36 2005
@@ -1,25 +1,19 @@
-TARGET=nws_mc.ko
+PWD:=$(shell pwd)
+KERNEL_DIR ?= /usr/src/linux
+TOPDIR ?= $(shell dirname $(PWD))
 
-ifneq ($(KERNELRELEASE),)
+TARGET=nws_mc.ko
 
-EXTRA_CFLAGS += -I/usr/include -I__NWS_COMMON_FOLDER__ -DPLATFORM=1 -DSP=0 -DLINUX_2_6_KERNEL=1
+EXTRA_CFLAGS += -I$(TOPDIR)/common -DPLATFORM=1 -DSP=0 -DLINUX_2_6_KERNEL=1
 obj-m := nws_mc.o
 nws_mc-objs := nws_mc_src.o
 
-else
-
-KDIR:=/lib/modules/$(shell uname -r)/build
-PWD:=$(shell pwd)
-
 default:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-endif
-
+	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) TOPDIR=$(TOPDIR) modules
 clean:
 	@rm -f .nws_*
 	@rm -f nws_*.o
 	@rm -rf .tmp_versions
 	@rm -f nws_mc.mod.c nws_*.ko
 
-include __NWS_FOLDER__/makefile.common
-
+#include $(PWD)/makefile.common
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/nps/nws_mc/makefile.2_6?r1=1.1.1.1&r2=1.2&f=u




More information about the pld-cvs-commit mailing list