[Libreoffice-commits] .: Branch 'libreoffice-3-4' - desktop/unx

[Fridrich Strba]

 desktop/unx/source/makefile.mk |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6cc843a3f30eaa8782886f8c34a6acc8ae67407a
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue May 17 15:23:42 2011 +0100

    fix ENABLE_QUICKSTART_LIBPNG handling fdo#36497
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk
index 5c5c8f3..92bfe47 100755
--- a/desktop/unx/source/makefile.mk
+++ b/desktop/unx/source/makefile.mk
@@ -34,10 +34,10 @@ NO_DEFAULT_STL=TRUE
 
 .IF "$(ENABLE_QUICKSTART_LIBPNG)"=="TRUE"
 CFLAGS+=-DENABLE_QUICKSTART_LIBPNG
+CFLAGS+=$(LIBPNG_CFLAGS)
 .ENDIF
 
 STDLIB=
-CFLAGS+=$(LIBPNG_CFLAGS)
 
 OBJFILES= \
     $(OBJ)$/splashx.obj \
@@ -55,7 +55,10 @@ APP1RPATH  = BRAND
 APP1OBJS   = $(OBJFILES) $(PAGEIN_OBJS)
 APP1LIBSALCPPRT=
 APP1CODETYPE = C
-APP1STDLIBS = $(PTHREAD_LIBS) $(X11LINK_DYNAMIC) $(SALLIB) $(LIBPNG_LIBS)
+APP1STDLIBS = $(PTHREAD_LIBS) $(X11LINK_DYNAMIC) $(SALLIB)
+.IF "$(ENABLE_QUICKSTART_LIBPNG)"=="TRUE"
+APP1STDLIBS += $(LIBPNG_LIBS)
+.ENDIF
 .IF "$(OS)"=="SOLARIS"
 APP1STDLIBS+= -lsocket
 .ENDIF