X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=firmjni%2FMakefile.in;h=fd156f6fb63598d0ecf3ec7928f73a3913fc474d;hb=b2509ebc03f0b178683087886a9d9269cb84bd03;hp=2c3889553b8f57d3b7e9ad89540938e5e4a36b2f;hpb=7813122b10e9d5478781150907c41d67dbb34878;p=libfirm

diff --git a/firmjni/Makefile.in b/firmjni/Makefile.in
index 2c3889553..fd156f6fb 100644
--- a/firmjni/Makefile.in
+++ b/firmjni/Makefile.in
@@ -51,6 +51,10 @@ CPPFLAGS += 	-I$(top_srcdir)/ir/ir  -I$(top_srcdir)/ir/common  	\
 
 LDFLAGS += -I$(topdir)
 
+ifeq ($enable_heapanal,yes)
+LDFLAGS += -L$(libdir) -lfirmlower -labor
+endif
+
 FIRM_HEADERS=$(notdir $(FIRM_PATH_HEADERS))
 MEMBERS=$(subst .h,.m,$(shell echo $(FIRM_HEADERS)|$(SHELL_TOUPPER)))
 MEMBERS += $(IMPL_MEMBERS)
@@ -64,11 +68,12 @@ MEMBERS += $(IMPL_MEMBERS)
 FIRM_PATH_HEADERS=common/firm.h common/firm_common.h \
 	ident/ident.h tv/tv.h \
 	tr/type.h tr/entity.h tr/type_or_entity.h tr/tpop.h tr/mangle.h \
+	tr/type_identify.h					\
 	ir/irprog.h ir/irgraph.h ir/irnode.h ir/irmode.h ir/irop.h \
 	ir/ircons.h ir/ircgcons.h ir/irflag.h ir/irvrfy.h ir/irdump.h \
 	ir/iropt.h ir/irgopt.h ir/ircgopt.h \
 	ana/irouts.h ana/irdom.h ana/irloop.h ana/cgana.h \
-	ir/irgmod.h tr/typegmod.h opt/tailrec.h stat/firmstat.h
+	ir/irgmod.h tr/typegmod.h opt/tailrec.h
 
 FIRM_SOURCE_DIR_HEADERS=$(addprefix $(SOURCE_DIR)/,$(FIRM_HEADERS))
 
@@ -133,10 +138,10 @@ else
 HEAPANALLIB =
 endif
 
-
+# We need firmlower and abor for heap analysis stuff, wich is called from aux/Heapanal.java
+# BY the way, what is sw/lib/  can this be removed???
 jni:    $(HFILES) $(OFILES)  # ../libfirm.a
-	gcc -shared -fPIC -o $(LIBNAME) *.o -lfirm -L.. $(HEAPANALLIB) $(LDFLAGS) -liberty -L../../sw/lib
-
+	gcc -shared -fPIC -o $(LIBNAME) *.o -lfirm -lxml2 -L.. $(HEAPANALLIB) $(LDFLAGS) -liberty -L../../sw/lib
 install:
 	cp libfirmjni.so $(libdir)
 #	mkdir $(javadir)