[Lemon-commits] [lemon_svn] ladanyi: r2707 - in hugo/branches/single_makefile: . benchmark demo doc gui lemon test

[Lemon SVN]

Author: ladanyi
Date: Tue Apr 18 23:43:33 2006
New Revision: 2707

Added:
   hugo/branches/single_makefile/benchmark/Makefile
   hugo/branches/single_makefile/demo/Makefile
   hugo/branches/single_makefile/doc/Makefile
   hugo/branches/single_makefile/gui/Makefile
   hugo/branches/single_makefile/lemon/Makefile
   hugo/branches/single_makefile/test/Makefile
Modified:
   hugo/branches/single_makefile/Makefile.am
   hugo/branches/single_makefile/bootstrap
   hugo/branches/single_makefile/doc/Makefile.am

Log:
 - Makefiles for subdirs
 - make doc works again
 - fixed bootstrap
 - distcheck works for me


Modified: hugo/branches/single_makefile/Makefile.am
==============================================================================
--- hugo/branches/single_makefile/Makefile.am	(original)
+++ hugo/branches/single_makefile/Makefile.am	Tue Apr 18 23:43:33 2006
@@ -57,13 +57,6 @@
 	gui/icons/Makefile.in \
 	gui/Makefile.in
 
-doc-clean:
-	$(MAKE) -C doc $(AM_MAKEFLAGS) clean html
-
-doc:
-	-rm -f doc/html/index.html
-	$(MAKE) -C doc $(AM_MAKEFLAGS) html
-
 benchmark:
 	$(MAKE) -C benchmark $(AM_MAKEFLAGS)
 
@@ -86,4 +79,4 @@
 	zcat $(PACKAGE)-$(VERSION).tar.gz | \
 	bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
 
-.PHONY: doc benchmark mrproper deb rpm dist-bz2 distcheck-bz2
+.PHONY: benchmark mrproper deb rpm dist-bz2 distcheck-bz2

Added: hugo/branches/single_makefile/benchmark/Makefile
==============================================================================
--- (empty file)
+++ hugo/branches/single_makefile/benchmark/Makefile	Tue Apr 18 23:43:33 2006
@@ -0,0 +1,2 @@
+all:
+	$(MAKE) -C ..

Modified: hugo/branches/single_makefile/bootstrap
==============================================================================
--- hugo/branches/single_makefile/bootstrap	(original)
+++ hugo/branches/single_makefile/bootstrap	Tue Apr 18 23:43:33 2006
@@ -67,6 +67,8 @@
   autoheader=autoheader-$acver
 fi
 
+mkdir -p build-aux
+
 set -x
 $aclocal -I m4 \
 && libtoolize --force --copy \

Added: hugo/branches/single_makefile/demo/Makefile
==============================================================================
--- (empty file)
+++ hugo/branches/single_makefile/demo/Makefile	Tue Apr 18 23:43:33 2006
@@ -0,0 +1,2 @@
+all:
+	$(MAKE) -C ..

Added: hugo/branches/single_makefile/doc/Makefile
==============================================================================
--- (empty file)
+++ hugo/branches/single_makefile/doc/Makefile	Tue Apr 18 23:43:33 2006
@@ -0,0 +1,2 @@
+all:
+	$(MAKE) -C ..

Modified: hugo/branches/single_makefile/doc/Makefile.am
==============================================================================
--- hugo/branches/single_makefile/doc/Makefile.am	(original)
+++ hugo/branches/single_makefile/doc/Makefile.am	Tue Apr 18 23:43:33 2006
@@ -1,6 +1,3 @@
-#if WANT_DOC
-#endif
-
 htmldir = $(datadir)/doc/$(PACKAGE)/html
 
 EXTRA_DIST += \
@@ -24,9 +21,11 @@
 	doc/quicktour.dox \
 	doc/ugraphs.dox
 
-html-local:
+doc:
 	if test ${doxygen_found} = yes; then \
-	  doxygen doc/Doxyfile; \
+	  cd doc; \
+	  doxygen Doxyfile; \
+	  cd ..; \
 	  cp $(srcdir)/doc/icons/geom/ftv2* doc/html; \
 	fi
 
@@ -49,3 +48,5 @@
 	  echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
 	  rm -f $(DESTDIR)$(htmldir)/$$f; \
 	done
+
+.PHONY: doc

Added: hugo/branches/single_makefile/gui/Makefile
==============================================================================
--- (empty file)
+++ hugo/branches/single_makefile/gui/Makefile	Tue Apr 18 23:43:33 2006
@@ -0,0 +1,2 @@
+all:
+	$(MAKE) -C ..

Added: hugo/branches/single_makefile/lemon/Makefile
==============================================================================
--- (empty file)
+++ hugo/branches/single_makefile/lemon/Makefile	Tue Apr 18 23:43:33 2006
@@ -0,0 +1,2 @@
+all:
+	$(MAKE) -C ..

Added: hugo/branches/single_makefile/test/Makefile
==============================================================================
--- (empty file)
+++ hugo/branches/single_makefile/test/Makefile	Tue Apr 18 23:43:33 2006
@@ -0,0 +1,2 @@
+all:
+	$(MAKE) -C ..