change from submakes to included makefiles

Makefile.in

@@ -37,8 +37,7 @@ COMMON=pgm_options.o gethopt.o notspecial.o
 
 MAN3PAGES=mkd-callbacks.3 mkd-functions.3 markdown.3 mkd-line.3
 
-all: $(PGMS) $(SAMPLE_PGMS) $(TESTFRAMEWORK)
-	@cd tests/exercisers; BUILD="$(BUILD)" TOPDIR=`cd ../..;pwd` LINK="$(LINK)" make programs
+all: $(PGMS) $(SAMPLE_PGMS) $(TESTFRAMEWORK) all_subdirs
 
 install: $(PGMS) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR) $(DESTDIR)$(PKGDIR)
 	$(INSTALL_PROGRAM) $(PGMS) $(DESTDIR)$(BINDIR)
@@ -131,17 +130,14 @@ main.o: main.c mkdio.h config.h
 $(MKDLIB): $(OBJS)
 	./librarian.sh make $(MKDLIB) VERSION $(OBJS)
 
-verify: echo tools/checkbits.sh
+verify: echo tools/checkbits.sh verify_subdirs
 	@./echo -n "headers ... "; tools/checkbits.sh && echo "GOOD"
 
-test:	$(PGMS) $(TESTFRAMEWORK) verify exorcise
+test:	$(PGMS) $(TESTFRAMEWORK) verify
 	@for x in $${TESTS:-tests/*.t}; do \
 	    @LD_LIBRARY_PATH@=. sh $$x || exit 1; \
 	done
 
-exorcise:
-	@cd tests/exercisers; BUILD="$(BUILD)" TOPDIR=`cd ../..;pwd` LINK="$(LINK)" make
-
 pandoc_headers.o: tools/pandoc_headers.c config.h
 	$(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c
 pandoc_headers: pandoc_headers.o $(COMMON) $(MKDLIB)
@@ -165,14 +161,15 @@ echo.o:	tools/echo.c config.h
 echo:   echo.o
 	$(LINK) -o echo echo.o
 	
-clean:
+clean: clean_subdirs
 	rm -f $(PGMS) $(TESTFRAMEWORK) $(SAMPLE_PGMS) *.o
 	rm -f $(MKDLIB) `./librarian.sh files $(MKDLIB) VERSION`
-	@cd tests/exercisers; make clean
 
 distclean spotless: clean
 	@DISTCLEAN@ @GENERATED_FILES@ @CONFIGURE_FILES@ ./mktags ./blocktags
 
+include tests/exercisers/make.include
+
 Csio.o: Csio.c cstring.h amalloc.h config.h markdown.h
 amalloc.o: amalloc.c
 basename.o: basename.c config.h cstring.h amalloc.h markdown.h

configure.sh

@@ -236,7 +236,7 @@ fi
 
 [ "$WITH_PANDOC_HEADER" ] && AC_DEFINE 'PANDOC_HEADER' '1'
 
-GENERATE="Makefile version.c mkdio.h tests/exercisers/Makefile"
+GENERATE="Makefile version.c mkdio.h"
 
 if [ "$PKGCONFIG" ]; then
     GENERATE="$GENERATE libmarkdown.pc"

tests/exercisers/Makefile.in

@@ -1,24 +0,0 @@
-# build and run various internal code verifiers
-
-
-THINGS=flags
-
-
-all: programs run
-	@:
-
-programs: $(THINGS)
-	@:
-
-flags: flags.c
-	$(BUILD) -I$(TOPDIR) -c flags.c
-	$(LINK) -L$(TOPDIR) -o flags flags.o -lmarkdown
-
-run:
-	@for x in $(THINGS); do @LD_LIBRARY_PATH@=$(TOPDIR) ./$$x || exit 1; done
-
-clean:
-	rm -f $(THINGS) *.o
-
-spotless: clean
-	rm -f Makefile

tests/exercisers/make.include

@@ -0,0 +1,19 @@
+exercisers=tests/exercisers
+
+EXERCISE=$(exercisers)/flags
+
+TESTFRAMEWORK += $(EXERCISE)
+
+$(exercisers)/flags: $(exercisers)/flags.o
+	$(LINK) -o $@ $< -lmarkdown
+	
+$(exercisers)/flags.o: $(exercisers)/flags.c
+	$(BUILD) -c -o $@ $<
+
+all_subdirs:: $(EXERCISE)
+	
+verify_subdirs:: $(EXERCISE)
+	@for x in $(EXERCISE); do $$x || exit 1; done
+
+clean_subdirs::
+	rm -f $(EXERCISE) $(exercisers)/*.o