summaryrefslogtreecommitdiff
path: root/plugingui/Makefile.am.plugingui
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2013-09-15 12:09:53 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2013-09-15 12:09:53 +0200
commitf8b2ac1befd9379cdb2fb0dabe8142d74c801818 (patch)
tree9b43c785197e5a724ed0b603dbdac67a72a011dc /plugingui/Makefile.am.plugingui
parent249717512c93df045bdc9b9bec08083c2e9d7a44 (diff)
Use libpng from sourcetree instead of the one supplied by the OS.
Diffstat (limited to 'plugingui/Makefile.am.plugingui')
-rw-r--r--plugingui/Makefile.am.plugingui16
1 files changed, 13 insertions, 3 deletions
diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui
index 4679eb0..84f1979 100644
--- a/plugingui/Makefile.am.plugingui
+++ b/plugingui/Makefile.am.plugingui
@@ -29,8 +29,18 @@ PLUGIN_GUI_SOURCES = \
$(top_srcdir)/plugingui/progressbar.cc \
$(top_srcdir)/plugingui/verticalline.cc \
$(top_srcdir)/plugingui/resource.cc \
- $(top_srcdir)/plugingui/resource_data.cc
+ $(top_srcdir)/plugingui/resource_data.cc \
+ $(top_srcdir)/plugingui/png/png.c \
+ $(top_srcdir)/plugingui/png/pngerror.c \
+ $(top_srcdir)/plugingui/png/pngmem.c \
+ $(top_srcdir)/plugingui/png/pngread.c \
+ $(top_srcdir)/plugingui/png/pngget.c \
+ $(top_srcdir)/plugingui/png/pngtrans.c \
+ $(top_srcdir)/plugingui/png/pngrutil.c \
+ $(top_srcdir)/plugingui/png/pngset.c \
+ $(top_srcdir)/plugingui/png/pngrio.c \
+ $(top_srcdir)/plugingui/png/pngrtran.c
-PLUGIN_GUI_LIBS = $(X11_LIBS) $(PTHREAD_LIBS)
+PLUGIN_GUI_LIBS = $(X11_LIBS) $(PTHREAD_LIBS) -lz
-PLUGIN_GUI_CFLAGS = $(X11_CFLAGS) $(PNG_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PNG_LIBS) $(PTHREAD_CFLAGS)
+PLUGIN_GUI_CFLAGS = $(X11_CFLAGS) $(PNG_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS)