update makefile.d

diff --git a/src/tests-cbook/makefile.d b/src/tests-cbook/makefile.d
index 89570c294c1897b29f3cfe1550cfc8fd9cb85dc1..fa8ab50657b60df03a6d8160091bb84ab1510fb4 100644 (file)
--- a/src/tests-cbook/makefile.d
+++ b/src/tests-cbook/makefile.d
@@ -16,16 +16,23 @@ 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
+CFLAGS   += -Wall -pedantic -I./ -std=gnu99
 CXXFLAGS += -Wall -pedantic -I./
 PREFIX    =  /usr/local
 
 # Required libraries if any:
-LDFLAGS += -lcheck -lcutils-check
+LDFLAGS += -lcutils-check
+LDFLAGS += -lcheck $(shell pkg-config --libs --cflags check)
+
 
 # Required *locally compiled* libraries if any:
 LIBS     = cutils
 
+# Code to test
+CODE     = cbook
+CODEO    = $(CODE)/cbook_csv.o \
+          $(CODE)/cbook_pl1.o
+
 ################################################################################
 
 ifeq ($(dstdir),)
@@ -50,12 +57,17 @@ deps:
        $(foreach lib,$(LIBS),$(MAKE) --no-print-directory \
                        -C $(lib)/ dstdir=$(dstdir))
 
+$(CODEO):
+       $(foreach cod,$(CODE),$(MAKE) --no-print-directory \
+                       -C $(cod)/ dstdir=$(dstdir))
+
 .PHONY: build rebuild install uninstall clean mrpropre mrpropre \
        $(NAME) test run run-test run-test-more
 
-SOURCES=$(wildcard $(ssrcdir)/*.c)
-OBJECTS=$(SOURCES:%.c=%.o)
-DEPENDS =$(SOURCES:%.c=%.d)
+SOURCES  = $(wildcard $(ssrcdir)/*.c)
+OBJECTS  = $(SOURCES:%.c=%.o)
+OBJECTS += $(CODEO)
+DEPENDS  = $(SOURCES:%.c=%.d)
 
 # Autogenerate dependencies from code
 -include $(DEPENDS)
@@ -90,6 +102,8 @@ $(dstdir)/$(NAME): $(OBJECTS)
 clean:
        $(foreach lib,$(LIBS),$(MAKE) --no-print-directory \
                        -C $(lib)/ $@ dstdir=$(dstdir))
+       $(foreach cod,$(CODE),$(MAKE) --no-print-directory \
+                       -C $(cod)/ $@ dstdir=$(dstdir))
        rm -f $(OBJECTS)
        rm -f $(DEPENDS)
 
@@ -97,6 +111,8 @@ mrproper: mrpropre
 mrpropre: clean
        $(foreach lib,$(LIBS),$(MAKE) --no-print-directory \
                        -C $(lib)/ $@ dstdir=$(dstdir))
+       $(foreach cod,$(CODE),$(MAKE) --no-print-directory \
+                       -C $(cod)/ $@ dstdir=$(dstdir))
        rm -f $(dstdir)/$(NAME)
        rmdir $(dstdir) 2>/dev/null || true