made the GNU make NMAKE switch as we go to Windows now, also fixed small bugs in the makefiles

17 files changed, 25 insertions, 25 deletions

diff --git a/GNUmakefile b/GNUmakefile
index ca6b9c1..9fa21bc 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -5,4 +5,4 @@ SUBDIRS = src include tests docs
 PACKAGE_NAME = WolfBones
 PACKAGE_VERSION = 0.0.1
 
--include $(TOPDIR)/makefiles/top.mk
+-include $(TOPDIR)/makefiles/gmake/top.mk
diff --git a/docs/GNUmakefile b/docs/GNUmakefile
index 4ab049c..eb3ca24 100644
--- a/docs/GNUmakefile
+++ b/docs/GNUmakefile
@@ -2,7 +2,7 @@ TOPDIR = ..
 
 SUBDIRS =
 
--include $(TOPDIR)/makefiles/sub.mk
+-include $(TOPDIR)/makefiles/gmake/sub.mk
 
 doc:
 	cd $(TOPDIR); doxygen docs/doxygen.conf
diff --git a/include/GNUmakefile b/include/GNUmakefile
index 7960c24..c4f5f06 100644
--- a/include/GNUmakefile
+++ b/include/GNUmakefile
@@ -1,6 +1,6 @@
 TOPDIR = ..
 
