makefile updates

[r14865]

diff --git a/MakeRules.in b/MakeRules.in
index c3a95c8..012fe89 100644 (file)
--- a/MakeRules.in
+++ b/MakeRules.in
@@ -16,7 +16,7 @@ LIBFIRM_VERSION = @PACKAGE_VERSION@
 
 CC = @CC@
 CFLAGS := -Wall -Wstrict-prototypes @CFLAGS@
-CPPFLAGS := -I. -I$(topdir) -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@ @LIBCORE_CFLAGS@
+CPPFLAGS := -I. -I$(topdir) -I$(top_srcdir)/include/libfirm -I$(top_srcdir)/include/libfirm/adt -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@ @LIBCORE_CFLAGS@
 prefix?=@prefix@
 exec_prefix?=@exec_prefix@
 includedir?=@includedir@

diff --git a/config.h.in b/config.h.in
index 1478e95..cb079f7 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,14 +1,21 @@
-/*
- * Project:     libFIRM
- * File name:   acconfig.h
- * Purpose:
- * Author:      Till Riedel
- * Modified by:
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 2002-2003 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
- */
+/* config.h.in.  Generated from configure.in by autoheader.  */
+
+
+
+/* define to enable debugging stuff */
+#undef DEBUG_libfirm
+
+/* enable heap analysis */
+#undef DO_HEAPANALYSIS
+
+/* enable firm hooks */
+#undef FIRM_ENABLE_HOOKS
+
+/* enable wchar_t support for identifiers */
+#undef FIRM_ENABLE_WCHAR
+
+/* enable statistics code */
+#undef FIRM_STATISTICS
 
 /* Define to 1 if you have the <alloca.h> header file. */
 #undef HAVE_ALLOCA_H
@@ -19,6 +26,13 @@
 /* Define to 1 if you have the <jni.h> header file. */
 #undef HAVE_JNI_H
 
+/* Define to 1 if you have the <libxml/parser.h> header file. */
+#undef HAVE_LIBXML_PARSER_H
+
+/* Define to 1 if long double works and has more range or precision than
+   double. */
+#undef HAVE_LONG_DOUBLE
+
 /* Define to 1 if you have the <math.h> header file. */
 #undef HAVE_MATH_H
 
@@ -49,6 +63,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* define to disable asserts */
+#undef NDEBUG
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -67,57 +84,38 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* ---------------snip, snip ---------------------- */
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define to 1 if long double works and has more range or precision than
-   double. */
-#undef HAVE_LONG_DOUBLE
-
-/* Define to 1 for heap analysis support */
-#undef DO_HEAPANALYSIS
-
-/* Define the right volatile token */
-#undef volatile
-
-/* Define the right inline token */
-#undef inline
+/* use inlining */
+#undef USE_INLINING
 
-/* Define the right const token */
-#undef const
+/* compile with ilp solver support */
+#undef WITH_ILP
 
-/* define to 1 to enable debugging stuff. */
-#undef DEBUG_libfirm
+/* compile with jvm support */
+#undef WITH_JVM
 
 /* define to 1 to use the libcore */
 #undef WITH_LIBCORE
 
-/* define to 1 to use the ILP solver */
-#undef WITH_ILP
-
-/* define to 1 to enable Firm to call the JVM */
-#undef WITH_JVM
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
 
-/* define to 1 if we use gnu extensions */
+/* we use gnu extensions */
 #undef _GNU_SOURCE
 
-/* define to 1 to have wchar_t support for identifiers */
-#define FIRM_ENABLE_WCHAR
-
-/* Define to disable assertion checking.  */
-#undef NDEBUG
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
 
-/* undef to disable inlining */
-#undef USE_INLINING
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
 
-/* Define to 1 if Firm hooks are activated */
-#undef FIRM_ENABLE_HOOKS
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+   code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile
 
-/* Define to 1 if Firm statistics are activated */
-#undef FIRM_STATISTICS
 
 #ifdef USE_INLINING
 #define INLINE inline

