Remove \n from error messages.

[cparser] / Makefile

diff --git a/Makefile b/Makefile
index ba0c42b..9f0401b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,39 @@
 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 = $(BUILDDIR)/$(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)
 
-CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -std=c99 -pedantic
+CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -std=c99
 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)
 
 SOURCES := \
-       adt/hashset.c \
        adt/strset.c \
        adt/strutil.c \
+       adt/pset_new.c \
        attribute.c \
        parser.c \
        ast.c \
@@ -42,11 +47,12 @@ SOURCES := \
        entitymap.c \
        format_check.c \
        input.c \
-       lexer.c \
+       jump_target.c \
        main.c \
        mangle.c \
        preprocessor.c \
        printer.c \
+       string_rep.c \
        symbol_table.c \
        token.c \
        type.c \
@@ -56,7 +62,8 @@ SOURCES := \
        warning.c \
        walk.c \
        wrappergen/write_fluffy.c \
-       wrappergen/write_jna.c
+       wrappergen/write_jna.c \
+       wrappergen/write_compoundsizes.c
 
 OBJECTS = $(SOURCES:%.c=$(BUILDDIR)/%.o)
 DEPENDS = $(OBJECTS:%.o=%.d)
@@ -71,7 +78,7 @@ 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)
 
@@ -93,18 +100,20 @@ 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) $(FIRM_HOME)/$(LIBFIRM_FILE) -o $(GOAL) $(LFLAGS)
+       $(Q)$(CC) $(OBJECTS) $(LIBFIRM_FILE) -o $(GOAL) $(LFLAGS)
+
+ifneq ("$(LIBFIRM_FILE)", "")
+ifneq ("$(MAKECMDGOALS)", "clean")
+$(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
+endif
 
 splint: $(SPLINTS)
 
@@ -154,4 +163,4 @@ $(BUILDDIR)/%.o: %.c
 
 clean:
        @echo '===> CLEAN'
-       $(Q)rm -rf $(BUILDDIR)/ $(GOAL)
+       $(Q)rm -rf $(OBJECTS) $(GOAL)