cparser.bootstrap2 depends on cparser.bootstrap.

[cparser] / Makefile

diff --git a/Makefile b/Makefile
index e4fe9fd..14822a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ CPPFLAGS  = -I.
 CPPFLAGS += $(FIRM_CPPFLAGS)
 
 CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -std=c99 -pedantic
-CFLAGS_debug = -O2 -g
+CFLAGS_debug = -O0 -g
 CFLAGS_optimize = -O3 -fomit-frame-pointer -DNDEBUG
 CFLAGS_profile = -pg -O3 -fno-inline
 CFLAGS += $(CFLAGS_$(variant))
@@ -59,6 +59,7 @@ SOURCES := \
        wrappergen/write_jna.c
 
 OBJECTS = $(SOURCES:%.c=build/%.o)
+DEPENDS = $(OBJECTS:%.o=%.d)
 
 SPLINTS = $(addsuffix .splint, $(SOURCES))
 CPARSERS = $(addsuffix .cparser, $(SOURCES))
@@ -70,11 +71,9 @@ Q = @
 
 all: $(GOAL)
 
-.PHONY: all clean bootstrap bootstrap2 $(FIRM_HOME)/$(LIBFIRM_FILE)
+.PHONY: all bootstrap bootstrap2 bootstrape clean selfcheck splint $(FIRM_HOME)/$(LIBFIRM_FILE)
 
-ifeq ($(findstring $(MAKECMDGOALS), clean depend),)
--include .depend
-endif
+-include $(DEPENDS)
 
 config.h:
        cp config.h.in $@
@@ -82,33 +81,25 @@ config.h:
 %.h:
        @true
 
-REVISION ?= $(shell git describe --always --dirty --match '')
-
-revision.h:
-       @echo "===> GEN $@"
-       @echo "#define cparser_REVISION \"$(REVISION)\"" > .revision.h
-       $(Q)if diff -Nq .revision.h revision.h > /dev/null; then \
-             rm .revision.h;                                    \
-           else                                                 \
-             echo "===> UPDATING revision.h";                   \
-             mv .revision.h revision.h;                         \
-           fi
+REVISION ?= $(shell git describe --abbrev=40 --always --dirty --match '')
 
-.depend: config.h revision.h $(SOURCES)
-       @echo "===> DEPEND"
-       @rm -f $@ && touch $@ && makedepend -p "$@ build/" -Y -f $@ -- $(CPPFLAGS) -- $(SOURCES) 2> /dev/null && rm $@.bak
+# Update revision.h if necessary
+UNUSED := $(shell \
+       REV="\#define cparser_REVISION \"$(REVISION)\""; \
+       echo "$$REV" | cmp -s - revision.h 2> /dev/null || echo "$$REV" > revision.h \
+)
 
-DIRS = build build/adt build/driver build/wrappergen build/cpb build/cpb/adt build/cpb/driver build/cpb/wrappergen build/cpb2 build/cpb2/adt build/cpb2/driver build/cpb2/wrappergen build/cpbe build/cpbe/adt build/cpbe/driver build/cpbe2/wrappergen
-UNUSED := $(shell mkdir -p $(DIRS))
+DIRS   := $(sort $(dir $(OBJECTS)))
+UNUSED := $(shell mkdir -p $(DIRS) $(DIRS:$(BUILDDIR)/%=$(BUILDDIR)/cpb/%) $(DIRS:$(BUILDDIR)/%=$(BUILDDIR)/cpb2/%) $(DIRS:$(BUILDDIR)/%=$(BUILDDIR)/cpbe/%))
 
 $(FIRM_HOME)/$(LIBFIRM_FILE):
 ifeq "$(wildcard $(FIRM_HOME) )" ""
        @echo 'Download and extract libfirm tarball ...'
        $(Q)curl -s -L "${FIRM_URL}" -o "libfirm-$(FIRM_VERSION).tar.bz2"
        $(Q)tar xf "libfirm-$(FIRM_VERSION).tar.bz2"
-       $(Q)mv "libfirm-$(FIRM_VERSION)" libfirm
+       $(Q)mv "libfirm-$(FIRM_VERSION)" $(FIRM_HOME)
 endif
-       cd libfirm && $(MAKE) $(LIBFIRM_FILE)
+       $(Q)$(MAKE) -C $(FIRM_HOME) $(LIBFIRM_FILE)
 
 $(GOAL): $(FIRM_HOME)/$(LIBFIRM_FILE) $(OBJECTS)
        @echo "===> LD $@"
@@ -118,11 +109,11 @@ splint: $(SPLINTS)
 
 selfcheck: $(CPARSERS)
 
-bootstrap: build/cpb build/cpb/adt build/cpb/driver $(CPARSEROS) cparser.bootstrap
+bootstrap: cparser.bootstrap
 
-bootstrape: build/cpb build/cpb/adt build/cpb/driver $(CPARSEROS_E) cparser.bootstrape
+bootstrape: cparser.bootstrape
 
-bootstrap2: build/cpb2 build/cpb2/adt build/cpb2/driver $(CPARSEROS2) cparser.bootstrap2
+bootstrap2: cparser.bootstrap2
 
 %.c.splint: %.c
        @echo '===> SPLINT $<'
@@ -152,16 +143,14 @@ cparser.bootstrape: $(CPARSEROS_E)
        @echo "===> LD $@"
        $(Q)gcc $(CPARSEROS_E) $(LFLAGS) -o $@
 
-cparser.bootstrap2: $(CPARSEROS2)
+cparser.bootstrap2: cparser.bootstrap $(CPARSEROS2)
        @echo "===> LD $@"
        $(Q)./cparser.bootstrap $(CPARSEROS2) $(LFLAGS) -o $@
 
 build/%.o: %.c
        @echo '===> CC $<'
-#$(Q)$(ICC) $(CPPFLAGS) $(ICC_CFLAGS) -c $< -o $@
-#$(Q)$(GCCO1) $(CPPFLAGS) $(CFLAGS) -O1 -c $< -o $@
-       $(Q)$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+       $(Q)$(CC) $(CPPFLAGS) $(CFLAGS) -MMD -c $< -o $@
 
 clean:
        @echo '===> CLEAN'
-       $(Q)rm -rf build/* $(GOAL) .depend
+       $(Q)rm -rf build/* $(GOAL)