projects / libfirm / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 21f874b)
Fixed configure: should work now in a build directory again
authorMichael Beck <beck@ipd.info.uni-karlsruhe.de>
Mon, 6 Dec 2004 13:11:05 +0000 (13:11 +0000)
committerMichael Beck <beck@ipd.info.uni-karlsruhe.de>
Mon, 6 Dec 2004 13:11:05 +0000 (13:11 +0000)
[r4574]

15 files changed:
Makefile.in patch | blob | history
configure patch | blob | history
configure.in patch | blob | history
ir/adt/Makefile.in patch | blob | history
ir/ana/Makefile.in patch | blob | history
ir/ana2/Makefile.in patch | blob | history
ir/common/Makefile.in patch | blob | history
ir/config/Makefile.in [new file with mode: 0644] patch | blob
ir/debug/Makefile.in patch | blob | history
ir/external/Makefile.in patch | blob | history
ir/ir/Makefile.in patch | blob | history
ir/opt/Makefile.in patch | blob | history
ir/stat/Makefile.in patch | blob | history
ir/tr/Makefile.in patch | blob | history
ir/tv/Makefile.in patch | blob | history

diff --git a/Makefile.in b/Makefile.in
index 095d4ca..231062c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,7 +22,10 @@ subdir := .
 # do we want statistics
 enable_statistics := @enable_statistics@
 
-subdirs := ir/adt ir/debug ir/tv ir/common ir/ident ir/ir ir/opt ir/tr ir/ana ir/stat ir/external ir/ana2
+build_subdirs := ir/adt ir/debug ir/tv ir/common ir/ident ir/ir ir/opt ir/tr ir/ana \
+       ir/stat ir/external ir/ana2
+
+subdirs := $(build_subdirs) ir/config
 
 SOURCES := Makefile.in MakeRules.in MakeTargets\
           aclocal.m4 config.h.in\
@@ -38,7 +41,7 @@ GENFILES := stamp-h config.log config.cache
 
 include $(topdir)/MakeRules
 
-XOFILES += $(addsuffix /subdir.o, $(subdirs))
+XOFILES += $(addsuffix /subdir.o, $(build_subdirs))
 
 include $(top_srcdir)/MakeTargets
 
diff --git a/configure b/configure
index cc28322..96441a0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1210,10 +1210,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_output_file="Makefile MakeRules ir/Makefile ir/adt/Makefile ir/debug/Makefile \
                ir/tv/Makefile ir/common/Makefile ir/ident/Makefile ir/ir/Makefile \
                ir/ana/Makefile ir/tr/Makefile ir/ana2/Makefile ir/stat/Makefile \
-               ir/opt/Makefile ir/external/Makefile \
+               ir/opt/Makefile ir/external/Makefile ir/config/Makefile \
                testprograms/Makefile firmjni/Makefile firmjni/testprograms/Makefile \
                libfirm.doxygen"
 
+CONF_DIR_NAME=`dirname $0`
+
 ac_config_headers="$ac_config_headers config.h"
 
 
@@ -5414,4 +5416,4 @@ if test "$no_create" != yes; then
 fi
 
 
-gawk -f filter.awk < config.h | sed -f filter.sed > ir/common/firm_config.h
+gawk -f $CONF_DIR_NAME/filter.awk < config.h | sed -f $CONF_DIR_NAME/filter.sed > ir/config/firm_config.h
diff --git a/configure.in b/configure.in
index a730b96..76e4695 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -21,10 +21,13 @@ dnl if other files should be generated just add them to ac_output_files
 ac_output_file="Makefile MakeRules ir/Makefile ir/adt/Makefile ir/debug/Makefile \
                ir/tv/Makefile ir/common/Makefile ir/ident/Makefile ir/ir/Makefile \
                ir/ana/Makefile ir/tr/Makefile ir/ana2/Makefile ir/stat/Makefile \
-               ir/opt/Makefile ir/external/Makefile \
+               ir/opt/Makefile ir/external/Makefile ir/config/Makefile \
                testprograms/Makefile firmjni/Makefile firmjni/testprograms/Makefile \
                libfirm.doxygen"
 
+dnl where is the configure file
+CONF_DIR_NAME=`dirname $0`
+
 dnl generate the config header file
 AC_CONFIG_HEADER(config.h)
 
@@ -297,5 +300,5 @@ dnl ===============
 
 AC_OUTPUT($ac_output_file,[ touch stamp-h ])
 
