nps: jnet/Makefile (NEW), jnet/makefile.2_4, jnet/makefile.2_6 - a...

[baggins]

Author: baggins                      Date: Sat Sep 17 23:33:32 2005 GMT
Module: nps                           Tag: HEAD
---- Log message:
- added common Makefile to avoid copying files

---- Files affected:
nps/jnet:
   Makefile (NONE -> 1.1)  (NEW), makefile.2_4 (1.2 -> 1.3) , makefile.2_6 (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: nps/jnet/Makefile
diff -u /dev/null nps/jnet/Makefile:1.1
--- /dev/null	Sun Sep 18 01:33:32 2005
+++ nps/jnet/Makefile	Sun Sep 18 01:33:27 2005
@@ -0,0 +1,15 @@
+KERNEL_DIR=/usr/src/linux
+PWD=$(shell pwd)
+TOPDIR=$(shell dirname $(PWD))
+
+KERNEL_VERSION := $(shell grep -m 1 UTS_RELEASE $(KERNEL_DIR)/include/linux/version.h | sed -e 's/.*UTS_RELEASE "\([0-9]*\.[0-9]*\)\..*"/\1/')
+
+ifeq ($(KERNEL_VERSION),2.4)
+  include $(TOPDIR)/jnet/makefile.2_4
+else
+  ifeq ($(KERNEL_VERSION),2.6)
+    include $(TOPDIR)/jnet/makefile.2_6
+  endif
+endif
+
+include $(TOPDIR)/jnet/makefile.common

================================================================
Index: nps/jnet/makefile.2_4
diff -u nps/jnet/makefile.2_4:1.2 nps/jnet/makefile.2_4:1.3
--- nps/jnet/makefile.2_4:1.2	Sun Jul 31 01:56:01 2005
+++ nps/jnet/makefile.2_4	Sun Sep 18 01:33:27 2005
@@ -199,6 +199,3 @@
 
 clean:
 	rm -rf $(TARGET) $(CFILES:.c=.o)
-
-include makefile.common
-

================================================================
Index: nps/jnet/makefile.2_6
diff -u nps/jnet/makefile.2_6:1.3 nps/jnet/makefile.2_6:1.4
--- nps/jnet/makefile.2_6:1.3	Sun Sep 18 01:04:45 2005
+++ nps/jnet/makefile.2_6	Sun Sep 18 01:33:27 2005
@@ -1,8 +1,3 @@
-PWD=$(shell pwd)
-KERNEL_DIR ?= /usr/src/linux
-TOPDIR ?= $(shell dirname $(PWD))
-JNETDIR ?= $(TOPDIR)/jnet
-
 TARGET = jnet_prs.ko
 
 EXTRA_CFLAGS += -I$(TOPDIR)/common -DPLATFORM=1 -DSP=0 -DLINUX_2_6_KERNEL=1
@@ -10,12 +5,10 @@
 jnet_prs-objs := jnet_plat_src.o jnet_shared.o
 
 default:
-	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) TOPDIR=$(TOPDIR) JNETDIR=$(JNETDIR) modules
+	$(MAKE) -C $(KERNEL_DIR) M=$(PWD) TOPDIR=$(TOPDIR) modules
 
 clean:
 	@rm -f .jnet*
 	@rm -f jnet_*.o
 	@rm -rf .tmp_versions
 	@rm -f jnet_prs.mod.c jnet_*.ko
-
-include $(JNETDIR)/makefile.common
================================================================

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