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

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


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

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

---- Diffs:

================================================================
Index: nps/jnet/makefile.2_6
diff -u nps/jnet/makefile.2_6:1.1.1.1 nps/jnet/makefile.2_6:1.2
--- nps/jnet/makefile.2_6:1.1.1.1	Mon Jul 25 21:42:56 2005
+++ nps/jnet/makefile.2_6	Sun Jul 31 01:41:11 2005
@@ -1,19 +1,15 @@
-TARGET = jnet_prs.ko
+PWD=$(shell pwd)
+KERNEL_DIR ?= /usr/src/linux
+TOPDIR ?= $(shell dirname $(PWD))
 
-ifneq ($(KERNELRELEASE),)
+TARGET = jnet_prs.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 := jnet_prs.o
 jnet_prs-objs := jnet_plat_src.o jnet_shared.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 .jnet*
@@ -21,5 +17,4 @@
 	@rm -rf .tmp_versions
 	@rm -f jnet_prs.mod.c jnet_*.ko
 
-include __NWS_FOLDER__/makefile.common
-
+#include $(PWD)/makefile.common
================================================================

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




More information about the pld-cvs-commit mailing list