Make diagnosticvf() slightly more efficient by using fwrite() instead of printing...

[cparser] / Makefile

diff --git a/Makefile b/Makefile
index 197cefe..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 = $(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)
@@ -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)
 
@@ -71,10 +76,11 @@ 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)