-dnl snip the lower prt of config.h and put it to ir/common/firm_config.h
-gawk -f filter.awk < config.h | sed -f filter.sed > ir/common/firm_config.h
+dnl snip the lower prt of config.h and put it to ir/config/firm_config.h
+gawk -f $CONF_DIR_NAME/filter.awk < config.h | sed -f $CONF_DIR_NAME/filter.sed > ir/config/firm_config.h
diff --git a/ir/adt/Makefile.in b/ir/adt/Makefile.in
index 65e2026..684e25e 100644 (file)
--- a/ir/adt/Makefile.in
+++ b/ir/adt/Makefile.in
@@ -28,7 +28,7 @@ endif
 
 include $(topdir)/MakeRules
 
-CPPFLAGS += -I$(top_srcdir)/ir/adt -I$(top_srcdir)/ir/common -I$(top_srcdir)/ir/debug
+CPPFLAGS += -I$(top_srcdir)/ir/adt -I$(top_srcdir)/ir/common -I$(top_srcdir)/ir/debug -I$(topdir)/ir/config
 OFILES += pset.o
 
 include $(top_srcdir)/MakeTargets
diff --git a/ir/ana/Makefile.in b/ir/ana/Makefile.in
index e0d96ab..817d32a 100644 (file)
--- a/ir/ana/Makefile.in
+++ b/ir/ana/Makefile.in
@@ -32,7 +32,8 @@ include $(topdir)/MakeRules
 CPPFLAGS += -I$(top_srcdir)/ir/adt -I$(top_srcdir)/ir/ir -I$(top_srcdir)/ir/common  \
                -I$(top_srcdir)/ir/ident -I$(top_srcdir)/ir/tr -I$(top_srcdir)/ir/tv \
                -I$(top_srcdir)/ir/debug -I$(top_srcdir)/ir/ana -I$(top_srcdir)/ir/st \
-               -I$(top_srcdir)/ir/opt -I$(top_srcdir)/ir/stat -I$(top_srcdir)/ir/external
+               -I$(top_srcdir)/ir/opt -I$(top_srcdir)/ir/stat -I$(top_srcdir)/ir/external \
+               -I$(topdir)/ir/config
 
 include $(top_srcdir)/MakeTargets
 
diff --git a/ir/ana2/Makefile.in b/ir/ana2/Makefile.in
index 4e9b9ea..f47b58b 100644 (file)
--- a/ir/ana2/Makefile.in
+++ b/ir/ana2/Makefile.in
@@ -34,7 +34,7 @@ CPPFLAGS += -I$(top_srcdir)/ir/adt -I$(top_srcdir)/ir/ir -I$(top_srcdir)/ir/comm
                -I$(top_srcdir)/ir/ident -I$(top_srcdir)/ir/tr -I$(top_srcdir)/ir/tv \
                -I$(top_srcdir)/ir/debug -I$(top_srcdir)/ir/ana -I$(top_srcdir)/ir/st \
                -I$(top_srcdir)/ir/opt   -I$(top_srcdir)/ir/arch -I$(top_srcdir)/ir/stat \
-                -I$(top_srcdir)/ir/external
+                -I$(top_srcdir)/ir/external -I$(topdir)/ir/config
 
 include $(top_srcdir)/MakeTargets
 
diff --git a/ir/common/Makefile.in b/ir/common/Makefile.in
index fafb335..708aa48 100644 (file)
--- a/ir/common/Makefile.in
+++ b/ir/common/Makefile.in
@@ -15,7 +15,7 @@ srcdir = @srcdir@
 topdir = ../..
 subdir := ir/common
 
-INSTALL_HEADERS := firm_common.h firm.h firmwalk.h statistics.h old_fctnames.h firm_config.h
+INSTALL_HEADERS := firm_common.h firm.h firmwalk.h statistics.h old_fctnames.h
 
 SOURCES = $(INSTALL_HEADERS)
 
@@ -29,7 +29,7 @@ CPPFLAGS += -I$(top_srcdir)/ir/common -I$(top_srcdir)/ir/ident -I$(top_srcdir)/i
                -I$(top_srcdir)/ir/adt -I$(top_srcdir)/ir/tv -I$(top_srcdir)/ir/ir \
                -I$(top_srcdir)/ir/ana -I$(top_srcdir)/ir/st -I$(top_srcdir)/ir/debug \
                -I$(top_srcdir)/ir/opt -I$(top_srcdir)/ir/arch -I$(top_srcdir)/ir/stat \
