X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile.in;h=9054a7b9f55a2cc392640e1b6d088d178c0133aa;hb=9d612ba8a0a94cd7e353a7a57292b46888683d4a;hp=9862ed56e0aa9aaee6e792c932f7ba9c0801f7b2;hpb=a257f99826f4783418330dbb3b33bfbdf18ed252;p=libfirm

diff --git a/Makefile.in b/Makefile.in
index 9862ed56e..9054a7b9f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,22 +16,16 @@ topdir := .
 # subdirectory under topdir
 subdir := .
 
-prefix := @prefix@
-exec_prefix := @exec_prefix@
-bindir = $(exec_prefix)/bin
-datadir = $(prefix)/lib
-
-subdirs := 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\
 	   config.guess config.sub configure.in \
-	   stamp-h.in
+	   stamp-h.in install-sh README configure
 
 INSTALL_LIBS = libfirm.a
 
 GENFILES := stamp-h config.log config.cache
-
 # config.status config.h.in $(srcdir)/stamp-h.in
 
 include $(topdir)/MakeRules
@@ -50,18 +44,16 @@ libfirm.a: subdir_all $(XOFILES) $(OFILES)
 
 testprograms:	libfirm.a
 	$(MAKE) -C testprograms
+	$(MAKE) -C firmjni
 
 
-# generate program documentation
-autodoc: autodoc_xref $(AUTODOCDIR) $(GLOBALXREFFILE) autodoc_html $(INDEXFILE)
-
-$(GLOBALXREFFILE): $(addsuffix /$(LOCALXREFSFILE), $(subdirs)) .xrefs
-#	cat $^ > $@
-	$(RM) $@
-	find $(PWD) -name "*.xref" -print > $@
+# gernerate program documentation
+.PHONY: autodoc
+autodoc: $(AUTODOCDIR) $(AUTODOCINDEXFILE)
 
-$(INDEXFILE): $(GLOBALXREFFILE)
-	$(AUTODOC) $(GLOBALXREFFILE) $@ INDEX HTML
+.PHONY: $(AUTDOCINDEXFILE)
+$(AUTODOCINDEXFILE): $(CFILES) $(HFILES)
+	$(AUTODOC) $(AUTODOCFILE)
 
 
 #${srcdir}/configure: configure.in aclocal.m4
@@ -82,3 +74,13 @@ stamp-h: config.h.in config.status
 
 config.status: configure
 	./config.status --recheck
+
+test::
+	$(MAKE) -C testprograms test;
+	$(MAKE) -C firmjni test;
+
+test-reference::
+	$(MAKE) -C testprograms reference;
+
+test-clean:
+	$(MAKE) -C testprograms realclean