diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2009-07-07 17:03:20 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2009-07-07 17:03:20 +0200 |
| commit | 4e7393d525db4eb05ef880426cf460104a398a1a (patch) | |
| tree | ed60d0db8594e36b605124415d100f8f6c7b2ddc | |
| parent | fdf35177c2935c4ea21df558be2666fac3fd1e3f (diff) | |
Split build: Use the shared Makefile.common.split-build
* Makefile.am: Remove the shared stuff.
* build/src/.gitignore:
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rw-r--r-- | build/src/.gitignore | 2 |
2 files changed, 9 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 12ce37dcc..3d3ced8f7 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 36107f89b..840ea15df 100644 --- a/build/src/.gitignore +++ b/build/src/.gitignore @@ -1 +1 @@ -/OpenOffice.org-ure.pc +/OpenOffice.org-*.pc |