diff --git a/configure.in b/configure.in
index 5abc16f..14c2cc8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -419,7 +419,6 @@ AC_CONFIG_FILES([
        ir/ir/Makefile
        ir/ana/Makefile
        ir/tr/Makefile
-       ir/ana2/Makefile
        ir/stat/Makefile
        ir/opt/Makefile
        ir/external/Makefile
@@ -429,6 +428,7 @@ AC_CONFIG_FILES([
        testprograms/Makefile
        firmjni/Makefile
        firmjni/testprograms/Makefile
+       include/libfirm/Makefile
        libfirm.doxygen
        libfirm.pc
 ])

diff --git a/ir/ana/Makefile.in b/ir/ana/Makefile.in
index 99e63f4..7601e09 100644 (file)
--- a/ir/ana/Makefile.in
+++ b/ir/ana/Makefile.in
@@ -15,21 +15,13 @@ srcdir = @srcdir@
 topdir = ../..
 subdir := ir/ana
 
-INSTALL_HEADERS = irouts.h trouts.h irdom.h cgana.h irloop.h irtypeinfo.h irsimpletype.h  \
-               callgraph.h rta.h interval_analysis.h                                   \
-               field_temperature.h execution_frequency.h irextbb.h irconsconfirm.h \
-               analyze_irg_args.h height.h \
-               cdep.h execfreq.h irmemory.h absgraph.h dfs.h irlivechk.h
-
-SOURCES = $(INSTALL_HEADERS)
-
-SOURCES += Makefile.in \
+SOURCES = Makefile.in \
                irouts.c trouts.c irdom_t.h irdom.c cgana.c     rta.c  \
                irloop_t.h irbackedge.c irbackedge_t.h irscc.c ircfscc.c        \
                irtypeinfo.c irsimpletype.c interval_analysis.c                 \
                callgraph.c field_temperature.c execution_frequency.c phiclass.c \
                irextbb.c irextbb_t.h irconsconfirm.c analyze_irg_args.c \
-               compute_loop_info.c compute_loop_info.h height.c \
+               compute_loop_info.c height.c \
                cdep.c execfreq.c irextbb2.c irmemory.c dfs.c absgraph.c irlivechk.c
 
 include $(topdir)/MakeRules

diff --git a/ir/ana/absgraph.c b/ir/ana/absgraph.c
index b880304..1d483e2 100644 (file)
--- a/ir/ana/absgraph.c
+++ b/ir/ana/absgraph.c
@@ -26,6 +26,10 @@
  *
  * Abstract graph implementations for the CFG of a ir_graph.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "irgraph_t.h"
 #include "iredges_t.h"
 #include "absgraph.h"

diff --git a/ir/ana/dfs.c b/ir/ana/dfs.c
index 880706e..c80d578 100644 (file)
--- a/ir/ana/dfs.c
+++ b/ir/ana/dfs.c
@@ -26,6 +26,10 @@
  *
  * Simple depth first search on CFGs.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #include "irtools.h"
 #include "irprintf.h"

diff --git a/ir/ana/irlivechk.c b/ir/ana/irlivechk.c
index 34d428d..ac85d31 100644 (file)
--- a/ir/ana/irlivechk.c
+++ b/ir/ana/irlivechk.c
@@ -37,6 +37,9 @@
  *
  * The precomputation remains valid as long as the CFG is not altered.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 

diff --git a/ir/arch/Makefile.in b/ir/arch/Makefile.in
index e5fecfe..881c08e 100644 (file)
--- a/ir/arch/Makefile.in
+++ b/ir/arch/Makefile.in
@@ -15,11 +15,7 @@ srcdir = @srcdir@
 topdir = ../..
 subdir := ir/ir
 
-INSTALL_HEADERS = modeconv.h archop.h
-
-SOURCES = $(INSTALL_HEADERS)
-
-SOURCES +=     Makefile.in \
+SOURCES =      Makefile.in \
                archop.c # modeconv.c
 
 include $(topdir)/MakeRules

diff --git a/ir/be/Makefile.in b/ir/be/Makefile.in
index f74d88b..9b94829 100644 (file)
--- a/ir/be/Makefile.in
+++ b/ir/be/Makefile.in
@@ -15,11 +15,7 @@ srcdir = @srcdir@
 topdir = ../..
 subdir := ir/be
 
-INSTALL_HEADERS = be.h bearch.h
-
-SOURCES = $(INSTALL_HEADERS)
-
-SOURCES +=     Makefile.in besched.h belistsched.h belistsched.c \
+SOURCES =      Makefile.in besched.h belistsched.h belistsched.c \
        beutil.h bemain.c besched.c bemain.c belive.c belive.h \
        bechordal.c bera.c beutil.c beirg.c beirg.h \
        bera.h bechordal_main.c beschedregpress.c beschedtrace.c beschedtrivial.c \
@@ -36,12 +32,12 @@ SOURCES +=  Makefile.in besched.h belistsched.h belistsched.c \
        bessadestrsimple.c beifg_clique.c beifg_list.c beifg_pointer.c \
        bejavacoal.c becopyheur3.c bespillremat.c \
        bespillslots.h bespillslots.c beprofile.c \
-       bestatevent.h bestatevent.c be_dbgout.h bestabs.c beschedrss.c \
+       be_dbgout.h bestabs.c beschedrss.c \
        beblocksched.h beblocksched.c bespilloptions.c bespilloptions.h \
        beilpsched.c beilpsched.h bemachine.c bemachine.h \
        bemodule.c bemodule.h beloopana.c beloopana.h \
        begnuas.c begnuas.h beemitter.c beemitter.h bedomfront.c bestate.c \
-       bessaconstr.c bessaconstr.h bestate.c bestate.h bedaemelspill.c
+       bessaconstr.c bessaconstr.h bestate.c bestate.h bespilldaemel.c
 
 
 

diff --git a/ir/be/arm/Makefile.in b/ir/be/arm/Makefile.in
index 9ba4225..17b2f67 100644 (file)
--- a/ir/be/arm/Makefile.in
+++ b/ir/be/arm/Makefile.in
@@ -20,7 +20,7 @@ arch = arm
 
 SOURCES = Makefile.in $(arch)_new_nodes.c $(arch)_new_nodes.h gen_$(arch)_new_nodes.c.inl gen_$(arch)_new_nodes.h \
                gen_$(arch)_emitter.c gen_$(arch)_emitter.h $(arch)_emitter.c $(arch)_emitter.h \
-               bearch_$(arch).c gen_$(arch)_regalloc_if_t.h gen_$(arch)_regalloc_if.h gen_$(arch)_regalloc_if.c \
+               bearch_$(arch).c gen_$(arch)_regalloc_if.h gen_$(arch)_regalloc_if.c \
                $(arch)_transform.c $(arch)_transform.h \
                $(arch)_map_regs.c $(arch)_map_regs.h gen_$(arch)_machine.c gen_$(arch)_machine.h
 
@@ -49,7 +49,7 @@ $(full_dirbe)/gen_$(arch)_emitter.c $(full_dirbe)/gen_$(arch)_emitter.h: $(full_
 $(full_dirbe)/gen_$(arch)_machine.c $(full_dirbe)/gen_$(arch)_machine.h: $(full_dir)/scripts/generate_machine.pl $(full_dirbe)/$(arch)_spec.pl
        $(full_dir)/scripts/generate_machine.pl $(full_dirbe)/$(arch)_spec.pl $(full_dirbe)
 
-$(full_dirbe)/gen_$(arch)_regalloc_if.c $(full_dirbe)/gen_$(arch)_regalloc_if.h $(full_dirbe)/gen_$(arch)_regalloc_if_t.h: $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl
+$(full_dirbe)/gen_$(arch)_regalloc_if.c $(full_dirbe)/gen_$(arch)_regalloc_if.h: $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl
        $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl $(full_dirbe)
 
 all: subdir.o

diff --git a/ir/be/ia32/Makefile.in b/ir/be/ia32/Makefile.in
index 37ffd27..e614152 100644 (file)
--- a/ir/be/ia32/Makefile.in
+++ b/ir/be/ia32/Makefile.in
@@ -20,7 +20,7 @@ arch = ia32
 
 SOURCES = Makefile.in $(arch)_new_nodes.c $(arch)_new_nodes.h gen_$(arch)_new_nodes.c.inl gen_$(arch)_new_nodes.h \
                gen_$(arch)_emitter.c gen_$(arch)_emitter.h $(arch)_emitter.c $(arch)_emitter.h \
-               bearch_$(arch).c gen_$(arch)_regalloc_if_t.h gen_$(arch)_regalloc_if.h gen_$(arch)_regalloc_if.c \
+               bearch_$(arch).c gen_$(arch)_regalloc_if.h gen_$(arch)_regalloc_if.c \
                $(arch)_transform.c $(arch)_transform.h \
                $(arch)_map_regs.c $(arch)_map_regs.h $(arch)_optimize.c $(arch)_optimize.h \
                $(arch)_x87.c $(arch)_x87.h $(arch)_intrinsics.c $(arch)_finish.c $(arch)_finish.h $(arch)_util.c $(arch)_util.h \
@@ -51,7 +51,7 @@ $(full_dirbe)/gen_$(arch)_emitter.c $(full_dirbe)/gen_$(arch)_emitter.h: $(full_
 $(full_dirbe)/gen_$(arch)_machine.c $(full_dirbe)/gen_$(arch)_machine.h: $(full_dir)/scripts/generate_machine.pl $(full_dirbe)/$(arch)_spec.pl
        $(full_dir)/scripts/generate_machine.pl $(full_dirbe)/$(arch)_spec.pl $(full_dirbe)
 
-$(full_dirbe)/gen_$(arch)_regalloc_if.c $(full_dirbe)/gen_$(arch)_regalloc_if.h $(full_dirbe)/gen_$(arch)_regalloc_if_t.h: $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl
+$(full_dirbe)/gen_$(arch)_regalloc_if.c $(full_dirbe)/gen_$(arch)_regalloc_if.h: $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl
        $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl $(full_dirbe)
 
 all: subdir.o

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index 2115a76..e6edad5 100644 (file)
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -1718,7 +1718,6 @@ static ir_node *try_create_TestJmp(ir_node *block, ir_node *node, long pnc)
        if(!tarval_is_null(tv))
                return NULL;
 
-
        if(is_And(cmp_a) && (pnc == pn_Cmp_Eq || pnc == pn_Cmp_Lg)) {
                and_left  = get_And_left(cmp_a);
                and_right = get_And_right(cmp_a);

diff --git a/ir/be/mips/Makefile.in b/ir/be/mips/Makefile.in
index 015852a..7463f4c 100644 (file)
--- a/ir/be/mips/Makefile.in
+++ b/ir/be/mips/Makefile.in
@@ -20,7 +20,7 @@ arch = mips
 
 SOURCES = Makefile.in $(arch)_new_nodes.c $(arch)_new_nodes.h gen_$(arch)_new_nodes.c.inl gen_$(arch)_new_nodes.h \
                gen_$(arch)_emitter.c gen_$(arch)_emitter.h $(arch)_emitter.c $(arch)_emitter.h \
-               bearch_$(arch).c gen_$(arch)_regalloc_if_t.h gen_$(arch)_regalloc_if.h gen_$(arch)_regalloc_if.c \
+               bearch_$(arch).c gen_$(arch)_regalloc_if.h gen_$(arch)_regalloc_if.c \
                $(arch)_transform.c $(arch)_transform.h $(arch)_scheduler.c $(arch)_scheduler.h \
                $(arch)_map_regs.c $(arch)_map_regs.h gen_$(arch)_machine.c gen_$(arch)_machine.h
 
@@ -49,7 +49,7 @@ $(full_dirbe)/gen_$(arch)_emitter.c $(full_dirbe)/gen_$(arch)_emitter.h: $(full_
 $(full_dirbe)/gen_$(arch)_machine.c $(full_dirbe)/gen_$(arch)_machine.h: $(full_dir)/scripts/generate_machine.pl $(full_dirbe)/$(arch)_spec.pl
        $(full_dir)/scripts/generate_machine.pl $(full_dirbe)/$(arch)_spec.pl $(full_dirbe)
 
-$(full_dirbe)/gen_$(arch)_regalloc_if.c $(full_dirbe)/gen_$(arch)_regalloc_if.h $(full_dirbe)/gen_$(arch)_regalloc_if_t.h: $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl
+$(full_dirbe)/gen_$(arch)_regalloc_if.c $(full_dirbe)/gen_$(arch)_regalloc_if.h: $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl
        $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl $(full_dirbe)
 
 all: subdir.o

diff --git a/ir/be/ppc32/Makefile.in b/ir/be/ppc32/Makefile.in
index 082b0ef..2cdc718 100644 (file)
--- a/ir/be/ppc32/Makefile.in
+++ b/ir/be/ppc32/Makefile.in
@@ -20,7 +20,7 @@ arch = ppc32
 
 SOURCES = Makefile.in $(arch)_new_nodes.c $(arch)_new_nodes.h gen_$(arch)_new_nodes.c.inl gen_$(arch)_new_nodes.h \
                gen_$(arch)_emitter.c gen_$(arch)_emitter.h $(arch)_emitter.c $(arch)_emitter.h \
-               bearch_$(arch).c gen_$(arch)_regalloc_if_t.h gen_$(arch)_regalloc_if.h gen_$(arch)_regalloc_if.c \
+               bearch_$(arch).c gen_$(arch)_regalloc_if.h gen_$(arch)_regalloc_if.c \
                $(arch)_transform.c $(arch)_transform.h \
                $(arch)_map_regs.c $(arch)_map_regs.h $(arch)_transform_conv.c $(arch)_transform_conv.h \
                gen_$(arch)_machine.c gen_$(arch)_machine.h
@@ -50,7 +50,7 @@ $(full_dirbe)/gen_$(arch)_emitter.c $(full_dirbe)/gen_$(arch)_emitter.h: $(full_
 $(full_dirbe)/gen_$(arch)_machine.c $(full_dirbe)/gen_$(arch)_machine.h: $(full_dir)/scripts/generate_machine.pl $(full_dirbe)/$(arch)_spec.pl
        $(full_dir)/scripts/generate_machine.pl $(full_dirbe)/$(arch)_spec.pl $(full_dirbe)
 
-$(full_dirbe)/gen_$(arch)_regalloc_if.c $(full_dirbe)/gen_$(arch)_regalloc_if.h $(full_dirbe)/gen_$(arch)_regalloc_if_t.h: $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl
+$(full_dirbe)/gen_$(arch)_regalloc_if.c $(full_dirbe)/gen_$(arch)_regalloc_if.h: $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl
        $(full_dir)/scripts/generate_regalloc_if.pl $(full_dirbe)/$(arch)_spec.pl $(full_dirbe)
 
 all: subdir.o

diff --git a/ir/common/Makefile.in b/ir/common/Makefile.in
index 885dcf3..62770f6 100644 (file)
--- a/ir/common/Makefile.in
+++ b/ir/common/Makefile.in
@@ -15,13 +15,9 @@ srcdir = @srcdir@
 topdir = ../..
 subdir := ir/common
 
-INSTALL_HEADERS := firm_types.h firm_common.h firm.h firmwalk.h statistics.h debug.h
-
-SOURCES = $(INSTALL_HEADERS)
-
-SOURCES += Makefile.in                                                 \
+SOURCES = Makefile.in                                          \
        error.c firm_common.c firm.c firmwalk.c                 \
-       error.h firm_common_t.h statistics.c debug.c old_fctnames.h \
+       error.h firm_common_t.h statistics.c debug.c  \
        irtools.c irtools.h
 
 include $(topdir)/MakeRules

diff --git a/ir/debug/Makefile.in b/ir/debug/Makefile.in
index f138e29..32d8ec3 100644 (file)
--- a/ir/debug/Makefile.in
+++ b/ir/debug/Makefile.in
@@ -15,11 +15,11 @@ srcdir = @srcdir@
 topdir = ../..
 subdir := ir/debug
 
-INSTALL_HEADERS = dbginfo.h seqnumbers.h firm_ycomp.h
+INSTALL_HEADERS =
 
 SOURCES = $(INSTALL_HEADERS)
 
-SOURCES += Makefile.in dbginfo.c dbginfo.h seqnumbers.c debugger.c debugger.h firm_ycomp.c
+SOURCES += Makefile.in dbginfo.c dbginfo_t.h seqnumbers.c debugger.c debugger.h firm_ycomp.c
 
 include $(topdir)/MakeRules
 

diff --git a/ir/ident/Makefile.in b/ir/ident/Makefile.in
index acd9107..fcb65df 100644 (file)
--- a/ir/ident/Makefile.in
+++ b/ir/ident/Makefile.in
@@ -15,11 +15,7 @@ srcdir = @srcdir@
 topdir = ../..
 subdir := ir/ident
 
-INSTALL_HEADERS = ident.h
-
-SOURCES = $(INSTALL_HEADERS)
-
-SOURCES += Makefile.in ident.c ident_t.h
+SOURCES = Makefile.in ident.c ident_t.h
 
 
 include $(topdir)/MakeRules

diff --git a/ir/ir/Makefile.in b/ir/ir/Makefile.in
index 5c2023f..b977c7d 100644 (file)
--- a/ir/ir/Makefile.in
+++ b/ir/ir/Makefile.in
@@ -17,18 +17,11 @@ subdir := ir/ir
 
 enable_libcore := @enable_libcore@
 
-INSTALL_HEADERS = irprog.h irgraph.h irnode.h irmode.h irop.h ircons.h \
-               irflag.h irvrfy.h irgwalk.h irgmod.h iropt.h irdump.h   \
-               irgopt.h ircgcons.h ircgopt.h irreflect.h irarch.h irprintf.h \
-               pseudo_irg.h irhooks.h iredges.h iredgekinds.h
-
-SOURCES = $(INSTALL_HEADERS)
-
-SOURCES +=     Makefile.in \
+SOURCES =      Makefile.in \
                ircons.c ircons_t.h irgmod.c irgraph_t.h irnode.c iropt.c iropt_t.h irvrfy.c \
                irgwalk.c irgwalk_blk.c irdump.c irdumptxt.c irgopt.c irgopt_t.h irnode_t.h     \
                irmode.c irop.c irprog.c irflag.c irflag_t.h irgraph.c irprintf_t.h \
-               irmode_t.h irop_t.h irprog_t.h ircgcons.c ircgopt.c irreflect.c irarch.c \
+               irmode_t.h irop_t.h irprog_t.h ircgcons.c ircgopt.c irarch.c \
                pseudo_irg.c irhooks.c iredges.c irprintf.c irvrfy_t.h irphase.c irphase_t.h \
                irnodeset.c
 

diff --git a/ir/lower/Makefile.in b/ir/lower/Makefile.in
index 54963f8..21f38c5 100644 (file)
--- a/ir/lower/Makefile.in
+++ b/ir/lower/Makefile.in
@@ -15,11 +15,7 @@ srcdir = @srcdir@
 topdir = ../..
 subdir := ir/lower
 
-INSTALL_HEADERS = lower_intrinsics.h lower_calls.h lower_dw.h lower_hl.h
-
-SOURCES = $(INSTALL_HEADERS)
-
-SOURCES +=     Makefile.in \
+SOURCES =      Makefile.in \
                lower_intrinsics.c lower_calls.c lower_dw.c lower_hl.c
 
 include $(topdir)/MakeRules

diff --git a/ir/opt/Makefile.in b/ir/opt/Makefile.in
index 23daeb6..c2841a1 100644 (file)
--- a/ir/opt/Makefile.in
+++ b/ir/opt/Makefile.in
@@ -15,15 +15,7 @@ srcdir = @srcdir@
 topdir = ../..
 subdir := ir/opt
 
-INSTALL_HEADERS = cfopt.h tailrec.h ldstopt.h strength_red.h reassoc.h \
-               loop_unrolling.h funccall.h opt_polymorphy.h ifconv.h \
-               return.h tropt.h scalar_replace.h escape_ana.h \
-               proc_cloning.h opt_confirms.h gvn_pre.h opt_frame.h \
-               opt_osr.h condeval.h ldst2.h convopt.h
-
-SOURCES = $(INSTALL_HEADERS)
-
-SOURCES +=     Makefile.in \
+SOURCES =      Makefile.in \
                cfopt.c tailrec.c strength_red.c ldstopt.c reassoc.c \
                loop_unrolling.c ifconv.c scalar_replace.c funccall.c \
                opt_polymorphy.c return.c tropt.c opt_confirms.c opt_confirms.h \

diff --git a/ir/stat/Makefile.in b/ir/stat/Makefile.in
index a100f54..ec052c2 100644 (file)
--- a/ir/stat/Makefile.in
+++ b/ir/stat/Makefile.in
@@ -17,11 +17,7 @@ subdir := ir/ir
 # do we want statistics
 enable_statistics := @enable_statistics@
 
-INSTALL_HEADERS = firmstat.h
-
-SOURCES = $(INSTALL_HEADERS)
-
-SOURCES +=     Makefile.in \
+SOURCES =      Makefile.in \
                firmstat.c
 
 ifeq ($(enable_statistics),yes)

diff --git a/ir/stat/statev.h b/ir/stat/statev.h
index 032a693..eed576f 100644 (file)
--- a/ir/stat/statev.h
+++ b/ir/stat/statev.h
@@ -38,7 +38,7 @@
 #define stat_ev_ctx_push_fobj(key, firm_object)
 #define stat_ev_ctx_push(key, value)
 #define stat_ev_ctx_pop()
-#define stat_ev_begin(prefix, blub)
+#define stat_ev_begin(prefix)
 #define stat_ev_end()
 
 #else

diff --git a/ir/tr/Makefile.in b/ir/tr/Makefile.in
index 9c7fa37..d3c1360 100644 (file)
--- a/ir/tr/Makefile.in
+++ b/ir/tr/Makefile.in
@@ -15,14 +15,9 @@ srcdir = @srcdir@
 topdir = ../..
 subdir := ir/tr
 
-INSTALL_HEADERS = entity.h mangle.h tpop.h type.h typewalk.h type_or_entity.h  \
-       typegmod.h trvrfy.h type_identify.h tr_inheritance.h
-
-SOURCES = $(INSTALL_HEADERS)
-
-SOURCES += Makefile.in \
-               entity.c entity_t.h mangle.c tpop.c tpop_t.h type.c type_t.h    \
-               typewalk.c typegmod.c trvrfy.h trvrfy.c type_identify.c tr_inheritance.c
+SOURCES = Makefile.in \
+               entity.c entity_t.h tpop.c tpop_t.h type.c type_t.h     \
+               typewalk.c typegmod.c trvrfy.c type_identify.c tr_inheritance.c
 
 
 include $(topdir)/MakeRules

diff --git a/ir/tv/Makefile.in b/ir/tv/Makefile.in
index 2c6f5b6..7888d25 100644 (file)
--- a/ir/tv/Makefile.in
+++ b/ir/tv/Makefile.in
@@ -15,11 +15,7 @@ srcdir = @srcdir@
 topdir = ../..
 subdir := ir/tv
 
-INSTALL_HEADERS = tv.h
-
-SOURCES = $(INSTALL_HEADERS)
-
-SOURCES += Makefile.in tv.c tv_t.h strcalc.c strcalc.h fltcalc.c fltcalc.h
+SOURCES = Makefile.in tv.c tv_t.h strcalc.c strcalc.h fltcalc.c fltcalc.h
 
 include $(topdir)/MakeRules
 
@@ -28,12 +24,6 @@ CPPFLAGS += -I$(top_srcdir)/ir/common -I$(top_srcdir)/ir/tr  -I$(top_srcdir)/ir/
            -I$(top_srcdir)/ir/st     -I$(top_srcdir)/ir/ana -I$(top_srcdir)/ir/external \
            -I$(topdir)/ir/config
 
-tv.o: tv.h tv.c fltcalc.h fltcalc.c strcalc.h strcalc.c
-
-fltcalc.o: fltcalc.h fltcalc.c strcalc.h strcalc.c
-
-strcalc.o: strcalc.h strcalc.c
-
 include $(top_srcdir)/MakeTargets
 
 all: subdir.o