Commit 67a0daf0 authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

change all LIBFOO variables to FOO_LIBS for consistency, could get rid of

2008-08-11  Michael Natterer  <mitch@gimp.org>

	* configure.in: change all LIBFOO variables to FOO_LIBS for
	consistency, could get rid of some variables alltogether since
	PNG_CHECK_MODULES() already defined FOO_LIBS.

	* tools/Makefile.am
	* modules/Makefile.am
	* plug-ins/file-ico/Makefile.am
	* plug-ins/file-jpeg/Makefile.am
	* plug-ins/file-psd/Makefile.am
	* plug-ins/file-xjt/Makefile.am
	* plug-ins/common/plugin-defs.pl
	* plug-ins/common/mkgen.pl: changed accordingly.

	* plug-ins/common/Makefile.am: regenerated.


svn path=/trunk/; revision=26498
parent 4a7d2671
2008-08-11 Michael Natterer <mitch@gimp.org>
* configure.in: change all LIBFOO variables to FOO_LIBS for
consistency, could get rid of some variables alltogether since
PNG_CHECK_MODULES() already defined FOO_LIBS.
* tools/Makefile.am
* modules/Makefile.am
* plug-ins/file-ico/Makefile.am
* plug-ins/file-jpeg/Makefile.am
* plug-ins/file-psd/Makefile.am
* plug-ins/file-xjt/Makefile.am
* plug-ins/common/plugin-defs.pl
* plug-ins/common/mkgen.pl: changed accordingly.
* plug-ins/common/Makefile.am: regenerated.
2008-08-11 Michael Natterer <mitch@gimp.org>
* plug-ins/bmp/*
......
......@@ -921,7 +921,7 @@ if test "$gdk_target" = x11; then
DOC_SHOOTER=doc-shooter
# screenshot plug-in needs to link to X11 explicitely
LIBSCREENSHOT="$X_LIBS -lX11"
SCREENSHOT_LIBS="$X_LIBS -lX11"
gimp_save_CFLAGS="$CFLAGS"
gimp_save_LDFLAGS="$LDFLAGS"
......@@ -929,20 +929,20 @@ if test "$gdk_target" = x11; then
LDFLAGS="$LDFLAGS $X_LIBS"
# Test for Xmu
if test -z "$LIBXMU"; then
if test -z "$XMU_LIBS"; then
AC_CHECK_LIB(Xmu, XmuClientWindow,
[AC_CHECK_HEADERS(X11/Xmu/WinUtil.h,
have_libxmu=yes
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
XMU_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
[have_libxmu="no (XMU header file not found)"],[#include <gdk/gdkx.h>])],
[have_libxmu="no (XMU library not found)"], -lXt -lX11)
LIBSCREENSHOT="$LIBXMU"
SCREENSHOT_LIBS="$XMU_LIBS"
fi
# Check for shaped window extension
AC_CHECK_LIB(Xext, XShapeGetRectangles,
[AC_CHECK_HEADERS(X11/extensions/shape.h,
LIBSCREENSHOT="$LIBSCREENSHOT -lXext",,[#include <gdk/gdkx.h>])],,
SCREENSHOT_LIBS="$SCREENSHOT_LIBS -lXext",,[#include <gdk/gdkx.h>])],,
-lX11 -lXext)
CFLAGS="$gimp_save_CFLAGS"
......@@ -952,12 +952,12 @@ if test "$gdk_target" = x11; then
PKG_CHECK_MODULES(XFIXES, xfixes,
AC_DEFINE(HAVE_XFIXES, 1,
[Define to 1 to if the XFIXES X extension is available])
LIBSCREENSHOT="$LIBSCREENSHOT $XFIXES_LIBS",
SCREENSHOT_LIBS="$SCREENSHOT_LIBS $XFIXES_LIBS",
true)
fi
AC_SUBST(LIBXMU)
AC_SUBST(LIBSCREENSHOT)
AC_SUBST(XMU_LIBS)
AC_SUBST(SCREENSHOT_LIBS)
AC_SUBST(DOC_SHOOTER)
......@@ -994,24 +994,24 @@ MIME_TYPES="application/postscript;application/pdf;image/bmp;image/g3fax;image/g
have_libtiff=no
AC_ARG_WITH(libtiff, [ --without-libtiff build without TIFF support])
if test "x$with_libtiff" != xno && test -z "$LIBTIFF"; then
if test "x$with_libtiff" != xno && test -z "$TIFF_LIBS"; then
have_libtiff=yes
AC_CHECK_LIB(tiff, TIFFReadScanline,
[AC_CHECK_HEADER(tiffio.h,
FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; LIBTIFF='-ltiff',
FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; TIFF_LIBS='-ltiff',
[have_libtiff="no (TIFF header files not found)"])],
[AC_CHECK_LIB(tiff, TIFFWriteScanline,
[AC_CHECK_HEADER(tiffio.h,
FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; LIBTIFF='-ltiff -ljpeg -lz',
FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; TIFF_LIBS='-ltiff -ljpeg -lz',
[have_libtiff="no (TIFF header files not found)"])],
[AC_CHECK_LIB(tiff34, TIFFFlushData,
[AC_CHECK_HEADER(tiffio.h,
FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; LIBTIFF='-ltiff34 -ljpeg -lz',
FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; TIFF_LIBS='-ltiff34 -ljpeg -lz',
[have_libtiff="no (TIFF header files not found)"])],
[have_libtiff="no (TIFF library not found)"], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
fi
if test "x$with_libtiff" != xno && test -z "$LIBTIFF"; then
if test "x$with_libtiff" != xno && test -z "$TIFF_LIBS"; then
AC_MSG_ERROR([
*** Checks for TIFF libary failed. You can build without it by passing
*** --without-libtiff to configure but you won't be able to use TIFFs then.])
......@@ -1023,7 +1023,7 @@ AC_ARG_WITH(libtiff, [ --without-libtiff build without TIFF support])
AC_SUBST(FILE_TIFF_LOAD)
AC_SUBST(FILE_TIFF_SAVE)
AC_SUBST(LIBTIFF)
AC_SUBST(TIFF_LIBS)
###################
......@@ -1033,7 +1033,7 @@ AC_SUBST(LIBTIFF)
jpeg_ok=no
AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support])
if test "x$with_libjpeg" != xno && test -z "$LIBJPEG"; then
if test "x$with_libjpeg" != xno && test -z "$JPEG_LIBS"; then
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
jpeg_ok=yes,
[jpeg_ok="no (JPEG library not found)"
......@@ -1052,7 +1052,7 @@ AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support])
AC_MSG_RESULT($jpeg_ok)
if test "$jpeg_ok" = yes; then
AC_CHECK_LIB(jpeg, jpeg_save_markers,
JPEG='jpeg$(EXEEXT)'; LIBJPEG='-ljpeg',
JPEG='jpeg$(EXEEXT)'; JPEG_LIBS='-ljpeg',
jpeg_ok="no (JPEG library is too old)")
else
jpeg_ok="no (JPEG header file not found)"
......@@ -1060,7 +1060,7 @@ AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support])
fi
fi
if test "x$with_libjpeg" != xno && test -z "$LIBJPEG"; then
if test "x$with_libjpeg" != xno && test -z "$JPEG_LIBS"; then
AC_MSG_ERROR([
*** Checks for JPEG library failed. You can build without it by passing
*** --without-libjpeg to configure but you won't be able to use JPEGs then.])
......@@ -1071,7 +1071,7 @@ AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support])
fi
AM_CONDITIONAL(BUILD_JPEG, test "x$jpeg_ok" = xyes)
AC_SUBST(LIBJPEG)
AC_SUBST(JPEG_LIBS)
## xjt does build, but it is more confusing than useful on Win32,
......@@ -1091,10 +1091,10 @@ fi
################
have_zlib=yes
if test -z "$LIBZ"; then
if test -z "$Z_LIBS"; then
AC_CHECK_LIB(z, gzsetparams,
[AC_CHECK_HEADER(zlib.h,
FILE_PSP='file-psp$(EXEEXT)'; LIBZ='-lz',
FILE_PSP='file-psp$(EXEEXT)'; Z_LIBS='-lz',
[have_zlib="no (ZLIB header files not found)"])],
[have_zlib="no (ZLIB library not found)"])
fi
......@@ -1104,7 +1104,7 @@ if test "x$have_zlib" = xyes; then
fi
AC_SUBST(FILE_PSP)
AC_SUBST(LIBZ)
AC_SUBST(Z_LIBS)
##################
......@@ -1116,8 +1116,7 @@ AC_ARG_WITH(libpng, [ --without-libpng build without PNG support])
if test "x$with_libpng" != xno; then
have_libpng=yes
PKG_CHECK_MODULES(PNG, libpng,
FILE_PNG='file-png$(EXEEXT)'
LIBPNG="$PNG_LIBS",
FILE_PNG='file-png$(EXEEXT)',
[have_libpng="no (libpng not found)"
AC_MSG_ERROR([
*** Checks for PNG library failed. You can build without it by passing
......@@ -1129,7 +1128,6 @@ if test "x$have_libpng" = xyes; then
fi
AC_SUBST(FILE_PNG)
AC_SUBST(LIBPNG)
AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = xyes)
......@@ -1141,20 +1139,20 @@ AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = xyes)
have_libmng=no
AC_ARG_WITH(libmng, [ --without-libmng build without MNG support])
have_libmng=yes
if test "x$with_libmng" != xno && test -z "$LIBMNG" &&
test -n "$LIBPNG" && test -n "$LIBJPEG" && test -n "$LIBZ"; then
if test "x$with_libmng" != xno && test -z "$MNG_LIBS" &&
test -n "$PNG_LIBS" && test -n "$JPEG_LIBS" && test -n "$Z_LIBS"; then
AC_CHECK_LIB(mng, mng_create,
[AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
[have_libmng="no (MNG library not found)"], -lz -lm)
if test "$mng_ok" = yes; then
FILE_MNG='file-mng$(EXEEXT)'; LIBMNG="-lmng $LIBJPEG $LIBPNG"
FILE_MNG='file-mng$(EXEEXT)'; MNG_LIBS="-lmng $JPEG_LIBS $PNG_LIBS"
else
have_libmng="no (MNG header file not found)"
fi
fi
AC_SUBST(FILE_MNG)
AC_SUBST(LIBMNG)
AC_SUBST(MNG_LIBS)
############################################################
......@@ -1165,7 +1163,7 @@ AC_SUBST(LIBMNG)
have_libexif=no
AC_ARG_WITH(libexif, [ --without-libexif build without EXIF support])
if test "x$with_libexif" != xno && test -z "$LIBEXIF" && test -n "$LIBJPEG"; then
if test "x$with_libexif" != xno && test -z "$EXIF_LIBS" && test -n "$JPEG_LIBS"; then
have_libexif=yes
PKG_CHECK_MODULES(EXIF, libexif >= exif_required_version,
AC_DEFINE(HAVE_EXIF, 1, [Define to 1 if libexif is available]),
......@@ -1183,17 +1181,17 @@ AC_SUBST(EXIF_LIBS)
have_libaa=no
AC_ARG_WITH(aa, [ --without-aa do not build the AA plug-in])
if test "x$with_aa" != xno && test -z "$LIBAA"; then
if test "x$with_aa" != xno && test -z "$AA_LIBS"; then
have_libaa=yes
AC_CHECK_LIB(aa, aa_printf,
[AC_CHECK_HEADER(aalib.h,
FILE_AA='file-aa$(EXEEXT)'; LIBAA='-laa',
FILE_AA='file-aa$(EXEEXT)'; AA_LIBS='-laa',
[have_libaa="no (AA header file not found)"])],
[have_libaa="no (AA library not found)"])
fi
AC_SUBST(FILE_AA)
AC_SUBST(LIBAA)
AC_SUBST(AA_LIBS)
##################
......@@ -1208,10 +1206,10 @@ if test "$gdk_target" = x11; then
lib_X11=-lX11
fi
have_libxpm=yes
if test -z "$LIBXPM"; then
if test -z "$XPM_LIBS"; then
AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
[AC_CHECK_HEADER(X11/xpm.h,
FILE_XPM='file-xpm$(EXEEXT)'; LIBXPM="$X_LIBS $X_PRE_LIBS $lib_X11 -lXpm",
FILE_XPM='file-xpm$(EXEEXT)'; XPM_LIBS="$X_LIBS $X_PRE_LIBS $lib_X11 -lXpm",
[have_libxpm="no (XPM header file not found)"])],
[have_libxpm="no (XPM library not found)"], $X_PRE_LIBS $lib_X11)
fi
......@@ -1223,7 +1221,7 @@ if test "x$have_libxpm" = xyes; then
fi
AC_SUBST(FILE_XPM)
AC_SUBST(LIBXPM)
AC_SUBST(XPM_LIBS)
##################
......@@ -1263,8 +1261,7 @@ have_librsvg=no
if test "x$with_librsvg" != xno; then
have_librsvg=yes
PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,
FILE_SVG='file-svg$(EXEEXT)'
LIBSVG=$SVG_LIBS,
FILE_SVG='file-svg$(EXEEXT)',
have_librsvg="no (librsvg not found)")
else
have_librsvg="no (librsvg support disabled)"
......@@ -1275,7 +1272,6 @@ if test "x$have_librsvg" = xyes; then
fi
AC_SUBST(FILE_SVG)
AC_SUBST(LIBSVG)
####################################
......@@ -1302,7 +1298,6 @@ if test "x$with_poppler" != xno; then
PKG_CHECK_MODULES(POPPLER,
poppler-glib >= poppler_required_version gthread-2.0,
FILE_PDF='file-pdf$(EXEEXT)'
LIBPOPPLER=$POPPLER_LIBS
AC_DEFINE(HAVE_POPPLER, 1, [Define to 1 if libpoppler is available])
have_poppler=yes,
have_poppler="Using PostScript plug-in (libpoppler not found)")
......@@ -1311,7 +1306,6 @@ else
fi
AC_SUBST(FILE_PDF)
AC_SUBST(LIBPOPPLER)
###############################################
......@@ -1408,7 +1402,7 @@ if test "x$WMF_CONFIG" != "xno" ; then
if expr $wmf_version \>= wmf_required_version >/dev/null; then
AC_MSG_RESULT([yes (version $wmf_version)])
FILE_WMF='file-wmf$(EXEEXT)'
LIBWMF=`$WMF_CONFIG --libs`
WMF_LIBS=`$WMF_CONFIG --libs`
WMF_CFLAGS=`$WMF_CONFIG --cflags`
else
have_libwmf="no (libwmf is too old)"
......@@ -1422,8 +1416,8 @@ if test "x$have_libwmf" = xyes; then
fi
AC_SUBST(FILE_WMF)
AC_SUBST(WMF_LIBS)
AC_SUBST(WMF_CFLAGS)
AC_SUBST(LIBWMF)
################
......@@ -1445,7 +1439,7 @@ if test "x$with_lcms" != xno; then
])
if test "x$have_lcms" = xyes; then
AC_DEFINE(HAVE_LCMS, 1, [Define to 1 if lcms is available])
LIBLCMS="-llcms"
LCMS_LIBS="-llcms"
LCMS='lcms$(EXEEXT)'
else
have_lcms="no (lcms not found or unusable)"
......@@ -1455,7 +1449,7 @@ else
fi
AC_SUBST(LCMS)
AC_SUBST(LIBLCMS)
AC_SUBST(LCMS_LIBS)
AM_CONDITIONAL(HAVE_LCMS, test "x$have_lcms" = xyes)
......
......@@ -60,7 +60,7 @@ controller_libadd = $(modules_libadd)
if HAVE_LCMS
libcolorsel_cmyk_la_SOURCES = colorsel_cmyk_lcms.c
libcolorsel_cmyk_la_LIBADD = $(libgimpconfig) $(colorsel_libadd) $(LIBLCMS)
libcolorsel_cmyk_la_LIBADD = $(libgimpconfig) $(colorsel_libadd) $(LCMS_LIBS)
else
libcolorsel_cmyk_la_SOURCES = colorsel_cmyk.c
libcolorsel_cmyk_la_LIBADD = $(colorsel_libadd)
......@@ -90,7 +90,7 @@ libcdisplay_highcontrast_la_LIBADD = $(cdisplay_libadd)
libcdisplay_lcms_la_SOURCES = cdisplay_lcms.c
libcdisplay_lcms_la_LDFLAGS = -avoid-version -module $(no_undefined)
libcdisplay_lcms_la_LIBADD = $(cdisplay_libadd) $(LIBLCMS)
libcdisplay_lcms_la_LIBADD = $(cdisplay_libadd) $(LCMS_LIBS)
if PLATFORM_WIN32
libcdisplay_lcms_la_LIBADD += -lgdi32
......@@ -98,7 +98,7 @@ endif
libcdisplay_proof_la_SOURCES = cdisplay_proof.c
libcdisplay_proof_la_LDFLAGS = -avoid-version -module $(no_undefined)
libcdisplay_proof_la_LIBADD = $(cdisplay_libadd) $(LIBLCMS)
libcdisplay_proof_la_LIBADD = $(cdisplay_libadd) $(LCMS_LIBS)
libcontroller_linux_input_la_SOURCES = \
gimpinputdevicestore-hal.c \
......
......@@ -961,7 +961,7 @@ file_aa_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBAA) \
$(AA_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -1145,7 +1145,7 @@ file_mng_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBMNG) \
$(MNG_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -1196,7 +1196,7 @@ file_pdf_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBPOPPLER) \
$(POPPLER_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -1231,7 +1231,7 @@ file_png_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBPNG) \
$(PNG_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -1280,7 +1280,7 @@ file_psp_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBZ) \
$(Z_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -1331,7 +1331,7 @@ file_svg_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBSVG) \
$(SVG_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -1364,7 +1364,7 @@ file_tiff_load_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBTIFF) \
$(TIFF_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -1381,7 +1381,7 @@ file_tiff_save_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBTIFF) \
$(TIFF_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -1400,7 +1400,7 @@ file_wmf_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBWMF) \
$(WMF_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -1433,7 +1433,7 @@ file_xpm_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBXPM) \
$(XPM_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -1652,7 +1652,7 @@ lcms_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBLCMS) \
$(LCMS_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -1717,7 +1717,7 @@ mail_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBMAIL) \
$(MAIL_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -2085,7 +2085,7 @@ screenshot_LDADD = \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(LIBSCREENSHOT) \
$(SCREENSHOT_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......
......@@ -140,7 +140,7 @@ foreach (sort keys %plugins) {
$optlib = "\n\t\$(" . $plugins{$_}->{libs} . ")\t\t\\";
} else {
my $name = exists $plugins{$_}->{libopt} ? $plugins{$_}->{libopt} : $_;
$optlib = "\n\t\$(LIB\U$name\E)\t\t\\";
$optlib = "\n\t\$(\U$name\E_LIBS)\t\t\\";
}
}
......
......@@ -47,7 +47,7 @@
'edge-sobel' => { ui => 1 },
'emboss' => { ui => 1 },
'engrave' => { ui => 1 },
'file-aa' => { ui => 1, optional => 1, libs => 'LIBAA' },
'file-aa' => { ui => 1, optional => 1, libs => 'AA_LIBS' },
'file-cel' => { ui => 1 },
'file-csource' => { ui => 1 },
'file-desktop-link' => {},
......@@ -59,24 +59,24 @@
'file-glob' => {},
'file-header' => { ui => 1 },
'file-html-table' => { ui => 1 },
'file-mng' => { ui => 1, optional => 1, libs => 'LIBMNG' },
'file-mng' => { ui => 1, optional => 1, libs => 'MNG_LIBS' },
'file-pat' => { ui => 1 },
'file-pcx' => { ui => 1 },
'file-pix' => { ui => 1 },
'file-png' => { ui => 1, optional => 1, libs => 'LIBPNG', cflags => 'PNG_CFLAGS' },
'file-png' => { ui => 1, optional => 1, libs => 'PNG_LIBS', cflags => 'PNG_CFLAGS' },
'file-pnm' => { ui => 1 },
'file-pdf' => { ui => 1, optional => 1, libs => 'LIBPOPPLER', cflags => 'POPPLER_CFLAGS' },
'file-pdf' => { ui => 1, optional => 1, libs => 'POPPLER_LIBS', cflags => 'POPPLER_CFLAGS' },
'file-ps' => { ui => 1 },
'file-psp' => { ui => 1, optional => 1, libopt => 'z' },
'file-psp' => { ui => 1, optional => 1, libs => 'Z_LIBS' },
'file-raw' => { ui => 1 },
'file-sunras' => { ui => 1 },
'file-svg' => { ui => 1, optional => 1, libs => 'LIBSVG', cflags => 'SVG_CFLAGS' },
'file-svg' => { ui => 1, optional => 1, libs => 'SVG_LIBS', cflags => 'SVG_CFLAGS' },
'file-tga' => { ui => 1 },
'file-tiff-load' => { ui => 1, optional => 1, libs => 'LIBTIFF' },
'file-tiff-save' => { ui => 1, optional => 1, libs => 'LIBTIFF' },
'file-wmf' => { ui => 1, optional => 1, libs => 'LIBWMF', cflags => 'WMF_CFLAGS' },
'file-tiff-load' => { ui => 1, optional => 1, libs => 'TIFF_LIBS' },
'file-tiff-save' => { ui => 1, optional => 1, libs => 'TIFF_LIBS' },
'file-wmf' => { ui => 1, optional => 1, libs => 'WMF_LIBS', cflags => 'WMF_CFLAGS' },
'file-xbm' => { ui => 1 },
'file-xpm' => { ui => 1, optional => 1, libs => 'LIBXPM' },
'file-xpm' => { ui => 1, optional => 1, libs => 'XPM_LIBS' },
'file-xwd' => { ui => 1 },
'film' => { ui => 1 },
'filter-pack' => { ui => 1 },
......
......@@ -43,7 +43,7 @@ LDADD = \
$(libgimpcolor) \
$(libgimpmath) \
$(libgimpbase) \
$(LIBPNG) \
$(PNG_LIBS) \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -49,8 +49,8 @@ file_jpeg_LDADD = \
$(libgimpcolor) \
$(libgimpmath) \
$(libgimpbase) \
$(LIBJPEG) \
$(LIBLCMS) \
$(JPEG_LIBS) \
$(LCMS_LIBS) \
$(GTK_LIBS) \
$(EXIF_LIBS) \
$(RT_LIBS) \
......@@ -65,7 +65,7 @@ jpegqual_SOURCES = \
jpegqual.c
jpegqual_LDADD = \
$(LIBJPEG) \
$(JPEG_LIBS) \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
......@@ -54,7 +54,7 @@ LDADD = \
$(libgimpcolor) \
$(libgimpmath) \
$(libgimpbase) \
$(LIBJPEG) \
$(JPEG_LIBS) \
$(GTK_LIBS) \
$(EXIF_LIBS) \
$(IPTCDATA_LIBS) \
......
......@@ -36,5 +36,5 @@ LDADD = \
$(libgimpbase) \
$(GTK_LIBS) \
$(RT_LIBS) \
$(LIBJPEG) \
$(JPEG_LIBS) \
$(INTLLIBS)
......@@ -23,7 +23,7 @@ gimp_remote_2_5_SOURCES = \
gimp_remote_2_5_LDADD = \
$(GTK_LIBS) \
$(LIBXMU)
$(XMU_LIBS)
gimptool_2_0_SOURCES = \
gimptool.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment