X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile.in;h=fe01ce0e8e3b2f72ecdfd5bef509c0f7cc2f8881;hb=a644cbe05b6cf782f907f84701dba8faf5e995f9;hp=2e6a7e5d9caf9fec41098fa5a24dd6d6486b2216;hpb=d59c61d192ee64bb5b931b7517e55bfba2d95982;p=libfirm

diff --git a/Makefile.in b/Makefile.in
index 2e6a7e5d9..fe01ce0e8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,8 +21,35 @@ topdir := .
 subdir := .
 # do we want statistics
 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@
 
-subdirs := ir/adt ir/debug ir/tv ir/common ir/ident ir/ir ir/opt ir/tr ir/ana ir/stat ir/external # ir/st
+# suck in values for the linking procedure:
+LDFLAGS			= @LDFLAGS@
+LIBS			= @LIBS@
+
+# plugin subdirectories
+plugin_subdirs := @plugin_subdirs@
+
+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/arch ir/lower \
+		$(plugin_subdirs)
+
+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\
 	   aclocal.m4 config.h.in\
@@ -31,33 +58,40 @@ SOURCES := Makefile.in MakeRules.in MakeTargets\
 
 SHARED_LIB = libfirm.so
 
-INSTALL_LIBS = libfirm.a $(SHARED_LIB)
+INSTALL_LIBS = libfirm.a $(build_add_lib)
 
 GENFILES := stamp-h config.log config.cache
 # config.status config.h.in $(srcdir)/stamp-h.in
 
 include $(topdir)/MakeRules
 
-XOFILES += $(addsuffix /subdir.o, $(subdirs))
+XOFILES += $(addsuffix /subdir.o, $(build_subdirs))
 
 include $(top_srcdir)/MakeTargets
 
 # add target firmjni if configured with --enable-firmjni
 all: firm
 
-firm: libfirm.a $(SHARED_LIB)
+firm: libfirm.a $(build_add_lib)
+
+shared: $(SHARED_LIB)
 
 $(OFILES): config.h Makefile
 
 $(XOFILES): subdir_all
 
 libfirm.a: $(XOFILES) $(OFILES)
-	$(AR) $(ARFLAGS) $@.new $(XOFILES) $(OFILES)
-	$(RANLIB) $@.new
+	$(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 $@
 
-libfirm.so: subdir_all $(XOFILES) $(OFILES)
-	ld -Bshareable -o ./libfirm.so $(XOFILES) -lm
+# dont know about xml here
+libfirm.so: $(XOFILES)
+	ld -Bshareable -o ./libfirm.so $(XOFILES) -lm $(LDFLAGS) $(LIBS)
 
 testprograms:	libfirm.a
 	$(MAKE) -C testprograms