X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile;h=b5f27dd57c2ff83be7b6409afa6a46a2795c7e23;hb=fd96240794b2bc719ca2da1e2415ae9cef8d475a;hp=2198e2411d1c86db5f928fcfd46228d82f233e2b;hpb=a276562e751e2d9c8701c9f5106a221ca9c99ec4;p=libfirm

diff --git a/Makefile b/Makefile
index 2198e2411..b5f27dd57 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ variant      ?= debug
 
 srcdir       ?= $(top_srcdir)
 builddir     ?= $(top_builddir)/$(variant)
-docdir       ?= $(top_builddir)/firm-doc
+docdir       ?= $(top_builddir)/doc
 
 # This hides the noisy commandline outputs. You can see them with "make Q="
 Q ?= @
@@ -26,11 +26,13 @@ AR ?= ar
 DLLEXT ?= .so
 
 # Variants
-CFLAGS_all        = -fPIC -DHAVE_FIRM_REVISION_H
+CFLAGS_all        = -std=c99 -fPIC -DHAVE_FIRM_REVISION_H
 CFLAGS_debug      = $(CFLAGS_all) -O0 -g3 -DDEBUG_libfirm
 CFLAGS_profile    = $(CFLAGS_all) -O3 -pg -DNDEBUG -fno-inline
-LINKFLAGS_profile = -pg
-CFLAGS_optimize   = $(CFLAGS_all) -O3 -DNDEBUG
+CFLAGS_coverage   = $(CFLAGS_all) -O0 --coverage -DDEBUG_libfirm
+LINKFLAGS_profile  = -pg
+LINKFLAGS_coverage = --coverage
+CFLAGS_optimize   = $(CFLAGS_all) -O3 -fomit-frame-pointer -DNDEBUG
 
 # General flags
 CFLAGS    += $(CFLAGS_$(variant))
@@ -46,8 +48,11 @@ UNUSED := $(shell \
 	echo "$$REV" | cmp -s - firm_revision.h 2> /dev/null || echo "$$REV" > firm_revision.h \
 )
 
-.PHONY: all
 all: firm
+.PHONY: all
+
+# disable make builtin suffix rules
+.SUFFIXES:
 
 # This rule is necessary so that make does not abort if headers get deleted
 # (the deleted header might still be referenced in a .d file)
@@ -60,7 +65,7 @@ $(srcdir)config.h:
 	$(Q)rm -f $@
 	$(Q)echo "#define libfirm_VERSION_MAJOR 1" >> $@
 	$(Q)echo "#define libfirm_VERSION_MICRO 0" >> $@
-	$(Q)echo "#define libfirm_VERSION_MINOR 20" >> $@
+	$(Q)echo "#define libfirm_VERSION_MINOR 21" >> $@
 
 # libFirm
 libfirm_DIRS := \
@@ -179,17 +184,17 @@ $(builddir)/%.o: %.c $(IR_SPEC_GENERATED_FILES) config.h
 	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(libfirm_CPPFLAGS) -MMD -c -o $@ $<
 
 $(docdir)/libfirm.tag: $(IR_SPEC_GENERATED_FILES) Doxyfile $(wildcard include/libfirm/*.h) $(wildcard include/libfirm/adt/*.h)
-	@echo Doxygen
+	@echo Doxygen $@
 	$(Q)$(DOXYGEN)
 
 DOCU_GENERATOR := scripts/gen_docu.py
 $(docdir)/html/nodes.html: $(docdir)/libfirm.tag $(DOCU_GENERATOR) $(IR_SPEC) scripts/spec_util.py scripts/style.css
-	@echo gen_docu.py
-	$(Q)$(DOCU_GENERATOR) $(docdir)/libfirm.tag "" $@
+	@echo gen_docu.py $@
+	$(Q)$(DOCU_GENERATOR) $(IR_SPEC) $(docdir)/libfirm.tag "" $@
 	$(Q)cp scripts/style.css $(docdir)/html
 
-.PHONY: documentation
-documentation: $(docdir)/libfirm.tag $(docdir)/html/nodes.html
+.PHONY: doc
+doc: $(docdir)/libfirm.tag $(docdir)/html/nodes.html
 
 .PHONY: clean
 clean: