Commit 34fc9679 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

gimptool-1.4.in plug-ins/*/Makefile.am merged fixes from stable branch

2001-07-02  Sven Neumann  <sven@gimp.org>

	* gimptool-1.4.in
	* plug-ins/*/Makefile.am
	* plug-ins/common/mkgen.pl: merged fixes from stable branch
parent 8a6f5a10
2001-07-02 Sven Neumann <sven@gimp.org>
* gimptool-1.4.in
* plug-ins/*/Makefile.am
* plug-ins/common/mkgen.pl: merged fixes from stable branch
2001-07-02 Michael Natterer <mitch@gimp.org>
* app/gui/dialogs-commands.[ch]
......
......@@ -97,6 +97,14 @@ else
gtk_libs=`$GTK_CONFIG --libs`
fi
if test x${GLIB_CONFIG+set} != xset ; then
glib_cflags='@GLIB_CFLAGS@'
glib_libs='@GLIB_LIBS@'
else
glib_cflags=`$GLIB_CONFIG --cflags`
glib_libs=`$GLIB_CONFIG --libs`
fi
if test x${INSTALL+set} != xset ; then
INSTALL='@INSTALL@'
if test "$INSTALL" = "./install-sh -c"; then
......@@ -177,7 +185,7 @@ while test $# -gt 0; do
--cflags | --cflags-nogimpui)
my_gtk_cflags=$gtk_cflags ;;
--cflags-noui)
my_gtk_cflags=`echo $gtk_cflags | sed 's/^.*\(-I[^ ]*glib[^ ]* *-I[^ ]*\).*$/\1/'` ;;
my_gtk_cflags=$glib_cflags ;;
esac
includes=-I@includedir@/gimp-@LT_RELEASE@
echo $includes $my_gtk_cflags
......@@ -202,23 +210,7 @@ while test $# -gt 0; do
esac
;;
--libs-noui)
glib_ldflags=`echo $gtk_libs | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
if test -z "$glib_ldflags" ; then
glib_ldflags=`echo $gtk_libs | sed 's/^ *\(-L[^ ]*\) .*$/\1/'`
fi
glib_libs="$glib_ldflags `echo $gtk_libs | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`"
my_glib_libs=
libdirs=-L@libdir@
for i in $glib_libs ; do
if test $i != -L@libdir@ ; then
if test -z "$my_glib_libs" ; then
my_glib_libs="$i"
else
my_glib_libs="$my_glib_libs $i"
fi
fi
done
echo -L@libdir@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $my_glib_libs
echo -L@libdir@ -lgimp-@LT_RELEASE@ -lgimpcolor-@LT_RELEASE@ -lgimpmath-@LT_RELEASE@ -lgimpbase-@LT_RELEASE@ $glib_libs
;;
--install-bin | --install-admin-bin \
| --install-bin-strip | --install-admin-bin-strip \
......
......@@ -24,6 +24,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
......
......@@ -35,6 +35,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/plug-ins/libgck \
$(GTK_CFLAGS) \
-I$(includedir) \
......
......@@ -37,6 +37,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/plug-ins/libgck \
$(GTK_CFLAGS) \
-I$(includedir) \
......
......@@ -17,6 +17,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
......
......@@ -15,6 +15,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
......
......@@ -53,6 +53,7 @@ AM_CPPFLAGS = \@STRIP_BEGIN\@ \\
INCLUDES = \@STRIP_BEGIN\@ \\
-I\$(top_srcdir) \\
-I\$(top_srcdir)/intl \\
\$(GTK_CFLAGS) \\
-I\$(includedir) \\
\@STRIP_END\@
......
......@@ -18,6 +18,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
......
......@@ -17,6 +17,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GLIB_CFLAGS) \
-I$(includedir) \
@STRIP_END@
......
......@@ -16,6 +16,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
......
......@@ -21,6 +21,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
......
......@@ -18,6 +18,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
......
......@@ -212,6 +212,7 @@ AM_CPPFLAGS = @STRIP_BEGIN@ \
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
......
Supports Markdown
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