-                -I$(top_srcdir)/ir/external
+                -I$(top_srcdir)/ir/external -I$(topdir)/ir/config
 
 include $(top_srcdir)/MakeTargets
 
diff --git a/ir/config/Makefile.in b/ir/config/Makefile.in
new file mode 100644 (file)
index 0000000..341599d
--- /dev/null
+++ b/ir/config/Makefile.in
@@ -0,0 +1,26 @@
+#
+# Project:     libFIRM
+# File name:   ir/config/Makefile.in
+# Purpose:
+# Author:      Boris Boesler, Till Riedel
+# Modified by:
+# Created:
+# CVS-ID:      $Id$
+# Copyright:   (c) 1999-2003 Universität Karlsruhe
+# Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+#
+
+top_srcdir := @top_srcdir@
+srcdir = @srcdir@
+topdir = ../..
+subdir := ir/common
+
+INSTALL_HEADERS := firm_config.h
+
+SOURCES = $(INSTALL_HEADERS)
+
+include $(topdir)/MakeRules
+
+include $(top_srcdir)/MakeTargets
+
+all:
diff --git a/ir/debug/Makefile.in b/ir/debug/Makefile.in
index a0b63bb..957e7ed 100644 (file)
--- a/ir/debug/Makefile.in
+++ b/ir/debug/Makefile.in
@@ -25,7 +25,8 @@ include $(topdir)/MakeRules
 
 CPPFLAGS += -I$(top_srcdir)/ir/ident -I$(top_srcdir)/ir/ir -I$(top_srcdir)/ir/tv \
            -I$(top_srcdir)/ir/tr -I$(top_srcdir)/ir/common -I$(top_srcdir)/ir/ana \
-            -I$(top_srcdir)/ir/st -I$(top_srcdir)/ir/adt -I$(top_srcdir)/ir/external
+            -I$(top_srcdir)/ir/st -I$(top_srcdir)/ir/adt -I$(top_srcdir)/ir/external \
+           -I$(topdir)/ir/config
 
 include $(top_srcdir)/MakeTargets
 
diff --git a/ir/external/Makefile.in b/ir/external/Makefile.in
index 863af3e..e589779 100644 (file)
--- a/ir/external/Makefile.in
+++ b/ir/external/Makefile.in
@@ -31,7 +31,7 @@ include $(topdir)/MakeRules
 CPPFLAGS +=    -I$(top_srcdir)/ir/adt   -I$(top_srcdir)/ir/ir  -I$(top_srcdir)/ir/common  \
                -I$(top_srcdir)/ir/ident -I$(top_srcdir)/ir/tr  -I$(top_srcdir)/ir/tv \
                -I$(top_srcdir)/ir/debug -I$(top_srcdir)/ir/ana -I$(top_srcdir)/ir/st \
-               -I$(top_srcdir)/ir/stat  -I$(LIBXML2)/include/libxml2
+               -I$(top_srcdir)/ir/stat  -I$(topdir)/ir/config -I$(LIBXML2)/include/libxml2
 
 include $(top_srcdir)/MakeTargets
 
diff --git a/ir/ir/Makefile.in b/ir/ir/Makefile.in
index e15ef08..8820062 100644 (file)
--- a/ir/ir/Makefile.in
+++ b/ir/ir/Makefile.in
@@ -17,7 +17,8 @@ subdir := ir/ir
 
 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
+               irgopt.h ircgcons.h ircgopt.h irreflect.h irarch.h irprintf.h \
+               irlwrdw.h
 
 SOURCES = $(INSTALL_HEADERS)
 
@@ -25,14 +26,15 @@ 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 irprintf.c
+               irmode_t.h irop_t.h irprog_t.h ircgcons.c ircgopt.c irreflect.c irarch.c irprintf.c \
+               irlwrdw.c
 
 include $(topdir)/MakeRules
 
 CPPFLAGS +=    -I$(top_srcdir)/ir/adt   -I$(top_srcdir)/ir/ir  -I$(top_srcdir)/ir/common  \
                -I$(top_srcdir)/ir/ident -I$(top_srcdir)/ir/tr  -I$(top_srcdir)/ir/tv \
                -I$(top_srcdir)/ir/debug -I$(top_srcdir)/ir/ana -I$(top_srcdir)/ir/st \
