nps: Makefile - simplified subdirs build

baggins baggins at pld-linux.org
Sun Jul 31 01:46:48 CEST 2005


Author: baggins                      Date: Sat Jul 30 23:46:48 2005 GMT
Module: nps                           Tag: HEAD
---- Log message:
- simplified subdirs build

---- Files affected:
nps:
   Makefile (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: nps/Makefile
diff -u nps/Makefile:1.2 nps/Makefile:1.3
--- nps/Makefile:1.2	Tue Jul 26 01:14:33 2005
+++ nps/Makefile	Sun Jul 31 01:46:43 2005
@@ -1,4 +1,5 @@
 KERNEL_DIR=/usr/src/linux
+TOPDIR=$(shell pwd)
 
 KERNEL_MAJOR_VERSION=$(shell head -n 1 $(KERNEL_DIR)/Makefile | sed 's/VERSION = \([0-9]*\)/\1/')
 KERNEL_MINOR_VERSION=$(shell head -n 2 $(KERNEL_DIR)/Makefile | tail -n 1 | sed 's/PATCHLEVEL = \([0-9]*\)/\1/')
@@ -20,15 +21,9 @@
 .PHONY: copy_files
 
 all: copy_files
-	@if [ $(KERNEL_VER_2_6) -eq 1 ] ; then \
-	  make -C $(KERNEL_DIR) M=$(shell echo `pwd`)/jnet modules ;\
-	else \
-	  make -C jnet ;\
-	fi
-	@if [ $(KERNEL_VER_2_6) -eq 1 ] ; then \
-	  if [ $(PLATFORM_X86_64) -eq 0 ] ; then \
-	    make -C $(KERNEL_DIR) M=$(shell echo `pwd`)/nws_mc modules ;\
-	  fi \
+	@make -C jnet
+	@if [ $(KERNEL_VER_2_6) -eq 1 ] && [ $(PLATFORM_X86_64) -eq 1 ] ; then \
+	  echo "skipping nws_mc" ;\
 	else \
 	  make -C nws_mc ;\
 	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/nps/Makefile?r1=1.2&r2=1.3&f=u




More information about the pld-cvs-commit mailing list