Author: baggins Date: Sat Jul 30 23:56:06 2005 GMT
Module: nps Tag: HEAD
---- Log message:
- more simplifications
---- Files affected:
nps:
Makefile (1.3 -> 1.4)
nps/jnet:
makefile.2_4 (1.1.1.1 -> 1.2)
nps/nws_mc:
makefile.2_4 (1.1.1.1 -> 1.2)
---- Diffs:
================================================================
Index: nps/Makefile
diff -u nps/Makefile:1.3 nps/Makefile:1.4
--- nps/Makefile:1.3 Sun Jul 31 01:46:43 2005
+++ nps/Makefile Sun Jul 31 01:56:01 2005
@@ -47,37 +47,22 @@
uninstall:
make uninstall -C poci
- @if [ $(KERNEL_VER_2_6) -eq 1 ] && [ $(PLATFORM_X86_64) -eq 1 ] ; then \
- echo "skipping nws_mc" ;\
- else \
- make uninstall -C nws_mc ;\
- fi
+ make uninstall -C nws_mc
make uninstall -C jnet
rm -rf /etc/newisys
clean:
make clean -C jnet
- @if [ $(KERNEL_VER_2_6) -eq 1 ] && [ $(PLATFORM_X86_64) -eq 1 ] ; then \
- echo "skipping nws_mc" ;\
- else \
- make clean -C nws_mc ;\
- fi
+ make clean -C nws_mc
make clean -C poci
@rm -f jnet/Makefile
@rm -f nws_mc/Makefile
copy_files:
@if [ $(KERNEL_VER_2_6) -eq 0 ] ; then \
- sed -e "s/__NWS_FOLDER__/$(SED_PWD)\/jnet/" jnet/makefile.2_4 >
jnet/makefile ;\
- sed -e "s/__NWS_FOLDER__/$(SED_PWD)\/nws_mc/" nws_mc/makefile.2_4
> nws_mc/makefile ;\
- elif [ $(KERNEL_VER_2_6) -eq 1 ]; then \
- sed -e "s/__NWS_COMMON_FOLDER__/$(SED_PWD)\/common/" \
- -e "s/__NWS_FOLDER__/$(SED_PWD)\/jnet/" jnet/makefile.2_6 >
jnet/Makefile ;\
+ cp jnet/makefile.2_4 jnet/Makefile ;\
+ cp nws_mc/makefile.2_4 nws_mc/Makefile ;\
+ elif [ $(KERNEL_VER_2_6) -eq 1 ]; then \
+ cp jnet/makefile.2_6 jnet/Makefile ;\
+ cp nws_mc/makefile.2_6 nws_mc/Makefile ;\
fi
- @if [ $(KERNEL_VER_2_6) -eq 1 ] && [ $(PLATFORM_X86_64) -eq 1 ] ; then \
- echo "skipping nws_mc" ;\
- else \
- sed -e "s/__NWS_COMMON_FOLDER__/$(SED_PWD)\/common/" \
- -e "s/__NWS_FOLDER__/$(SED_PWD)\/nws_mc/" nws_mc/makefile.2_6
> nws_mc/Makefile ;\
- fi
-
================================================================
Index: nps/jnet/makefile.2_4
diff -u nps/jnet/makefile.2_4:1.1.1.1 nps/jnet/makefile.2_4:1.2
--- nps/jnet/makefile.2_4:1.1.1.1 Mon Jul 25 21:42:56 2005
+++ nps/jnet/makefile.2_4 Sun Jul 31 01:56:01 2005
@@ -200,5 +200,5 @@
clean:
rm -rf $(TARGET) $(CFILES:.c=.o)
-include __NWS_FOLDER__/makefile.common
+include makefile.common
================================================================
Index: nps/nws_mc/makefile.2_4
diff -u nps/nws_mc/makefile.2_4:1.1.1.1 nps/nws_mc/makefile.2_4:1.2
--- nps/nws_mc/makefile.2_4:1.1.1.1 Mon Jul 25 21:42:56 2005
+++ nps/nws_mc/makefile.2_4 Sun Jul 31 01:56:01 2005
@@ -200,5 +200,5 @@
clean:
rm -rf $(TARGET) $(CFILES:.c=.o)
-include __NWS_FOLDER__/makefile.common
+include makefile.common
================================================================
---- CVS-web:
http://cvs.pld-linux.org/nps/Makefile?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/nps/jnet/makefile.2_4?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/nws_mc/makefile.2_4?r1=1.1.1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