-               -I$(top_srcdir)/ir/stat -I$(top_srcdir)/ir/external
+               -I$(top_srcdir)/ir/stat -I$(top_srcdir)/ir/external -I$(topdir)/ir/config
 
 include $(top_srcdir)/MakeTargets
 
diff --git a/ir/opt/Makefile.in b/ir/opt/Makefile.in
index b0f295d..b5bd66e 100644 (file)
--- a/ir/opt/Makefile.in
+++ b/ir/opt/Makefile.in
@@ -21,15 +21,15 @@ INSTALL_HEADERS = cfopt.h tailrec.h ldstopt.h strength_red.h reassoc.h \
 SOURCES = $(INSTALL_HEADERS)
 
 SOURCES +=     Makefile.in \
-               cfopt.c tailrec.c strength_red.c ldstopt.c reassoc.c    \
-               loop_unrolling.c
+               cfopt.c tailrec.c strength_red.c ldstopt.c reassoc.c \
+               loop_unrolling.c funccall.c
 
 include $(topdir)/MakeRules
 
 CPPFLAGS +=    -I$(top_srcdir)/ir/adt   -I$(top_srcdir)/ir/ir  -I$(top_srcdir)/ir/common  \
                -I$(top_srcdir)/ir/ident -I$(top_srcdir)/ir/tr  -I$(top_srcdir)/ir/tv \
                -I$(top_srcdir)/ir/debug -I$(top_srcdir)/ir/ana -I$(top_srcdir)/ir/st \
-               -I$(top_srcdir)/ir/stat -I$(top_srcdir)/ir/external
+               -I$(top_srcdir)/ir/stat -I$(top_srcdir)/ir/external -I$(topdir)/ir/config
 
 include $(top_srcdir)/MakeTargets
 
diff --git a/ir/stat/Makefile.in b/ir/stat/Makefile.in
index c978133..24ada39 100644 (file)
--- a/ir/stat/Makefile.in
+++ b/ir/stat/Makefile.in
@@ -35,7 +35,7 @@ include $(topdir)/MakeRules
 CPPFLAGS +=    -I$(top_srcdir)/ir/adt   -I$(top_srcdir)/ir/ir  -I$(top_srcdir)/ir/common  \
                -I$(top_srcdir)/ir/ident -I$(top_srcdir)/ir/tr  -I$(top_srcdir)/ir/tv \
                -I$(top_srcdir)/ir/debug -I$(top_srcdir)/ir/ana -I$(top_srcdir)/ir/st \
-                -I$(top_srcdir)/ir/external
+                -I$(top_srcdir)/ir/external -I$(topdir)/ir/config
 
 include $(top_srcdir)/MakeTargets
 
diff --git a/ir/tr/Makefile.in b/ir/tr/Makefile.in
index 68de0db..c2f6271 100644 (file)
--- a/ir/tr/Makefile.in
+++ b/ir/tr/Makefile.in
@@ -30,7 +30,8 @@ include $(topdir)/MakeRules
 CPPFLAGS += -I$(top_srcdir)/ir/common -I$(top_srcdir)/ir/ident -I$(top_srcdir)/ir/adt \
            -I$(top_srcdir)/ir/debug  -I$(top_srcdir)/ir/ir    -I$(top_srcdir)/ir/tv  \
            -I$(top_srcdir)/ir/st     -I$(top_srcdir)/ir/ana   -I$(top_srcdir)/ir/opt \
-           -I$(top_srcdir)/ir/stat -I$(top_srcdir)/ir/external
+           -I$(top_srcdir)/ir/arch   -I$(top_srcdir)/ir/stat  -I$(top_srcdir)/ir/external \
+           -I$(topdir)/ir/config
 
 include $(top_srcdir)/MakeTargets
 
diff --git a/ir/tv/Makefile.in b/ir/tv/Makefile.in
index f30f87d..2c6f5b6 100644 (file)
--- a/ir/tv/Makefile.in
+++ b/ir/tv/Makefile.in
@@ -25,7 +25,8 @@ include $(topdir)/MakeRules
 
 CPPFLAGS += -I$(top_srcdir)/ir/common -I$(top_srcdir)/ir/tr  -I$(top_srcdir)/ir/adt   \
            -I$(top_srcdir)/ir/ident  -I$(top_srcdir)/ir/ir  -I$(top_srcdir)/ir/debug \
-           -I$(top_srcdir)/ir/st     -I$(top_srcdir)/ir/ana -I$(top_srcdir)/ir/external
+           -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
 
libfirm