[hoc-cvs] hoc config.mk.in,1.3,1.4 configure.ac,1.5,1.6 Makefile.in,1.1,1.2

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28586

Modified Files:
	config.mk.in configure.ac Makefile.in 
Log Message:
Fixed bugs in build system



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	12 May 2004 05:43:58 -0000	1.1
+++ Makefile.in	17 May 2004 18:31:32 -0000	1.2
@@ -1,24 +1,67 @@
-SUBDIRS=\
-	HOC_cbits			\
-	HOC					\
-	InterfaceGenerator	\
-	Bindings			\
-	Foundation			\
-	AppKit				\
-	Tools
+include config.mk
 
+SUBDIRS = \
+	HOC_cbits \
+	HOC \
+	InterfaceGenerator \
+	Bindings \
+	Foundation \
+	AppKit \
+	Tools \
+	docs \
+	$(NULL)
 
+Samples_SUBDIRS = \
+	Samples/Browser \
+	Samples/Editor \
+	Samples/ExpressionParser \
+	Samples/UniqSort \
+	$(NULL)
+
+all_SUBDIRS = $(SUBDIRS) $(Samples_SUBDIRS)
+
+dist_srcdir = .
+dist_FILES = \
+	LICENSE \
+	Makefile.in \
+	aclocal.m4 \
+	autogen.sh \
+	autotools/ \
+	config.mk.in \
+	configure \
+	configure.ac \
+	objc.m4 \
+	$(NULL)
 
 all: libffi-src/build/src/raw_api.o hoc-all
-	
+
+dist:
+	-test -d "$(dist_dir)" && rm -rf "$(dist_dir)"
+	$(MAKE) dist-recursive
+	for dir in $(all_SUBDIRS); do (cd $$dir; $(MAKE) dist-recursive); done
+	find "$(dist_dir)" -type d -name 'CVS' -delete
+	find "$(dist_dir)" -name '*~' -delete
+	cp -HRp libffi-src "$(dist_dir)"
+	rm -rf "$(dist_dir)"/libffi-src/build
+	tar jcvf @abs_top_builddir@/hoc-@PACKAGE_VERSION@.tar.bz2 \
+	  ./hoc-@PACKAGE_VERSION@
+
+distcheck: dist
+	( cd "$(dist_dir)" && ./configure && make && make install )
+
 libffi-src/build/src/raw_api.o:
-	make -C libffi-src/build
+	$(MAKE) -C libffi-src/build
 
 hoc-all:
-	for dir in $(SUBDIRS); do (cd $$dir; make all) done
+	for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) all) done
 	
 clean:
-	for dir in $(SUBDIRS); do (cd $$dir; make clean) done
+	for dir in $(all_SUBDIRS); do (cd $$dir; $(MAKE) clean) done
 	
 install:
-	for dir in $(SUBDIRS); do (cd $$dir; make install) done
+	for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) install) done
+
+.PHONY: samples
+samples:
+	for dir in $(Samples_SUBDIRS); do (cd $$dir; $(MAKE)) done
+

Index: configure.ac
===================================================================
RCS file: /cvsroot/hoc/hoc/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.ac	17 May 2004 18:07:41 -0000	1.5
+++ configure.ac	17 May 2004 18:31:32 -0000	1.6
@@ -177,6 +177,7 @@
                  HOC_cbits/Makefile
                  InterfaceGenerator/Makefile
                  Samples/Browser/Makefile
+                 Samples/ExpressionParser/Makefile
                  Samples/Editor/Makefile
                  Samples/UniqSort/Makefile
                  Tools/Makefile

Index: config.mk.in
===================================================================
RCS file: /cvsroot/hoc/hoc/config.mk.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config.mk.in	17 May 2004 18:07:41 -0000	1.3
+++ config.mk.in	17 May 2004 18:31:23 -0000	1.4
@@ -15,8 +15,13 @@
 DOT=@DOT@
 POD2HTML=@POD2HTML@
 
+
 # distribution tarball information
+
 dist_dir = @abs_top_builddir@/hoc-@PACKAGE_VERSION@
+
+default: all
+
 dist-recursive:
 	mkdir -p "$(dist_dir)/$(dist_srcdir)"
 	cp -R $(dist_FILES) "$(dist_dir)/$(dist_srcdir)"