X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile.in;h=b433ab1e733e109f6f6f59b6506e48eb4565b0bc;hb=362faf2743696638129198519a445178b06de424;hp=4813d46be06da99420a06703000505e5f484f8ce;hpb=880036c8184730c88effe6a85ab622547041c3a2;p=libfirm

diff --git a/Makefile.in b/Makefile.in
index 4813d46be..b433ab1e7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,12 +16,7 @@ topdir := .
 # subdirectory under topdir
 subdir := .
 
-prefix := @prefix@
-exec_prefix := @exec_prefix@
-bindir = $(exec_prefix)/bin
-datadir = $(prefix)/lib
-
-subdirs := ir ir/adt ir/debug ir/tv ir/common ir/ident ir/ir ir/tr
+subdirs := ir ir/adt ir/debug ir/tv ir/common ir/ident ir/ir ir/tr ir/ana ir/st
 
 SOURCES := Makefile.in MakeRules.in MakeTargets\
 	   aclocal.m4 config.h.in\
@@ -39,9 +34,11 @@ XOFILES += $(addsuffix /subdir.o, $(subdirs))
 
 include $(top_srcdir)/MakeTargets
 
-
+# add target firmjni if configured with --enable-firmjni
 all: config.h Makefile libfirm.a
 
+firm: config.h Makefile libfirm.a
+
 libfirm.a: subdir_all $(XOFILES) $(OFILES)
 	$(AR) $(ARFLAGS) $@.new $(XOFILES) $(OFILES)
 	$(RANLIB) $@.new
@@ -50,18 +47,16 @@ libfirm.a: subdir_all $(XOFILES) $(OFILES)
 testprograms:	libfirm.a
 	$(MAKE) -C testprograms
 
+firmjni:: libfirm.a
+	$(MAKE) -C firmjni
 
-# generate program documentation
+# gernerate program documentation
 .PHONY: autodoc
-autodoc: autodoc_xref $(AUTODOCDIR) $(GLOBALXREFFILE) autodoc_html $(INDEXFILE)
-
-$(GLOBALXREFFILE): $(addsuffix /$(LOCALXREFSFILE), $(subdirs)) .xrefs
-#	cat $^ > $@
-	$(RM) $@
-	find $(PWD) -name "*.xref" -print > $@
+autodoc: $(AUTODOCDIR) $(AUTODOCINDEXFILE)
 
-$(INDEXFILE): $(GLOBALXREFFILE)
-	$(AUTODOC) $(GLOBALXREFFILE) $@ INDEX HTML
+.PHONY: $(AUTDOCINDEXFILE)
+$(AUTODOCINDEXFILE): $(CFILES) $(HFILES)
+	$(AUTODOC) $(AUTODOCFILE)
 
 
 #${srcdir}/configure: configure.in aclocal.m4
@@ -82,3 +77,17 @@ stamp-h: config.h.in config.status
 
 config.status: configure
 	./config.status --recheck
+
+# add target test-firmjni if configured with --enable-firmjni
+test::
+	$(MAKE) -C testprograms test;
+
+test-firmjni::
+	$(MAKE) -C firmjni test;
+
+test-reference::
+	$(MAKE) -C testprograms reference;
+
+test-clean:
+	$(MAKE) -C testprograms realclean
+	$(MAKE) -C firmjni/testprograms clean;