X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile.in;h=856eea4f844703cab25ea958d76de7a4e83be8f4;hb=63bea6c02bc23bdd1f63f2847bc180bdaeecb461;hp=a86cffc091cab9a9785d0d7643c801a8a47b3b3b;hpb=077b749d5960a27f04ff64024b3edc05f0fd0c77;p=libfirm

diff --git a/Makefile.in b/Makefile.in
index a86cffc09..856eea4f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,13 +23,30 @@ subdir := .
 enable_statistics := @enable_statistics@
 # do we want external description of effects
 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@
+LIBS			= @LIBS@
+
+# plugin subdirectories
+plugin_subdirs := @plugin_subdirs@
+
+build_subdirs := ir/adt ir/net ir/debug ir/tv ir/common ir/ident ir/ir \
+		ir/opt ir/tr ir/ana ir/stat ir/ana2 ir/arch ir/lower \
+		$(plugin_subdirs)
 
 ifeq (@enable_external_effects@,yes)
-build_subdirs := ir/adt ir/debug ir/tv ir/common ir/ident ir/ir \
-		ir/opt ir/tr ir/ana ir/stat ir/ana2 ir/external
+build_subdirs += ir/external
+endif
+
+ifeq ($(disable_libiberty),yes)
+build_add_lib := libfirm_xmalloc.a
 else
-build_subdirs := ir/adt ir/debug ir/tv ir/common ir/ident ir/ir \
-		ir/opt ir/tr ir/ana ir/stat ir/ana2
+build_add_lib :=
 endif
 
 subdirs := $(build_subdirs) ir/config
@@ -41,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
@@ -55,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)
 
@@ -64,13 +81,17 @@ $(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)
-	ld -Bshareable -o ./libfirm.so $(XOFILES) -lm -L/usr/public/libxml2/lib -lxml2
+libfirm.so: $(XOFILES)
+	ld -Bshareable -o ./libfirm.so $(XOFILES) -lm $(LDFLAGS) $(LIBS)
 
 testprograms:	libfirm.a
 	$(MAKE) -C testprograms