X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile;h=3929e5dc3057f23ff76c26ad5099ca097ef4b544;hb=9181bbbb24cd351c0e21c538bcf0341674e0c3fc;hp=49433fee89ec0eb15688bd29768b12e7c48760bf;hpb=d217f68a9e53ec6e800ae31ca3af8ed8b6f9ece9;p=libfirm

diff --git a/Makefile b/Makefile
index 49433fee8..3929e5dc3 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,16 +26,18 @@ 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))
 CFLAGS    += -Wall -W -Wextra -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings
-LINKFLAGS += $(LINKFLAGS_$(variant))
+LINKFLAGS += $(LINKFLAGS_$(variant)) -lm
 VPATH = $(srcdir)
 
 REVISION ?= $(shell git describe --abbrev=40 --always --dirty --match '')
@@ -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 := \
@@ -96,7 +101,6 @@ firm: $(libfirm_dll)
 backends = amd64 arm ia32 sparc TEMPLATE
 
 EMITTER_GENERATOR = $(srcdir)ir/be/scripts/generate_emitter.pl
-EMITTER_GENERATOR2 = $(srcdir)ir/be/scripts/generate_emitter_new.pl
 REGALLOC_IF_GENERATOR = $(srcdir)ir/be/scripts/generate_regalloc_if.pl
 OPCODES_GENERATOR = $(srcdir)ir/be/scripts/generate_new_opcodes.pl
 
@@ -107,7 +111,7 @@ $(1)_GEN_HEADERS =
 
 $(1)_SPEC = ir/be/$(1)/$(1)_spec.pl
 
-$$(srcdir)ir/be/$(1)/gen_$(1)_emitter.h $$(srcdir)ir/be/$(1)/gen_$(1)_emitter.c: $$($(1)_SPEC) $$(EMITTER_GENERATOR) $(EMITTER_GENERATOR2)
+$$(srcdir)ir/be/$(1)/gen_$(1)_emitter.h $$(srcdir)ir/be/$(1)/gen_$(1)_emitter.c: $$($(1)_SPEC) $$(EMITTER_GENERATOR)
 	@echo GEN $$@
 	$(Q)$$(EMITTER_GENERATOR) $$($(1)_SPEC) $$(srcdir)ir/be/$(1)
 $(1)_SOURCES += ir/be/$(1)/gen_$(1)_emitter.c
@@ -170,7 +174,7 @@ $(libfirm_a): $(libfirm_OBJECTS)
 
 $(libfirm_dll): $(libfirm_OBJECTS)
 	@echo LINK $@
-	$(Q)$(LINK) -shared -o $@ $^
+	$(Q)$(LINK) -shared $(LINKFLAGS) -o $@ $^
 
 # Generic rules
 UNUSED := $(shell mkdir -p $(libfirm_DIRS:%=$(builddir)/%))
@@ -179,17 +183,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: