summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2011-05-17 15:23:42 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-05-17 16:41:13 +0200
commit6cc843a3f30eaa8782886f8c34a6acc8ae67407a (patch)
tree21661fcaf02821fbaad0d8ab66f611ebe558e30a
parentb9dc86c9043e048da0a289c57cc47e34bbb9d087 (diff)
fix ENABLE_QUICKSTART_LIBPNG handling fdo#36497
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
-rwxr-xr-xdesktop/unx/source/makefile.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk
index 5c5c8f3e9e..92bfe4703b 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