[Libreoffice-commits] .: 3 commits - afms/Zip_fontunxafm.mk cairo/prj configure.in gdk-pixbuf/prj solenv/gbuild

[Libreoffice Gerrit user]

 afms/Zip_fontunxafm.mk      |    4 ++++
 cairo/prj/build.lst         |    2 +-
 configure.in                |    1 +
 gdk-pixbuf/prj/build.lst    |    2 +-
 solenv/gbuild/LinkTarget.mk |    4 ++--
 5 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 4f07689050ffdffb473daa7217728ac79f1785d3
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Sep 26 13:28:30 2012 +0200

    add missing dep on unpacked tarball
    
    Change-Id: Ibacf45072be2ec143e8cc2207d9ce14409a8c812

diff --git a/afms/Zip_fontunxafm.mk b/afms/Zip_fontunxafm.mk
index 699c149..406024f 100644
--- a/afms/Zip_fontunxafm.mk
+++ b/afms/Zip_fontunxafm.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Zip_Zip,fontunxafm,$(call gb_UnpackedTarball_get_dir,afms)))
 
+$(eval $(call gb_Zip_add_dependencies,fontunxafm,\
+	$(call gb_UnpackedTarball_get_target,afms) \
+))
+
 $(eval $(call gb_Zip_add_files,fontunxafm,\
 	Courier-Bold.afm \
 	Courier-BoldOblique.afm \
commit 6066151aa185d4df053185ff59efc1c8e869d34c
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Sep 26 07:23:24 2012 +0200

    return build conditional for libpng
    
    Change-Id: I0ff1f219db136f3cc763d6af61df177831b1e93f

diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index 5827e76..b107635 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo	cairo	: ZLIB:zlib libpng soltools NULL
+lcairo	cairo	: ZLIB:zlib LIBPNG:libpng soltools NULL
 lcairo	cairo			    usr1	-	all	lcairo_mkout NULL
 lcairo	cairo\pixman		    nmake	-	all	lcairo_pixman NULL
 lcairo	cairo\cairo		    nmake	-	all	lcairo_cairo lcairo_pixman NULL
diff --git a/configure.in b/configure.in
index 3434f74..66746a4 100644
--- a/configure.in
+++ b/configure.in
@@ -11595,6 +11595,7 @@ if test "$with_system_libpng" = yes; then
     AC_MSG_RESULT([yes])
 else
     SYSTEM_LIBPNG=NO
+    BUILD_TYPE="$BUILD_TYPE LIBPNG"
     PNG_TARBALL=9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
     AC_MSG_RESULT([no])
 fi
diff --git a/gdk-pixbuf/prj/build.lst b/gdk-pixbuf/prj/build.lst
index 550466a..db76c49 100644
--- a/gdk-pixbuf/prj/build.lst
+++ b/gdk-pixbuf/prj/build.lst
@@ -1,3 +1,3 @@
-gp	gdk-pixbuf	: glib gettext jpeg libpng soltools NULL
+gp	gdk-pixbuf	: glib gettext jpeg LIBPNG:libpng soltools NULL
 gp	gdk-pixbuf			    usr1	-	all	gp_mkout NULL
 gp	gdk-pixbuf			    nmake	-	all	gp_gdk-pixbuf NULL
commit f8574c4da1a7ea24ee65d5b94ccc56a02a27a038
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Sep 26 06:20:40 2012 +0200

    do not need to escape $ here
    
    Change-Id: I987597aef3265df08407a869d57b575778174184

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 6d371fa..8dddeb3 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -754,9 +754,9 @@ endif
 
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS += $$(if $$(filter-out StaticLibrary,$$(TARGETTYPE)),$(2))
 
-$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$(2),$$(call gb_StaticLibrary_get_target,$$(lib)))
+$(call gb_LinkTarget_get_target,$(1)) : $(foreach lib,$(2),$(call gb_StaticLibrary_get_target,$(lib)))
 $(call gb_LinkTarget_get_external_headers_target,$(1)) : \
-$$(foreach lib,$(2),$$(call gb_StaticLibrary_get_headers_target,$$(lib)))
+	$(foreach lib,$(2),$(call gb_StaticLibrary_get_headers_target,$(lib)))
 
 endef