--include $(TOPDIR)/makefiles/sub.mk
+-include $(TOPDIR)/makefiles/gmake/sub.mk
 
 local_clean:
 	-@rm -f wolf/*.bak
diff --git a/makefiles/clean.mk b/makefiles/gmake/clean.mk
index d416905..d416905 100644
--- a/makefiles/clean.mk
+++ b/makefiles/gmake/clean.mk
diff --git a/makefiles/compiler.mk b/makefiles/gmake/compiler.mk
index 3409d4c..5d04dd4 100644
--- a/makefiles/compiler.mk
+++ b/makefiles/gmake/compiler.mk
@@ -15,8 +15,8 @@
 
 ifeq "$(COMPILER)" "gcc"
 
-GCC_MAJOR_VERSION =	$(shell $(TOPDIR)/makefiles/guess_env --gcc-major-version $(CC))
-GCC_MINOR_VERSION =	$(shell $(TOPDIR)/makefiles/guess_env --gcc-minor-version $(CC))
+GCC_MAJOR_VERSION =	$(shell $(TOPDIR)/makefiles/gmake/guess_env --gcc-major-version $(CC))
+GCC_MINOR_VERSION =	$(shell $(TOPDIR)/makefiles/gmake/guess_env --gcc-minor-version $(CC))
 
 # -Wswitch-default: not good for switches with enums
 # -Wsystem-headers: bad idea, as header files are usually happily broken :-)
@@ -151,8 +151,8 @@ endif
 # start of tcc section
 
 # currently we don't need this, the tcc flags are fairly consistent
-#TCC_MAJOR_VERSION =	$(shell $(TOPDIR)/makefiles/guess_env --tcc-major-version $(CC))
-#TCC_MINOR_VERSION =	$(shell $(TOPDIR)/makefiles/guess_env --tcc-minor-version $(CC))
+#TCC_MAJOR_VERSION =	$(shell $(TOPDIR)/makefiles/gmake/guess_env --tcc-major-version $(CC))
+#TCC_MINOR_VERSION =	$(shell $(TOPDIR)/makefiles/gmake/guess_env --tcc-minor-version $(CC))
 
 ifeq "$(COMPILER)" "tcc"
 COMPILE_FLAGS = \
@@ -164,8 +164,8 @@ endif
 # start of icc section
 
 # currently we don't need this, the icc flags are fairly consistent
-#ICC_MAJOR_VERSION =	$(shell $(TOPDIR)/makefiles/guess_env --icc-major-version $(CC))
-#ICC_MINOR_VERSION =	$(shell $(TOPDIR)/makefiles/guess_env --icc-minor-version $(CC))
+#ICC_MAJOR_VERSION =	$(shell $(TOPDIR)/makefiles/gmake/guess_env --icc-major-version $(CC))
+#ICC_MINOR_VERSION =	$(shell $(TOPDIR)/makefiles/gmake/guess_env --icc-minor-version $(CC))
 
 # -vec-report0: turn of SSE2 vector usage messages (they are common since P-4 anyway!)
 
diff --git a/makefiles/depend.mk b/makefiles/gmake/depend.mk
index bcdb5b2..bcdb5b2 100644
--- a/makefiles/depend.mk
+++ b/makefiles/gmake/depend.mk
diff --git a/makefiles/dist.mk b/makefiles/gmake/dist.mk
index 50a4a81..50a4a81 100644
--- a/makefiles/dist.mk
+++ b/makefiles/gmake/dist.mk
diff --git a/makefiles/guess_env b/makefiles/gmake/guess_env
index d0a31ae..d0a31ae 100755
--- a/makefiles/guess_env
+++ b/makefiles/gmake/guess_env
diff --git a/makefiles/help.mk b/makefiles/gmake/help.mk
index 60b2e94..60b2e94 100644
--- a/makefiles/help.mk
+++ b/makefiles/gmake/help.mk
diff --git a/makefiles/install.mk b/makefiles/gmake/install.mk
index 8a5c3be..8a5c3be 100644
--- a/makefiles/install.mk
+++ b/makefiles/gmake/install.mk
diff --git a/makefiles/platform.mk b/makefiles/gmake/platform.mk
index a271c1c..95843fb 100644
--- a/makefiles/platform.mk
+++ b/makefiles/gmake/platform.mk
@@ -16,10 +16,10 @@
 #
 # author: Andreas Baumann, abaumann at yahoo dot com
 
-PLATFORM =		$(shell $(TOPDIR)/makefiles/guess_env --platform $(CC))
-OS_MAJOR_VERSION =	$(shell $(TOPDIR)/makefiles/guess_env --os-major-version $(CC))
-OS_MINOR_VERSION =	$(shell $(TOPDIR)/makefiles/guess_env --os-minor-version $(CC))
-COMPILER =		$(shell $(TOPDIR)/makefiles/guess_env --compiler $(CC))
+PLATFORM =		$(shell $(TOPDIR)/makefiles/gmake/guess_env --platform $(CC))
+OS_MAJOR_VERSION =	$(shell $(TOPDIR)/makefiles/gmake/guess_env --os-major-version $(CC))
+OS_MINOR_VERSION =	$(shell $(TOPDIR)/makefiles/gmake/guess_env --os-minor-version $(CC))
+COMPILER =		$(shell $(TOPDIR)/makefiles/gmake/guess_env --compiler $(CC))
 
 PLATFORM_COMPILE_FLAGS = \
 			-D$(PLATFORM) \
@@ -39,7 +39,7 @@ SO = .so
 
 # name if the installation program
 # (TODO: use the MIT or openradio install-sh script instead?)
-INSTALL = $(shell $(TOPDIR)/makefiles/guess_env --install)
+INSTALL = $(shell $(TOPDIR)/makefiles/gmake/guess_env --install)
 ifeq "$(PLATFORM)" "SUNOS"
 INSTALL = /usr/ucb/install
 else
diff --git a/makefiles/sub.mk b/makefiles/gmake/sub.mk
index cfb2490..4279696 100644
--- a/makefiles/sub.mk
+++ b/makefiles/gmake/sub.mk
@@ -8,8 +8,8 @@
 # provides:
 # - target: all targets
 
--include $(TOPDIR)/makefiles/platform.mk
--include $(TOPDIR)/makefiles/compiler.mk
+-include $(TOPDIR)/makefiles/gmake/platform.mk
+-include $(TOPDIR)/makefiles/gmake/compiler.mk
 
 .PHONY: all $(SUBDIRS) local_all
 all: $(OBJS) $(CPPOBJS) $(BIN_OBJS) $(CPP_BIN_OBJS) $(BINS) $(CPP_BINS) $(CMODULES) $(CPPMODULES) local_all
@@ -21,6 +21,6 @@ test: $(OBJS) $(TEST_OBJS) $(CPPOBJS) $(BIN_OBJS) $(BINS) $(CPP_BINS) $(TEST_BIN
 	@test -z "$(SUBDIRS)" || ( set -e; for d in $(SUBDIRS)""; do \
 	  (set -e; $(MAKE) -C $$d test || exit 1); done)
 
--include $(TOPDIR)/makefiles/depend.mk
--include $(TOPDIR)/makefiles/clean.mk
--include $(TOPDIR)/makefiles/install.mk
+-include $(TOPDIR)/makefiles/gmake/depend.mk
+-include $(TOPDIR)/makefiles/gmake/clean.mk
+-include $(TOPDIR)/makefiles/gmake/install.mk
diff --git a/makefiles/top.mk b/makefiles/gmake/top.mk
index 8bf2acc..8463c53 100644
--- a/makefiles/top.mk
+++ b/makefiles/gmake/top.mk
@@ -39,10 +39,10 @@ test: all
 
 .PHONY: doc
 doc:
-	cd docs; $(MAKE) -f GNUmakefile doc
+	cd docs; $(MAKE) doc
 
 .PHONY: help
 help:
 	@cat makefiles/help.mk
 
--include $(TOPDIR)/makefiles/dist.mk
+-include $(TOPDIR)/makefiles/gmake/dist.mk
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 62d2946..2044e94 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -28,7 +28,7 @@ OBJS = \
 
 local_all: $(LIBS)
 
--include $(TOPDIR)/makefiles/sub.mk
+-include $(TOPDIR)/makefiles/gmake/sub.mk
 
 # snprintf has some quirks, compile relaxed
 port/snprintf.o : port/snprintf.c port/snprintf.h
diff --git a/tests/GNUmakefile b/tests/GNUmakefile
index 3ffab88..6118346 100644
--- a/tests/GNUmakefile
+++ b/tests/GNUmakefile
@@ -2,7 +2,7 @@ TOPDIR = ..
 
 SUBDIRS = port daemon
 
--include $(TOPDIR)/makefiles/sub.mk
+-include $(TOPDIR)/makefiles/gmake/sub.mk
 
 local_test:
 
diff --git a/tests/daemon/GNUmakefile b/tests/daemon/GNUmakefile
index 45029b8..6a4dba7 100644
--- a/tests/daemon/GNUmakefile
+++ b/tests/daemon/GNUmakefile
@@ -13,7 +13,7 @@ TEST_BINS = \
 TEST_OBJS = \
 	testd_cmdline.o
 
--include $(TOPDIR)/makefiles/sub.mk
+-include $(TOPDIR)/makefiles/gmake/sub.mk
 
 # ABa: currently a special rule for cmdline.c as gengetopt is not
 # completly fixed yet
diff --git a/tests/port/GNUmakefile b/tests/port/GNUmakefile
index 8f2e455..a51a8ec 100644
--- a/tests/port/GNUmakefile
+++ b/tests/port/GNUmakefile
@@ -12,7 +12,7 @@ TEST_BINS = \
 	test_strcasecmp$(EXE) \
 	test_strncasecmp$(EXE)
 
--include $(TOPDIR)/makefiles/sub.mk
+-include $(TOPDIR)/makefiles/gmake/sub.mk
 
 local_all: