From 553ef19b3f3fd079f14e3d7e9b992160751d7478 Mon Sep 17 00:00:00 2001
From: Michael Beck <beck@ipd.info.uni-karlsruhe.de>
Date: Fri, 2 Sep 2005 13:56:10 +0000
Subject: [PATCH] creates libfirm_xmalloc.a if DISABLE_LIBIBERTY is enabled

[r6573]
---
 Makefile.in        | 20 ++++++++++++++++----
 ir/adt/Makefile.in |  8 +++++++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4609c38ca..7afa388b3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,6 +25,8 @@ enable_statistics := @enable_statistics@
 enable_external_effects := @enable_external_effects@
 # do we want to use the libcore for debug and ADT support
 enable_libcore := @enable_libcore@
+# do we want to disable xmalloc and friends
+disable_libiberty := @disable_libiberty@
 
 # suck in values for the linking procedure:
 LDFLAGS			= @LDFLAGS@
@@ -41,6 +43,12 @@ ifeq (@enable_external_effects@,yes)
 build_subdirs += ir/external
 endif
 
+ifeq ($(disable_libiberty),yes)
+build_add_lib := libfirm_xmalloc.a
+else
+build_add_lib :=
+endif
+
 subdirs := $(build_subdirs) ir/config
 
 SOURCES := Makefile.in MakeRules.in MakeTargets\
@@ -50,7 +58,7 @@ SOURCES := Makefile.in MakeRules.in MakeTargets\
 
 SHARED_LIB = libfirm.so
 
-INSTALL_LIBS = libfirm.a
+INSTALL_LIBS = libfirm.a $(build_add_lib)
 
 GENFILES := stamp-h config.log config.cache
 # config.status config.h.in $(srcdir)/stamp-h.in
@@ -64,7 +72,7 @@ include $(top_srcdir)/MakeTargets
 # add target firmjni if configured with --enable-firmjni
 all: firm
 
-firm: libfirm.a
+firm: libfirm.a $(build_add_lib)
 
 shared: $(SHARED_LIB)
 
@@ -73,12 +81,16 @@ $(OFILES): config.h Makefile
 $(XOFILES): subdir_all
 
 libfirm.a: $(XOFILES) $(OFILES)
-	$(AR) $(ARFLAGS) $@.new $(XOFILES) $(OFILES)
+	$(AR) $(ARFLAGS) $@.new $^
 	mv -f $@.new $@
 	$(RANLIB) $@
 
+libfirm_xmalloc.a: subdir_all ir/adt/xmalloc.o
+	$(AR) $(ARFLAGS) $@.new ir/adt/xmalloc.o
+	mv -f $@.new $@
+
 # dont know about xml here
-libfirm.so: subdir_all $(XOFILES) $(OFILES)
+libfirm.so: $(XOFILES)
 	ld -Bshareable -o ./libfirm.so $(XOFILES) -lm $(LDFLAGS) $(LIBS)
 
 testprograms:	libfirm.a
diff --git a/ir/adt/Makefile.in b/ir/adt/Makefile.in
index 51c715325..861bdd4c7 100644
--- a/ir/adt/Makefile.in
+++ b/ir/adt/Makefile.in
@@ -25,6 +25,12 @@ SOURCES = Makefile.in 			        \
 
 ifeq ($(disable_libiberty),no)
 SOURCES += xmalloc.c
+ADDLIB =
+else
+ADDLIB = xmalloc.o
+
+xmalloc.o: xmalloc.c
+	$(COMPILE.c) -o $@ $<
 endif
 
 include $(topdir)/MakeRules
@@ -37,4 +43,4 @@ include $(top_srcdir)/MakeTargets
 pset.o:	set.c pset.h
 	$(COMPILE.c) -DPSET -o $@ $<
 
-all: subdir.o
+all: subdir.o $(ADDLIB)
-- 
2.20.1