mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-21 20:12:30 +00:00
GTK_LIBS and GLIB_LIBS should be listed before optional libs, to make sure
2006-12-11 Manish Singh <yosh@gimp.org> * plug-ins/common/mkgen.pl: GTK_LIBS and GLIB_LIBS should be listed before optional libs, to make sure any -L args from pkg-config take. * plug-ins/common/Makefile.am: regenerated.
This commit is contained in:
parent
2a20c9f2de
commit
046be921e8
|
@ -1,3 +1,11 @@
|
|||
2006-12-11 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* plug-ins/common/mkgen.pl: GTK_LIBS and GLIB_LIBS should be
|
||||
listed before optional libs, to make sure any -L args from pkg-config
|
||||
take.
|
||||
|
||||
* plug-ins/common/Makefile.am: regenerated.
|
||||
|
||||
2006-12-11 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* app/display/gimpdisplayshell-progress.c
|
||||
|
|
|
@ -269,8 +269,8 @@ aa_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBAA) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBAA) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
@ -1271,8 +1271,8 @@ lcms_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBLCMS) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBLCMS) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
@ -1320,8 +1320,8 @@ mail_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBMAIL) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBMAIL) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
@ -1385,8 +1385,8 @@ mng_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBMNG) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBMNG) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
@ -1657,8 +1657,8 @@ png_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBPNG) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBPNG) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
@ -1708,8 +1708,8 @@ poppler_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBPOPPLER) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBPOPPLER) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
@ -1786,8 +1786,8 @@ psp_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBZ) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBZ) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
@ -1928,8 +1928,8 @@ screenshot_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBSCREENSHOT) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBSCREENSHOT) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
@ -2170,8 +2170,8 @@ svg_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBSVG) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBSVG) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
@ -2219,8 +2219,8 @@ tiff_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBTIFF) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBTIFF) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
@ -2437,8 +2437,8 @@ wmf_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBWMF) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBWMF) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
@ -2470,8 +2470,8 @@ xpm_LDADD = \
|
|||
$(libgimpconfig) \
|
||||
$(libgimpcolor) \
|
||||
$(libgimpbase) \
|
||||
$(LIBXPM) \
|
||||
$(GTK_LIBS) \
|
||||
$(LIBXPM) \
|
||||
$(RT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
|
|
|
@ -120,6 +120,13 @@ foreach (sort keys %plugins) {
|
|||
$libgimp .= "\t\\\n\t\$(libgimpcolor)";
|
||||
$libgimp .= "\t\t\\\n\t\$(libgimpbase)";
|
||||
|
||||
my $glib;
|
||||
if (exists $plugins{$_}->{ui}) {
|
||||
$glib = "\$(GTK_LIBS)"
|
||||
} else {
|
||||
$glib = "\$(GLIB_LIBS)"
|
||||
}
|
||||
|
||||
my $optlib = "";
|
||||
if (exists $plugins{$_}->{optional}) {
|
||||
my $name = exists $plugins{$_}->{libopt} ? $plugins{$_}->{libopt} : $_;
|
||||
|
@ -137,11 +144,6 @@ EOT
|
|||
}
|
||||
|
||||
my $deplib = "\$(RT_LIBS)\t\t\\\n\t\$(INTLLIBS)";
|
||||
if (exists $plugins{$_}->{ui}) {
|
||||
$deplib = "\$(GTK_LIBS)\t\t\\\n\t$deplib";
|
||||
} else {
|
||||
$deplib = "\$(GLIB_LIBS)\t\t\\\n\t$deplib";
|
||||
}
|
||||
if (exists $plugins{$_}->{libdep}) {
|
||||
my @lib = split(/:/, $plugins{$_}->{libdep});
|
||||
foreach $lib (@lib) {
|
||||
|
@ -155,7 +157,8 @@ ${makename}_SOURCES = \\
|
|||
$_.c
|
||||
|
||||
${makename}_LDADD = \\
|
||||
$libgimp \\$optlib
|
||||
$libgimp \\
|
||||
$glib \\$optlib
|
||||
$deplib
|
||||
EOT
|
||||
|
||||
|
|
Loading…
Reference in a new issue