]> ocean-lang.org Git - ocean/commitdiff
indent_test: fix makefile
authorNeilBrown <neil@brown.name>
Mon, 5 Oct 2020 23:00:31 +0000 (10:00 +1100)
committerNeilBrown <neil@brown.name>
Mon, 5 Oct 2020 23:31:07 +0000 (10:31 +1100)
Maybe 'make' has changed a little to be less forgiving, but 'make itest'
isn't working now.  All of LDLIBS are included in the 'cc' line, but
there are no dependencies to make sure they have been built.

The problem is that I'm using LDLIBS for different programs which need
different libs.  This isn't such a good idea.
So change indent_test to use itestLDLIBS and itestCFLAGS.

Signed-off-by: NeilBrown <neil@brown.name>
csrc/indent_test.mdc

index 7b5fe5ccc5769281242cf53b4d98a0b54b4674bb..960f63eb8122a2b8791952498e5c7b42832d2029 100644 (file)
@@ -4,17 +4,16 @@ simple assignments with expressions, and then prints out the same
 with complete bracketing and indenting.
 
 # File: indent_test.mk
 with complete bracketing and indenting.
 
 # File: indent_test.mk
-       myCFLAGS := -Wall -g -fplan9-extensions
-       CFLAGS := $(filter-out $(myCFLAGS),$(CFLAGS)) $(myCFLAGS)
-       myLDLIBS:= libparser.o libscanner.o libmdcode.o -licuuc
-       LDLIBS := $(filter-out $(myLDLIBS),$(LDLIBS)) $(myLDLIBS)
+       itestCFLAGS := -Wall -g -fplan9-extensions
+       itestLDLIBS:= libparser.o libscanner.o libmdcode.o -licuuc
 
        all :: itest
 
        all :: itest
-       itest.c itest.h : indent_test.mdc parsergen libparser.o libscanner.o libmdcode.o
+       itest.c itest.h : indent_test.mdc parsergen
                ./parsergen -o itest --LALR --tag indent indent_test.mdc
        indent_test.mk: indent_test.mdc md2c
                ./md2c indent_test.mdc
                ./parsergen -o itest --LALR --tag indent indent_test.mdc
        indent_test.mk: indent_test.mdc md2c
                ./md2c indent_test.mdc
-       itest: itest.c
+       itest: itest.c | $(filter %.o,$(itestLDLIBS))
+               $(CC) $(itestCFLAGS) $^ $(itestLDLIBS) -o $@
 
        doitest: itest itest.code
                ./itest itest.code
 
        doitest: itest itest.code
                ./itest itest.code