update utils and makefile

diff --git a/src/cutils b/src/cutils
index 780c8d0590a2f34e68ff896058b3b1a89539dcd8..8cf0ab8f25623889760fef03414c476c1cc19613 160000 (submodule)
--- a/src/cutils
+++ b/src/cutils
@@ -1 +1 @@
-Subproject commit 780c8d0590a2f34e68ff896058b3b1a89539dcd8
+Subproject commit 8cf0ab8f25623889760fef03414c476c1cc19613

diff --git a/src/nsub/Makefile b/src/nsub/Makefile
old mode 100644 (file)
new mode 100755 (executable)
index a2f2c3d..4b2abfa
--- a/src/nsub/Makefile
+++ b/src/nsub/Makefile
@@ -1,10 +1,10 @@
 # Simply pass everything to makefile.d, but calling from "../"
 
-.PHONY: all build install uninstall clean mrpropre mrpropre \
-       run test run-test run-test-more default \
-       nsub
+.PHONY: default $(MAKECMDGOALS)
 
 default $(MAKECMDGOALS):
-       @$(MAKE) --no-print-directory -C ../ -f $(CURDIR)/makefile.d \
-       $(MAKECMDGOALS)
+       @for mk in makefile.d; do \
+               $(MAKE) --no-print-directory -C ../ -f "$(CURDIR)/$$mk" \
+                       $(MAKECMDGOALS); \
+       done;
 

diff --git a/src/nsub/makefile.d b/src/nsub/makefile.d
old mode 100644 (file)
new mode 100755 (executable)
index 5ea5c95..0cc3960
--- a/src/nsub/makefile.d
+++ b/src/nsub/makefile.d
@@ -1,34 +1,74 @@
-# Note: 99+ required for for-loop initial declaration (CentOS 6)
+#
+# Makefile for C projets
+# > NAME   : the name of the main program (if programs, make a single .d file 
+#            per program, link them up in Makfile and use a $ssrcdir)
+# > srcdir : the source directory
+# > ssrcdir: the sub-sources directory (defaults to $srcdir)
+# > dstdir: the destination directory (defaults to $srcdir/bin)
+#
+# Environment variables:
+# > PREFIX: where to (un)install (defaults to /usr/local)
+# > DEBUG: define it to build with all debug symbols
+#
+NAME    = nsub
+srcdir  = $(NAME)
+ssrcdir = $(srcdir)
+
+# Note: c99+ required for for-loop initial declaration (not default in CentOS 6)
+# Note: gnu99 can be required for some projects (i.e.: libcutils-net)
+CFLAGS   += -Wall -pedantic -I./ -std=c99
+CXXFLAGS += -Wall -pedantic -I./
+PREFIX    =  /usr/local
+
+# Required libraries if any:
+# LDFLAGS += -lcheck
 
-NAME   = nsub
-NAMES  = $(NAME)
-srcdir = $(NAME)
+# Required *locally compiled* libraries if any:
+LIBS       = cutils
+
+################################################################################
 
 ifeq ($(dstdir),)
 dstdir = $(srcdir)/bin
 endif
 
-CFLAGS   += -Wall -pedantic -I./ -std=c99
-CXXFLAGS += -Wall -pedantic -I./
-# LDFLAGS  += -lcheck
-PREFIX   =  /usr/local
-
 ifdef DEBUG
 CFLAGS   += -ggdb -O0
 CXXFLAGS += -ggdb -O0
 endif
 
-.PHONY: all build install uninstall clean mrpropre mrpropre \
-       $(NAMES) deps test run run-test run-test-more
+# Default target
+.PHONY: all deps
+all:
+
+# locally compiled libs:
+ifneq ($(LIBS),)
+LDFLAGS   += -L$(dstdir)
+LDFLAGS   += $(foreach lib,$(LIBS),-l$(lib))
+endif
+deps:
+       $(foreach lib,$(LIBS),$(MAKE) --no-print-directory \
+                       -C $(lib)/ $(lib) dstdir=$(dstdir))
+
+.PHONY: build rebuild install uninstall clean mrpropre mrpropre \
+       $(NAME) test run run-test run-test-more
 
-SOURCES=$(wildcard $(srcdir)/*.c)
+SOURCES=$(wildcard $(ssrcdir)/*.c)
 OBJECTS=$(SOURCES:%.c=%.o)
+DEPENDS =$(SOURCES:%.c=%.d)
+
+# Autogenerate dependencies from code
+-include $(DEPENDS)
+%.o: %.c
+       $(CC) $(CFLAGS) -MMD -MP -c $< -o $@
 
 # Main targets
 
 all: build
 
-build: $(NAMES)
+build: $(NAME)
+
+rebuild: clean build
 
 $(NAME): deps $(dstdir)/$(NAME)
 
@@ -39,36 +79,21 @@ run:
 test run-test run-test-more:
        @echo you are in the sources of the program, look at the tests instead
 
-################
-# Dependencies #
-################
-## Libs (if needed)
-deps:
-       $(MAKE) --no-print-directory -C cutils/ cutils
-DEPS=$(dstdir)/libcutils.o
-
-## Headers
-DEPENDS=$(SOURCES:%.c=%.d)
--include $(DEPENDS)
-%.o: %.c
-       $(CC) $(CFLAGS) -MMD -MP -c $< -o $@
-################
-
-$(dstdir)/$(NAME): $(DEPS) $(OBJECTS)
+$(dstdir)/$(NAME): $(OBJECTS)
        mkdir -p $(dstdir)
-       # note: -r = --relocatable, but former also works with Clang
-       $(CC) $(CFLAGS) $(LDFLAGS) $(DEPS) $(OBJECTS) -o $@
-
-debug: 
-       $(MAKE) -f $(srcdir)/makefile.d DEBUG=1
+       # note: LDFLAGS *must* be near the end
+       $(CC) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
 
 clean:
+       $(foreach lib,$(LIBS),$(MAKE) --no-print-directory \
+                       -C $(lib)/ $@ dstdir=$(dstdir))
        rm -f $(OBJECTS)
        rm -f $(DEPENDS)
-       rm -f $(DEPS)
 
 mrproper: mrpropre
 mrpropre: clean
+       $(foreach lib,$(LIBS),$(MAKE) --no-print-directory \
+                       -C $(lib)/ $@ dstdir=$(dstdir))
        rm -f $(dstdir)/$(NAME)
        rmdir $(dstdir) 2>/dev/null || true
 
@@ -76,7 +101,7 @@ install: build
        mkdir -p "$(PREFIX)/bin"
        cp "$(dstdir)/$(NAME)" "$(PREFIX)/bin/"
 
-uninstall: build
+uninstall:
        rm "$(PREFIX)/bin/$(NAME)"
        rmdir "$(PREFIX)/bin" 2>/dev/null