can do a full build with testing on windows now, still issues to fix

3 files changed, 14 insertions, 22 deletions

diff --git a/makefiles/nmake/clean.mk b/makefiles/nmake/clean.mk
index 0d25b93..95db671 100644
--- a/makefiles/nmake/clean.mk
+++ b/makefiles/nmake/clean.mk
@@ -12,12 +12,8 @@
 # - target: clean
 # - target: distclean
 
-#.PHONY: clean_recursive clean local_clean
-
-#clean_recursive:
-#clean_recursive:
-#	@test -z "$(SUBDIRS)" || ( set -e; for d in $(SUBDIRS)""; do \
-#	  (set -e; $(MAKE) -C $$d clean || exit 1); done)
+clean_recursive:
+	@if not "$(SUBDIRS)" == "" @for %%d IN ( $(SUBDIRS) ) do @cd %%d & $(MAKE) /nologo /f Makefile.w32 clean & cd ..
 
 #clean: clean_recursive local_clean
 #	-@rm -f *.bak 2>/dev/null
@@ -29,7 +25,7 @@
 #	-@rm -f *.core
 #	-@rm -f $(CMODULES) $(CPPMODULES)
 #	-@rm -f $(CMODULES .o=.d) $(CPPMODULES .o=.d)
-clean:
+clean: clean_recursive local_clean
 	-@erase *.bak 2>NUL
 	-@erase *~ 2>NUL
 	-@erase *.d 2>NUL
@@ -39,10 +35,7 @@ clean:
 	-@erase $(OBJS) 2>NUL
 	-@erase *.pdb 2>NUL
 
-#.PHONY: distclean_recursive distclean local_distclean
-
-#distclean_recursive:
-#	@test -z "$(SUBDIRS)" || ( set -e; for d in $(SUBDIRS)""; do \
-#	  (set -e; $(MAKE) -C $$d distclean || exit 1); done)
+distclean_recursive:
+	@if not "$(SUBDIRS)" == "" @for %%d IN ( $(SUBDIRS) ) do @cd %%d & $(MAKE) /nologo /f Makefile.w32 distclean & cd ..
 
-#distclean: distclean_recursive local_distclean clean
+distclean: distclean_recursive local_distclean clean
diff --git a/makefiles/nmake/sub.mk b/makefiles/nmake/sub.mk
index 1e40842..15d22c2 100644
--- a/makefiles/nmake/sub.mk
+++ b/makefiles/nmake/sub.mk
@@ -12,16 +12,15 @@
 !include $(TOPDIR)\makefiles\nmake\compiler.mk
 
 all: local_all
+	@if not "$(SUBDIRS)" == "" @for %%d IN ( $(SUBDIRS) ) do @cd %%d & $(MAKE) /nologo /f Makefile.w32 all & cd ..
 
 #.PHONY: all $(SUBDIRS) local_all
 #all: $(OBJS) $(CPPOBJS) $(BIN_OBJS) $(CPP_BIN_OBJS) $(BINS) $(CPP_BINS) $(CMODULES) $(CPPMODULES) local_all
 #	@test -z "$(SUBDIRS)" || ( set -e; for d in $(SUBDIRS)""; do \
 #	  (set -e; $(MAKE) -C $$d all || exit 1); done)
 
-#.PHONY: test local_test
-#test: $(OBJS) $(TEST_OBJS) $(CPPOBJS) $(BIN_OBJS) $(BINS) $(CPP_BINS) $(TEST_BIN_OBJS) $(TEST_BINS) $(TEST_CPP_BINS) $(CMODULES) $(CPPMODULES) local_test
-#	@test -z "$(SUBDIRS)" || ( set -e; for d in $(SUBDIRS)""; do \
-#	  (set -e; $(MAKE) -C $$d test || exit 1); done)
+test: $(OBJS) $(TEST_OBJS) $(CPPOBJS) $(BIN_OBJS) $(BINS) $(CPP_BINS) $(TEST_BIN_OBJS) $(TEST_BINS) $(TEST_CPP_BINS) $(CMODULES) $(CPPMODULES) local_test
+	@if not "$(SUBDIRS)" == "" @for %%d IN ( $(SUBDIRS) ) do @cd %%d & $(MAKE) /nologo /f Makefile.w32 test & cd ..
 
 #-include $(TOPDIR)/makefiles/gmake/depend.mk
 !include $(TOPDIR)\makefiles\nmake\clean.mk
diff --git a/makefiles/nmake/top.mk b/makefiles/nmake/top.mk
index adec5b2..188375a 100644
--- a/makefiles/nmake/top.mk
+++ b/makefiles/nmake/top.mk
@@ -14,13 +14,13 @@
 # - target 'help'
 
 all:
-	@for %%d IN ( $(SUBDIRS) ) do @cd %%d & $(MAKE) /nologo /f Makefile.w32 all & cd .,
+	@if not "$(SUBDIRS)" == "" @for %%d IN ( $(SUBDIRS) ) do @cd %%d & $(MAKE) /nologo /f Makefile.w32 all & cd ..
 
 clean:
-	@for %%d IN ( $(SUBDIRS) ) do @cd %%d & $(MAKE) /nologo /f Makefile.w32 clean & cd ..
+	@if not "$(SUBDIRS)" == "" @for %%d IN ( $(SUBDIRS) ) do @cd %%d & $(MAKE) /nologo /f Makefile.w32 clean & cd ..
 
 distclean:
-	@for %%d IN ( $(SUBDIRS) ) do @cd %%d & $(MAKE) /nologo /f Makefile.w32 distclean & cd ..
+	@if not "$(SUBDIRS)" == "" @for %%d IN ( $(SUBDIRS) ) do @cd %%d & $(MAKE) /nologo /f Makefile.w32 distclean & cd ..
 
 #.PHONY: install
 #install:
@@ -28,10 +28,10 @@ distclean:
 #	  (set -e; $(MAKE) -C $$d install || exit 1); done)
 
 test: all
-	@cd tests & $(MAKE) test
+	@cd tests & $(MAKE) /nologo /f Makefile.W32 test
 
 doc:
-	@cd docs & $(MAKE) doc
+	@cd docs & $(MAKE) /nologo /f Makefile.W32 doc
 
 help:
 	@type makefiles\nmake\help.mk