diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-05-17 15:23:42 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-05-17 16:41:13 +0200 |
| commit | 06fbdf7dae5be265d56850045189a8d95bb7e5cb (patch) | |
| tree | e1eb3e4cf0e30a4dec5008b2bf01e517e452817d | |
| parent | cae534fec21b832e470f8b9c41109b30cda96a13 (diff) | |
fix ENABLE_QUICKSTART_LIBPNG handling fdo#36497
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
| -rwxr-xr-x | desktop/unx/source/makefile.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk index 5c5c8f3e9e88..92bfe4703b85 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 |