Remove the (mostly) unnecessary distinction between EXPR_LITERAL_INTEGER, EXPR_LITERA...

[cparser] / Makefile

diff --git a/Makefile b/Makefile
index dd8c885..2299308 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,23 @@
 GOAL = $(BUILDDIR)/cparser
 
+# include user-defined makefile settings
+-include config.mak
+
 BUILDDIR ?= build
 variant  ?= debug# Different libfirm variants (debug, optimize, profile)
 
-FIRM_HOME   = libfirm
-FIRM_CPPFLAGS = -I$(FIRM_HOME)/include
-FIRM_LIBS   = -lm
-LIBFIRM_FILE = build/$(variant)/libfirm.a
-FIRM_VERSION = 1.19.1
-FIRM_URL = http://downloads.sourceforge.net/project/libfirm/libfirm/$(FIRM_VERSION)/libfirm-$(FIRM_VERSION).tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Flibfirm%2Ffiles%2Flibfirm%2F&ts=1299786346&use_mirror=ignum
+# Use libfirm subdir if it exists, otherwise use pkg-config
+ifneq ("$(wildcard libfirm)", "")
+FIRM_HOME     ?= libfirm
+FIRM_CPPFLAGS ?= -I$(FIRM_HOME)/include
+FIRM_LIBS     ?= -lm
+LIBFIRM_FILE_BASE ?= build/$(variant)/libfirm.a
+LIBFIRM_FILE  ?= $(FIRM_HOME)/$(LIBFIRM_FILE_BASE)
+else
+FIRM_CPPFLAGS ?= `pkg-config --cflags libfirm`
+FIRM_LIBS     ?= `pkg-config --libs libfirm`
+LIBFIRM_FILE =
+endif
 
 CPPFLAGS  = -I.
 CPPFLAGS += $(FIRM_CPPFLAGS)
@@ -18,10 +27,6 @@ CFLAGS_debug = -O0 -g
 CFLAGS_optimize = -O3 -fomit-frame-pointer -DNDEBUG
 CFLAGS_profile = -pg -O3 -fno-inline
 CFLAGS += $(CFLAGS_$(variant))
-ICC_CFLAGS = -O0 -g3 -std=c99 -Wall
-#LFLAGS += -pg
-ICC    ?= true
-GCCO1  ?= true
 
 LFLAGS += $(FIRM_LIBS)
 
@@ -58,23 +63,24 @@ SOURCES := \
        wrappergen/write_fluffy.c \
        wrappergen/write_jna.c
 
-OBJECTS = $(SOURCES:%.c=build/%.o)
+OBJECTS = $(SOURCES:%.c=$(BUILDDIR)/%.o)
 DEPENDS = $(OBJECTS:%.o=%.d)
 
 SPLINTS = $(addsuffix .splint, $(SOURCES))
 CPARSERS = $(addsuffix .cparser, $(SOURCES))
-CPARSEROS = $(SOURCES:%.c=build/cpb/%.o)
-CPARSEROS_E = $(SOURCES:%.c=build/cpbe/%.o)
-CPARSEROS2 = $(SOURCES:%.c=build/cpb2/%.o)
+CPARSEROS = $(SOURCES:%.c=$(BUILDDIR)/cpb/%.o)
+CPARSEROS_E = $(SOURCES:%.c=$(BUILDDIR)/cpbe/%.o)
+CPARSEROS2 = $(SOURCES:%.c=$(BUILDDIR)/cpb2/%.o)
 
 Q = @
 
 all: $(GOAL)
 
-.PHONY: all bootstrap bootstrap2 bootstrape clean selfcheck splint $(FIRM_HOME)/$(LIBFIRM_FILE)
+.PHONY: all bootstrap bootstrap2 bootstrape clean selfcheck splint libfirm_subdir
 
 -include $(DEPENDS)
 
+$(SOURCES): config.h
 config.h:
        cp config.h.in $@
 
@@ -92,18 +98,18 @@ UNUSED := $(shell \
 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)" $(FIRM_HOME)
-endif
-       $(Q)$(MAKE) -C $(FIRM_HOME) $(LIBFIRM_FILE)
-
-$(GOAL): $(FIRM_HOME)/$(LIBFIRM_FILE) $(OBJECTS)
+$(GOAL): $(LIBFIRM_FILE) $(OBJECTS)
        @echo "===> LD $@"
-       $(Q)$(CC) $(OBJECTS) $(LFLAGS) $(FIRM_HOME)/$(LIBFIRM_FILE) -o $(GOAL)
+       $(Q)$(CC) $(OBJECTS) $(LIBFIRM_FILE) -o $(GOAL) $(LFLAGS)
+
+ifneq ("$(LIBFIRM_FILE)", "")
+$(LIBFIRM_FILE): libfirm_subdir
+# Re-evaluate Makefile after libfirm_subdir has been executed
+Makefile: libfirm_subdir
+# Build libfirm in subdirectory
+libfirm_subdir:
+       $(Q)$(MAKE) -C $(FIRM_HOME) $(LIBFIRM_FILE_BASE)
+endif
 
 splint: $(SPLINTS)
 
@@ -123,34 +129,34 @@ bootstrap2: cparser.bootstrap2
        @echo '===> CPARSER $<'
        $(Q)./cparser $(CPPFLAGS) -fsyntax-only $<
 
-build/cpb/%.o: %.c build/cparser
+$(BUILDDIR)/cpb/%.o: %.c $(BUILDDIR)/cparser
        @echo '===> CPARSER $<'
-       $(Q)./build/cparser $(CPPFLAGS) -std=c99 -Wall -g3 -c $< -o $@
+       $(Q)./$(BUILDDIR)/cparser $(CPPFLAGS) -std=c99 -Wall -g3 -c $< -o $@
 
-build/cpbe/%.o: %.c
+$(BUILDDIR)/cpbe/%.o: %.c
        @echo '===> ECCP $<'
        $(Q)eccp $(CPPFLAGS) -std=c99 -Wall -c $< -o $@
 
-build/cpb2/%.o: %.c cparser.bootstrap
+$(BUILDDIR)/cpb2/%.o: %.c cparser.bootstrap
        @echo '===> CPARSER.BOOTSTRAP $<'
        $(Q)./cparser.bootstrap $(CPPFLAGS) -Wall -g -c $< -o $@
 
 cparser.bootstrap: $(CPARSEROS)
        @echo "===> LD $@"
-       $(Q)./build/cparser $(CPARSEROS) $(LFLAGS) -o $@
+       $(Q)./$(BUILDDIR)/cparser $(CPARSEROS) $(LFLAGS) -o $@
 
 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
+$(BUILDDIR)/%.o: %.c
        @echo '===> CC $<'
        $(Q)$(CC) $(CPPFLAGS) $(CFLAGS) -MMD -c $< -o $@
 
 clean:
        @echo '===> CLEAN'
-       $(Q)rm -rf build/* $(GOAL)
+       $(Q)rm -rf $(BUILDDIR)/ $(GOAL)