Author: abrander
Date: 2011-04-13 22:35:12 +0200 (Wed, 13 Apr 2011)
New Revision: 3991
Modified:
trunk/librawstudio/Makefile.am
trunk/plugins/output-jpegfile/Makefile.am
trunk/src/Makefile.am
Log:
Only require libjpeg where needed.
Modified: trunk/librawstudio/Makefile.am
===================================================================
--- trunk/librawstudio/Makefile.am 2011-04-13 20:24:01 UTC (rev 3990)
+++ trunk/librawstudio/Makefile.am 2011-04-13 20:35:12 UTC (rev 3991)
@@ -112,7 +112,7 @@
rs-gui-functions.c rs-gui-functions.h \
rs-stock.c rs-stock.h
-librawstudio_2_0_la_LIBADD = @PACKAGE_LIBS@ @LIBJPEG@ @SQLITE3_LIBS@
$(INTLLIBS)
+librawstudio_2_0_la_LIBADD = @PACKAGE_LIBS@ @SQLITE3_LIBS@ $(INTLLIBS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rawstudio-2.0.pc
Modified: trunk/plugins/output-jpegfile/Makefile.am
===================================================================
--- trunk/plugins/output-jpegfile/Makefile.am 2011-04-13 20:24:01 UTC (rev
3990)
+++ trunk/plugins/output-jpegfile/Makefile.am 2011-04-13 20:35:12 UTC (rev
3991)
@@ -17,6 +17,6 @@
libdir = $(datadir)/rawstudio/plugins/
-output_jpegfile_la_LIBADD = @PACKAGE_LIBS@
+output_jpegfile_la_LIBADD = @PACKAGE_LIBS@ @LIBJPEG@
output_jpegfile_la_LDFLAGS = -module -avoid-version
output_jpegfile_la_SOURCES = output-jpegfile.c
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2011-04-13 20:24:01 UTC (rev 3990)
+++ trunk/src/Makefile.am 2011-04-13 20:35:12 UTC (rev 3991)
@@ -47,5 +47,5 @@
rs-tag-gui.c rs-tag-gui.h\
rs-tethered-shooting.c rs-tethered-shooting.h
-rawstudio_LDADD = ../librawstudio/librawstudio-@[email protected] @PACKAGE_LIBS@
@LIBJPEG@ $(INTLLIBS)
+rawstudio_LDADD = ../librawstudio/librawstudio-@[email protected] @PACKAGE_LIBS@
$(INTLLIBS)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
