[ooo-build-commit] build/src Makefile.am

[Jan Holesovsky]

 Makefile.am          |   22 ++++++++--------------
 build/src/.gitignore |    2 +-
 2 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit 4e7393d525db4eb05ef880426cf460104a398a1a
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jul 7 17:03:20 2009 +0200

    Split build: Use the shared Makefile.common.
    
    * Makefile.am: Remove the shared stuff.
    * build/src/.gitignore:

diff --git a/Makefile.am b/Makefile.am
index 12ce37d..3d3ced8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,18 +4,19 @@ stampdir = $(top_builddir)/build/stamp
 pkgconfigdir = $(libdir)/pkgconfig
 ooo_prefix = @OOO_PREFIX@
 solenvdir = $(ooo_prefix)/solenv
+solverdir = $(ooo_prefix)/solver
 buildsolverdir = "@abs_builddir@/solver"
 
+# the predefined rules
+
+include $(solverdir)/Makefile.common
+
 # what to add to the package
 
 # TODO
 EXTRA_DIST = 
 
-# TODO more in dist-hook, likeremove .o's in dmake, stuff in build/stamp, etc.
-# [basically everything that we have in .gitignores ;-)]
-dist-hook:
-	git log --date=short --pretty="format:@%cd  %an  <%ae>  [%H]%n%n%s%n%n%e%b" | sed -e "s|^\([^@]\)|\t\1|" -e "s|^@||" >$(distdir)/ChangeLog
-	rm -rf $(distdir)/*/unxlng*.pro
+dist-hook: dist-hook-common
 
 # rules to execute
 
@@ -27,14 +28,7 @@ clean-local:
 # TODO
 distclean-local:
 
-install-data-local: $(stampdir)/all
-	( . buildenv -i ; \
-	  export PRODUCT="OpenOffice" ; \
-	  perl -w $(solenvdir)/bin/make_installer.pl \
-	       -f $(ooo_prefix)/instsetoo_native/util/openoffice.lst \
-	       -l 'en-US' -p "$$PRODUCT" -buildid "$$BUILD" \
-	       -dontstrip -verbose -simple $(DESTDIR)$(ooo_prefix) )
+install-data-local: $(stampdir)/all install-data-common
 	$(INSTALL_DATA) $(top_builddir)/build/src/OpenOffice.org-ure.pc $(DESTDIR)$(pkgconfigdir)/
 
-$(stampdir)/all: buildenv
-	( . buildenv ; cd build ; build.pl --all $$WITH_CPUS -- $$WITH_ICECREAM ) && touch $@
+$(stampdir)/all: buildenv all-common
diff --git a/build/src/.gitignore b/build/src/.gitignore
index 36107f8..840ea15 100644
--- a/build/src/.gitignore
+++ b/build/src/.gitignore
@@ -1 +1 @@
-/OpenOffice.org-ure.pc
+/OpenOffice.org-*.pc