[ooo-build-commit] 2 commits - build/src configure.in Makefile.am

Jan Holesovsky kendy at kemper.freedesktop.org
Fri Jul 3 08:46:24 PDT 2009


 Makefile.am                        |    3 ++-
 build/src/.gitignore               |    1 +
 build/src/OpenOffice.org-ure.pc.in |    7 +++++++
 configure.in                       |    2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit fdf35177c2935c4ea21df558be2666fac3fd1e3f
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Jul 3 17:45:35 2009 +0200

    Split build: Support for icecream & parallel build.
    
    * Makefile.am: Add params to build.pl.

diff --git a/Makefile.am b/Makefile.am
index 33400e2..12ce37d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,4 +37,4 @@ install-data-local: $(stampdir)/all
 	$(INSTALL_DATA) $(top_builddir)/build/src/OpenOffice.org-ure.pc $(DESTDIR)$(pkgconfigdir)/
 
 $(stampdir)/all: buildenv
-	( . buildenv ; cd build ; build.pl --all ) && touch $@
+	( . buildenv ; cd build ; build.pl --all $$WITH_CPUS -- $$WITH_ICECREAM ) && touch $@
commit ffb3b66ef957e3c05440587a254dc3242463b168
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Jul 3 14:31:04 2009 +0200

    Split build: pkg-config file for URE.
    
    * Makefile.am: Install it.
    * build/src/.gitignore:
    * build/src/OpenOffice.org-ure.pc.in: The .pc file itself.
    * configure.in: Generate it.

diff --git a/Makefile.am b/Makefile.am
index 6c12716..33400e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,7 @@ install-data-local: $(stampdir)/all
 	       -f $(ooo_prefix)/instsetoo_native/util/openoffice.lst \
 	       -l 'en-US' -p "$$PRODUCT" -buildid "$$BUILD" \
 	       -dontstrip -verbose -simple $(DESTDIR)$(ooo_prefix) )
+	$(INSTALL_DATA) $(top_builddir)/build/src/OpenOffice.org-ure.pc $(DESTDIR)$(pkgconfigdir)/
 
 $(stampdir)/all: buildenv
 	( . buildenv ; cd build ; build.pl --all ) && touch $@
diff --git a/build/src/.gitignore b/build/src/.gitignore
new file mode 100644
index 0000000..36107f8
--- /dev/null
+++ b/build/src/.gitignore
@@ -0,0 +1 @@
+/OpenOffice.org-ure.pc
diff --git a/build/src/OpenOffice.org-ure.pc.in b/build/src/OpenOffice.org-ure.pc.in
new file mode 100644
index 0000000..5f7ccb3
--- /dev/null
+++ b/build/src/OpenOffice.org-ure.pc.in
@@ -0,0 +1,7 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+
+Name: OpenOffice.org URE
+Description: OpenOffice.org URE package
+Version: @PACKAGE_VERSION@
diff --git a/configure.in b/configure.in
index a496898..914eb54 100644
--- a/configure.in
+++ b/configure.in
@@ -13,4 +13,4 @@ OOO_PREFIX=$($PKG_CONFIG --variable=ooo_prefix OpenOffice.org-bootstrap)
 AC_SUBST(OOO_PREFIX)
 
 dnl Create what is necessary
-AC_OUTPUT([Makefile buildenv])
+AC_OUTPUT([Makefile buildenv build/src/OpenOffice.org-ure.pc])


More information about the ooo-build-commit mailing list