X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=firmjni%2FMakefile.in;h=868baca624a65e99425b234018932f602d288e15;hb=217c4f3a0ffc115825dbebb2270ab1d20c246e97;hp=911733200360e14e80e03c65ec98ec574f0c7762;hpb=b7c520e8383aaad6b051a4341cb8bbc4d7f3d893;p=libfirm

diff --git a/firmjni/Makefile.in b/firmjni/Makefile.in
index 911733200..868baca62 100644
--- a/firmjni/Makefile.in
+++ b/firmjni/Makefile.in
@@ -15,7 +15,10 @@ srcdir = @srcdir@
 topdir = ..
 subdir = firmjni
 
-enable_heapanal := @enable_heapanalysis@
+enable_heapanal         := @enable_heapanalysis@
+enable_libcore          := @enable_libcore@
+enable_external_effects := @enable_external_effects@
+disable_libiberty       := @disable_libiberty@
 
 # The library implementing the JNI methods.  This name is also
 # known to the generator for the JNI interface and used in the
@@ -47,9 +50,28 @@ CPPFLAGS += 	-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/opt		\
-		-I$(top_srcdir)/ir/st -I$(top_srcdir)/ir/stat
+		-I$(top_srcdir)/ir/st -I$(top_srcdir)/ir/stat           \
+		-I$(top_srcdir)/ir/arch -I$(topdir)/ir/config           \
+		-I$(topdir)
+
+LDFLAGS += -L$(libdir)
+
+ifeq ($(enable_heapanal),yes)
+LDFLAGS += -lfirmlower -labor -lheapanal
+endif
+
+ifeq ($(enable_libcore),yes)
+LDFLAGS += -lcore
+endif
+
+ifeq ($(enable_external_effects),yes)
+LDFLAGS += -lxml2
+endif
+
+ifeq ($(disable_libiberty),yes)
+LDFLAGS += -liberty
+endif
 
-LDFLAGS += -I$(topdir)
 
 FIRM_HEADERS=$(notdir $(FIRM_PATH_HEADERS))
 MEMBERS=$(subst .h,.m,$(shell echo $(FIRM_HEADERS)|$(SHELL_TOUPPER)))
@@ -69,7 +91,8 @@ FIRM_PATH_HEADERS=common/firm.h common/firm_common.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
+	ir/irgmod.h tr/typegmod.h opt/tailrec.h arch/archop.h \
+	ana/irextbb.h
 
 FIRM_SOURCE_DIR_HEADERS=$(addprefix $(SOURCE_DIR)/,$(FIRM_HEADERS))
 
@@ -128,16 +151,10 @@ $(OFILES):
 	gcc $(CPPFLAGS) -c $(@:.o=.c) -o $@
 
 
-ifeq ($(enable_heapanal),yes)
-HEAPANALLIB = -lheapanal
-else
-HEAPANALLIB =
-endif
-
-
+# We need firmlower and abor for heap analysis stuff, which is called from aux/Heapanal.java
+# BY the way, what is ../../sw/lib/  can this be removed? Probaly, so I did.
 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 -L.. $(LDFLAGS)
 install:
 	cp libfirmjni.so $(libdir)
 #	mkdir $(javadir)