diff --git a/ChangeLog b/ChangeLog index 95ab21e094..bb693f95cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jun 19 12:34:29 PDT 1998 Manish Singh + + * changes libgimp versioning to gtk-style. Bunch o' Makefile.am + changes for that + Thu Jun 18 23:11:36 1998 Owen Taylor * app/ink.c: Shift the range to smaller brushes. diff --git a/app/Makefile.am b/app/Makefile.am index 4d889147ff..761af17873 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -300,13 +300,14 @@ CPPFLAGS = \ -DGIMPDIR=\""$(gimpdir)"\" INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) -gimp_LDADD = \ +LDADD = \ $(top_builddir)/libgimp/libgimpi.a \ - $(X_LIBS) + $(GTK_LIBS) \ + -lc DEPS = \ $(top_builddir)/libgimp/libgimpi.a diff --git a/configure.in b/configure.in index 31e6d3e214..2a9d7a6286 100644 --- a/configure.in +++ b/configure.in @@ -2,17 +2,23 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(gimprc.in) dnl Initialize automake stuff -dnl $Format: "GIMP_MAJOR_VERSION=$ReleaseMajorVersion$" $ GIMP_MAJOR_VERSION=1 -dnl $Format: "GIMP_MINOR_VERSION=$ReleaseMinorVersion$" $ GIMP_MINOR_VERSION=1 -dnl $Format: "GIMP_MICRO_VERSION=$ReleaseMicroVersion$" $ GIMP_MICRO_VERSION=0 - +GIMP_INTERFACE_AGE=0 +GIMP_BINARY_AGE=0 GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION -dnl $Format: "AM_INIT_AUTOMAKE(gimp, $ReleaseVersion$)" $ -AM_INIT_AUTOMAKE(gimp, $GIMP_VERSION) +dnl libtool versioning +LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION +LT_CURRENT=`expr $GIMP_MICRO_VERSION - $GIMP_INTERFACE_AGE` +LT_REVISION=$GIMP_INTERFACE_AGE +LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE` + +VERSION=$GIMP_VERSION +PACKAGE=gimp + +AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) dnl Specify a header configuration file AM_CONFIG_HEADER(config.h) @@ -32,7 +38,6 @@ fi) AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]], , enable_ansi=no) -AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ]) dnl Possibly change default gimpdir from .gimp gimpdir=.gimp-1.1 @@ -43,16 +48,6 @@ if eval "test x$enable_gimpdir != x"; then fi fi) -AC_DEFUN(AC_GIMP_CHECK, -[ - AM_PATH_GTK(1.1.0,, - AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.)) - X_LIBS=$GTK_LIBS - X_CFLAGS=$GTK_CFLAGS - AC_SUBST(X_LIBS) - AC_SUBST(X_CFLAGS) -]) - if test -n "$DEBUGFLAG"; then CFLAGS="$DEBUGFLAG $CFLAGS" fi @@ -64,7 +59,12 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_CPP -AC_GIMP_CHECK + +dnl Check for our required libraries +AM_PATH_GLIB(1.1.0,, + AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.)) +AM_PATH_GTK(1.1.0,, + AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.)) if eval "test x$GCC = xyes"; then if echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null; then @@ -93,6 +93,7 @@ gimp_save_LDFLAGS="$LDFLAGS" gimp_save_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" +LDFLAGS="$LDFLAGS `echo $GLIB_LIBS | sed 's/\(.*\)\(-lglib.*\)/\1/'`" LDFLAGS="$LDFLAGS `echo $GTK_LIBS | sed 's/\(.*\)\(-lgtk.*\)/\1/'`" LIBS="$LIBS $GTK_LIBS" @@ -306,6 +307,7 @@ dnl check for difftime AC_CHECK_FUNC(difftime, , AC_DEFINE(NO_DIFFTIME)) dnl Threads +AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ]) if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then AC_CHECK_LIB(pthread, pthread_attr_init, AC_DEFINE(USE_PTHREADS) @@ -404,6 +406,11 @@ AC_SUBST(GIMP_MINOR_VERSION) AC_SUBST(GIMP_MICRO_VERSION) AC_SUBST(GIMP_VERSION) +AC_SUBST(LT_RELEASE) +AC_SUBST(LT_CURRENT) +AC_SUBST(LT_REVISION) +AC_SUBST(LT_AGE) + AC_SUBST(gimpdir) AC_SUBST(gimpdatadir) AC_SUBST(gimpplugindir) diff --git a/data/brushes/Makefile.am b/data/brushes/Makefile.am index 6117e8cf0d..cf6dcb11bc 100644 --- a/data/brushes/Makefile.am +++ b/data/brushes/Makefile.am @@ -12,21 +12,21 @@ EXTRA_DIST = $(brushdata_DATA) .PHONY: files -FILES =\ - 10x10square.gbr \ +FILES = \ + 10x10square.gbr \ 10x10squareBlur.gbr \ - 11circle.gbr \ - 11fcircle.gbr \ - 13circle.gbr \ - 13fcircle.gbr \ - 15circle.gbr \ - 15fcircle.gbr \ - 17circle.gbr \ - 17fcircle.gbr \ - 19circle.gbr \ - 19fcircle.gbr \ - 1circle.gbr \ - 20x20square.gbr \ + 11circle.gb \ + 11fcircle.gbr \ + 13circle.gbr \ + 13fcircle.gbr \ + 15circle.gbr \ + 15fcircle.gbr \ + 17circle.gbr \ + 17fcircle.gbr \ + 19circle.gbr \ + 19fcircle.gbr \ + 1circle.gbr \ + 20x20square.gbr \ 20x20squareBlur.gbr \ 3circle.gbr \ 3fcircle.gbr \ diff --git a/data/gradients/Makefile.am b/data/gradients/Makefile.am index f2bb3f7325..a0e7a15856 100644 --- a/data/gradients/Makefile.am +++ b/data/gradients/Makefile.am @@ -12,82 +12,82 @@ EXTRA_DIST = $(gradientdata_DATA) .PHONY: files -FILES =\ - Abstract_1 \ - Abstract_2 \ - Abstract_3 \ - Aneurism \ - Blinds \ - Blue_Green \ - Browns \ - Brushed_Aluminium \ - Burning_Paper \ - Burning_Transparency \ - CD \ - CD_Half \ - Caribbean_Blues \ - Coffee \ - Cold_Steel \ - Cold_Steel_2 \ - Crown_molding \ - Dark_1 \ - Deep_Sea \ - Default \ - Flare_Glow_Angular_1 \ - Flare_Glow_Radial_1 \ - Flare_Glow_Radial_2 \ - Flare_Glow_Radial_3 \ - Flare_Glow_Radial_4 \ - Flare_Radial_101 \ - Flare_Radial_102 \ - Flare_Radial_103 \ - Flare_Rays_Radial_1 \ - Flare_Rays_Radial_2 \ - Flare_Rays_Size_1 \ - Flare_Sizefac_101 \ - Four_bars \ - French_flag \ - French_flag_smooth \ - Full_saturation_spectrum_CCW \ - Full_saturation_spectrum_CW \ - German_flag \ - German_flag_smooth \ - Golden \ - Greens \ - Horizon_1 \ - Horizon_2 \ - Incandescent \ - Land_1 \ - Land_and_Sea \ - Metallic_Something \ - Mexican_flag \ - Mexican_flag_smooth \ - Nauseating_Headache \ - Neon_Cyan \ - Neon_Green \ - Neon_Yellow \ - Pastels \ - Pastel_Rainbow \ - Purples \ - Radial_Eyeball_Blue \ - Radial_Eyeball_Brown \ - Radial_Eyeball_Green \ - Radial_Glow_1 \ - Radial_Rainbow_Hoop \ - Romanian_flag \ - Romanian_flag_smooth \ - Rounded_edge \ - Shadows_1 \ - Shadows_2 \ - Shadows_3 \ - Skyline \ - Skyline_polluted \ - Square_Wood_Frame \ - Sunrise \ - Three_bars_sin \ - Tropical_Colors \ - Tube_Red \ - Wood_1 \ - Wood_2 \ - Yellow_Contrast \ - Yellow_Orange +FILES = \ + Abstract_1 \ + Abstract_2 \ + Abstract_3 \ + Aneurism \ + Blinds \ + Blue_Green \ + Browns \ + Brushed_Aluminium \ + Burning_Paper \ + Burning_Transparency \ + CD \ + CD_Half \ + Caribbean_Blues \ + Coffee \ + Cold_Steel \ + Cold_Steel_2 \ + Crown_molding \ + Dark_1 \ + Deep_Sea \ + Default \ + Flare_Glow_Angular_1 \ + Flare_Glow_Radial_1 \ + Flare_Glow_Radial_2 \ + Flare_Glow_Radial_3 \ + Flare_Glow_Radial_4 \ + Flare_Radial_101 \ + Flare_Radial_102 \ + Flare_Radial_103 \ + Flare_Rays_Radial_1 \ + Flare_Rays_Radial_2 \ + Flare_Rays_Size_1 \ + Flare_Sizefac_101 \ + Four_bars \ + French_flag \ + French_flag_smooth \ + Full_saturation_spectrum_CCW \ + Full_saturation_spectrum_CW \ + German_flag \ + German_flag_smooth \ + Golden \ + Greens \ + Horizon_1 \ + Horizon_2 \ + Incandescent \ + Land_1 \ + Land_and_Sea \ + Metallic_Something \ + Mexican_flag \ + Mexican_flag_smooth \ + Nauseating_Headache \ + Neon_Cyan \ + Neon_Green \ + Neon_Yellow \ + Pastels \ + Pastel_Rainbow \ + Purples \ + Radial_Eyeball_Blue \ + Radial_Eyeball_Brown \ + Radial_Eyeball_Green \ + Radial_Glow_1 \ + Radial_Rainbow_Hoop \ + Romanian_flag \ + Romanian_flag_smooth \ + Rounded_edge \ + Shadows_1 \ + Shadows_2 \ + Shadows_3 \ + Skyline \ + Skyline_polluted \ + Square_Wood_Frame \ + Sunrise \ + Three_bars_sin \ + Tropical_Colors \ + Tube_Red \ + Wood_1 \ + Wood_2 \ + Yellow_Contrast \ + Yellow_Orange diff --git a/data/palettes/Makefile.am b/data/palettes/Makefile.am index 961ded876a..8a2e7f7258 100644 --- a/data/palettes/Makefile.am +++ b/data/palettes/Makefile.am @@ -12,41 +12,40 @@ EXTRA_DIST = $(palettedata_DATA) .PHONY: files -FILES =\ - Blues \ - Bears \ - Bgold \ - Borders \ +FILES = \ + Blues \ + Bears \ + Bgold \ + Borders \ Browns_And_Yellows \ - Caramel \ - China \ - Coldfire \ - Cool_Colors \ - Cranes \ - Dark_pastels \ - Default \ - Ega \ - Firecode \ - Gold \ - Grayblue \ - Grays \ - GrayViolet \ - Greens \ - Hilite \ - Kahki \ - Lights \ - Muted \ - Named_Colors \ - News3 \ - Op2 \ - Paintjet \ - Pastels \ - Plasma \ - Reds \ + Caramel \ + China \ + Coldfire \ + Cool_Colors \ + Cranes \ + Dark_pastels \ + Default \ + Ega \ + Firecode \ + Gold \ + Grayblue \ + Grays \ + GrayViolet \ + Greens \ + Hilite \ + Kahki \ + Lights \ + Muted \ + Named_Colors \ + News3 \ + Op2 \ + Paintjet \ + Pastels \ + Plasma \ + Reds \ Reds_And_Purples \ - Royal \ - Topographic \ - Volcano \ - Warm_Colors \ - Web - + Royal \ + Topographic \ + Volcano \ + Warm_Colors \ + Web diff --git a/data/patterns/Makefile.am b/data/patterns/Makefile.am index 9902fb928c..b7204a74bc 100644 --- a/data/patterns/Makefile.am +++ b/data/patterns/Makefile.am @@ -12,62 +12,60 @@ EXTRA_DIST = $(patterndata_DATA) .PHONY: files -FILES =\ - 3dgreen.pat \ - Craters.pat \ - Moonfoot.pat \ - amethyst.pat \ - bark.pat \ - blue.pat \ - bluegrid.pat \ - bluesquares.pat \ - blueweb.pat \ - brick.pat \ - burlap.pat \ - burlwood.pat \ - choc_swirl.pat \ - corkboard.pat \ - cracked.pat \ - crinklepaper.pat \ - electric.pat \ - fibers.pat \ - granite1.pat \ - ground1.pat \ - ice.pat \ - java.pat \ - leather.pat \ - leaves.pat \ - leopard.pat \ - lightning.pat \ - marble1.pat \ - marble2.pat \ - marble3.pat \ - nops.pat \ - paper.pat \ - parque1.pat \ - parque2.pat \ - parque3.pat \ - pastel.pat \ - pine.pat \ - pink_marble.pat \ - pool.pat \ - qube1.pat \ - rain.pat \ - recessed.pat \ - redcube.pat \ - rock.pat \ - sky.pat \ - slate.pat \ - sm_squares.pat \ - starfield.pat \ - stone33.pat \ - terra.pat \ - walnut.pat \ - warning.pat \ - wood1.pat \ - wood2.pat \ - wood3.pat \ - wood4.pat \ - wood5.pat - - +FILES = \ + 3dgreen.pat \ + Craters.pat \ + Moonfoot.pat \ + amethyst.pat \ + bark.pat \ + blue.pat \ + bluegrid.pat \ + bluesquares.pat \ + blueweb.pat \ + brick.pat \ + burlap.pat \ + burlwood.pat \ + choc_swirl.pat \ + corkboard.pat \ + cracked.pat \ + crinklepaper.pat \ + electric.pat \ + fibers.pat \ + granite1.pat \ + ground1.pat \ + ice.pat \ + java.pat \ + leather.pat \ + leaves.pat \ + leopard.pat \ + lightning.pat \ + marble1.pat \ + marble2.pat \ + marble3.pat \ + nops.pat \ + paper.pat \ + parque1.pat \ + parque2.pat \ + parque3.pat \ + pastel.pat \ + pine.pat \ + pink_marble.pat \ + pool.pat \ + qube1.pat \ + rain.pat \ + recessed.pat \ + redcube.pat \ + rock.pat \ + sky.pat \ + slate.pat \ + sm_squares.pat \ + starfield.pat \ + stone33.pat \ + terra.pat \ + walnut.pat \ + warning.pat \ + wood1.pat \ + wood2.pat \ + wood3.pat \ + wood4.pat \ + wood5.pat diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index c72948433a..c619d3332d 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -4,47 +4,57 @@ gimpincludedir = $(includedir)/libgimp scriptdata = -lib_LTLIBRARIES = libgimp.la libgimpui.la +lib_LTLIBRARIES = libgimp-1.1.la libgimpui-1.1.la noinst_LIBRARIES = libgimpi.a -libgimpi_a_SOURCES = gimpprotocol.c \ - gimpprotocol.h \ - gimpwire.c \ - gimpwire.h +libgimpi_a_SOURCES = \ + gimpprotocol.c \ + gimpprotocol.h \ + gimpwire.c \ + gimpwire.h -libgimpi_a_DEPENDENCIES = libgimp.la +## Evil hack to insure all deps are satisfied on first-run make +libgimpi_a_DEPENDENCIES = libgimp-1.1.la -libgimp_la_SOURCES = gimp.c \ - gimpchannel.c \ - gimpdisplay.c \ - gimpdrawable.c \ - gimpgradient.c \ - gimpimage.c \ - gimplayer.c \ - gimppalette.c \ - gimppixelrgn.c \ - gimpprotocol.c \ - gimpprotocol.h \ - gimptile.c \ - gimpwire.c \ - gimpwire.h +libgimp_1_1_la_SOURCES = \ + gimp.c \ + gimpchannel.c \ + gimpdisplay.c \ + gimpdrawable.c \ + gimpgradient.c \ + gimpimage.c \ + gimplayer.c \ + gimppalette.c \ + gimppixelrgn.c \ + gimpprotocol.c \ + gimpprotocol.h \ + gimptile.c \ + gimpwire.c \ + gimpwire.h -libgimpui_la_SOURCES = gimpmenu.c +libgimpui_1_1_la_SOURCES = \ + gimpmenu.c -gimpinclude_HEADERS = gimp.h \ - gimpenums.h \ - gimpmenu.h \ - gimpui.h +gimpinclude_HEADERS = \ + gimp.h \ + gimpenums.h \ + gimpmenu.h \ + gimpui.h -libgimp_la_LDFLAGS = -version-info 1:0:0 -libgimpui_la_LDFLAGS = -version-info 1:0:0 +libgimp_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libgimpui_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) CPPFLAGS = \ -DGIMPDIR=\""$(gimpdir)"\" INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_srcdir) \ + $(GLIB_CFLAGS) \ + -I$(includedir) + +libgimpui_1_1_la_INCLUDES = \ + -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) .PHONY: files diff --git a/plug-ins/AlienMap/Makefile.am b/plug-ins/AlienMap/Makefile.am index 089fdff534..83ab8b2325 100644 --- a/plug-ins/AlienMap/Makefile.am +++ b/plug-ins/AlienMap/Makefile.am @@ -5,22 +5,23 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = AlienMap AlienMap_SOURCES = \ - AlienMap.c logo.h + AlienMap.c \ + logo.h INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la AlienMap_DEPENDENCIES = $(DEPS) @@ -36,8 +37,3 @@ files: echo $$subdir/$$file; \ done; \ done - - - - - diff --git a/plug-ins/CEL/Makefile.am b/plug-ins/CEL/Makefile.am index e86742c433..62d3821491 100644 --- a/plug-ins/CEL/Makefile.am +++ b/plug-ins/CEL/Makefile.am @@ -8,20 +8,19 @@ CEL_SOURCES = \ CEL.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la CEL_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/CML_explorer/Makefile.am b/plug-ins/CML_explorer/Makefile.am index 7b5a2faf38..c8468b2c4a 100644 --- a/plug-ins/CML_explorer/Makefile.am +++ b/plug-ins/CML_explorer/Makefile.am @@ -8,20 +8,19 @@ CML_explorer_SOURCES = \ CML_explorer.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la CML_explorer_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/Lighting/Makefile.am b/plug-ins/Lighting/Makefile.am index 36056ce76a..14f1e22fb2 100644 --- a/plug-ins/Lighting/Makefile.am +++ b/plug-ins/Lighting/Makefile.am @@ -5,24 +5,46 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = Lighting Lighting_SOURCES = \ - amb1.xpm amb2.xpm diffint1.xpm diffint2.xpm diffref1.xpm diffref2.xpm high1.xpm high2.xpm lighting_apply.c lighting_apply.h lighting_image.c lighting_image.h lighting_main.c lighting_main.h lighting_pixmaps.h lighting_preview.c lighting_preview.h lighting_shade.c lighting_shade.h lighting_ui.c lighting_ui.h specref1.xpm specref2.xpm + amb1.xpm \ + amb2.xpm \ + diffint1.xpm \ + diffint2.xpm \ + diffref1.xpm \ + diffref2.xpm \ + high1.xpm \ + high2.xpm \ + lighting_apply.c \ + lighting_apply.h \ + lighting_image.c \ + lighting_image.h \ + lighting_main.c \ + lighting_main.h \ + lighting_pixmaps.h \ + lighting_preview.c \ + lighting_preview.h \ + lighting_shade.c \ + lighting_shade.h \ + lighting_ui.c \ + lighting_ui.h \ + specref1.xpm \ + specref2.xpm INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/plug-ins/libgck \ - -I$(includedir) \ - $(X_CFLAGS) + $(GTK_CFLAGS) \ + -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(top_builddir)/plug-ins/libgck/gck/libgck.la \ - $(X_LIBS) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(top_builddir)/plug-ins/libgck/gck/libgck.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ $(top_builddir)/plug-ins/libgck/gck/libgck.la Lighting_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am index fac267e044..6a3679f972 100644 --- a/plug-ins/Makefile.am +++ b/plug-ins/Makefile.am @@ -132,17 +132,6 @@ SUBDIRS = \ scriptdata = -pluginlibdir = $(gimpplugindir)/plug-ins - -EXTRA_DIST = build.in - -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LIBGIMPUI = $(top_builddir)/libgimp/libgimpui.la - .PHONY: files files: diff --git a/plug-ins/MapObject/Makefile.am b/plug-ins/MapObject/Makefile.am index 1b94f23411..19362d8fb4 100644 --- a/plug-ins/MapObject/Makefile.am +++ b/plug-ins/MapObject/Makefile.am @@ -5,24 +5,48 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = MapObject MapObject_SOURCES = \ - amb1.xpm amb2.xpm arcball.c arcball.h diffint1.xpm diffint2.xpm diffref1.xpm diffref2.xpm high1.xpm high2.xpm mapobject_apply.c mapobject_apply.h mapobject_image.c mapobject_image.h mapobject_main.c mapobject_main.h mapobject_pixmaps.h mapobject_preview.c mapobject_preview.h mapobject_shade.c mapobject_shade.h mapobject_ui.c mapobject_ui.h specref1.xpm specref2.xpm + amb1.xpm \ + amb2.xpm \ + arcball.c \ + arcball.h \ + diffint1.xpm \ + diffint2.xpm \ + diffref1.xpm \ + diffref2.xpm \ + high1.xpm \ + high2.xpm \ + mapobject_apply.c \ + mapobject_apply.h \ + mapobject_image.c \ + mapobject_image.h \ + mapobject_main.c \ + mapobject_main.h \ + mapobject_pixmaps.h \ + mapobject_preview.c \ + mapobject_preview.h \ + mapobject_shade.c \ + mapobject_shade.h \ + mapobject_ui.c \ + mapobject_ui.h \ + specref1.xpm \ + specref2.xpm INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/plug-ins/libgck \ - -I$(includedir) \ - $(X_CFLAGS) + $(GTK_CFLAGS) \ + -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(top_builddir)/plug-ins/libgck/gck/libgck.la \ - $(X_LIBS) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(top_builddir)/plug-ins/libgck/gck/libgck.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ $(top_builddir)/plug-ins/libgck/gck/libgck.la MapObject_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/aa/Makefile.am b/plug-ins/aa/Makefile.am index b798a2b3d2..df7905aa61 100644 --- a/plug-ins/aa/Makefile.am +++ b/plug-ins/aa/Makefile.am @@ -4,23 +4,24 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = aa -aa_SOURCES = aa.c +aa_SOURCES = \ + aa.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBAA_LIB@ \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ + @LIBAA_LIB@ \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la aa_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/align_layers/Makefile.am b/plug-ins/align_layers/Makefile.am index 06edbb84f4..899f65b011 100644 --- a/plug-ins/align_layers/Makefile.am +++ b/plug-ins/align_layers/Makefile.am @@ -8,20 +8,19 @@ align_layers_SOURCES = \ align_layers.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la align_layers_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/animationplay/Makefile.am b/plug-ins/animationplay/Makefile.am index 82712ad9b3..eec1236d29 100644 --- a/plug-ins/animationplay/Makefile.am +++ b/plug-ins/animationplay/Makefile.am @@ -8,20 +8,19 @@ animationplay_SOURCES = \ animationplay.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la animationplay_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/animoptimize/Makefile.am b/plug-ins/animoptimize/Makefile.am index 1703e8c054..4daef109f2 100644 --- a/plug-ins/animoptimize/Makefile.am +++ b/plug-ins/animoptimize/Makefile.am @@ -8,20 +8,19 @@ animoptimize_SOURCES = \ animoptimize.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la animoptimize_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/apply_lens/Makefile.am b/plug-ins/apply_lens/Makefile.am index d9c1e3612b..626ad2dd5a 100644 --- a/plug-ins/apply_lens/Makefile.am +++ b/plug-ins/apply_lens/Makefile.am @@ -8,20 +8,19 @@ apply_lens_SOURCES = \ apply_lens.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la apply_lens_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/autocrop/Makefile.am b/plug-ins/autocrop/Makefile.am index e910e430c4..9ded3b79fd 100644 --- a/plug-ins/autocrop/Makefile.am +++ b/plug-ins/autocrop/Makefile.am @@ -8,20 +8,19 @@ autocrop_SOURCES = \ autocrop.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la autocrop_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/autostretch_hsv/Makefile.am b/plug-ins/autostretch_hsv/Makefile.am index b253177c9e..20e84e1b2c 100644 --- a/plug-ins/autostretch_hsv/Makefile.am +++ b/plug-ins/autostretch_hsv/Makefile.am @@ -8,20 +8,19 @@ autostretch_hsv_SOURCES = \ autostretch_hsv.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la autostretch_hsv_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/blinds/Makefile.am b/plug-ins/blinds/Makefile.am index 1a20d5d043..388af138cc 100644 --- a/plug-ins/blinds/Makefile.am +++ b/plug-ins/blinds/Makefile.am @@ -8,20 +8,19 @@ blinds_SOURCES = \ blinds.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la blinds_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/blur/Makefile.am b/plug-ins/blur/Makefile.am index 4028c241e0..9f57424a0d 100644 --- a/plug-ins/blur/Makefile.am +++ b/plug-ins/blur/Makefile.am @@ -5,24 +5,25 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = blur blur_SOURCES = \ - blur.c $(top_srcdir)/plug-ins/gpc/gpc.h + $(top_srcdir)/plug-ins/gpc/gpc.h \ + blur.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/plug-ins/gpc/libgpc.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/plug-ins/gpc/libgpc.a \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/gpc/libgpc.a \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(top_builddir)/plug-ins/gpc/libgpc.a blur_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/bmp/Makefile.am b/plug-ins/bmp/Makefile.am index 3a1ea43dce..137028dc6f 100644 --- a/plug-ins/bmp/Makefile.am +++ b/plug-ins/bmp/Makefile.am @@ -5,25 +5,25 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = bmp bmp_SOURCES = \ - bmp.c bmp.h bmpread.c bmpwrite.c + bmp.c \ + bmp.h \ + bmpread.c \ + bmpwrite.c INCLUDES = \ - $(X_CFLAGS) \ + $(GTK_CFLAGS) \ -I$(top_srcdir) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la bmp_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/build.in b/plug-ins/build.in deleted file mode 100644 index cbfabe8dbe..0000000000 --- a/plug-ins/build.in +++ /dev/null @@ -1,228 +0,0 @@ -#!/bin/sh - -# save the program name -progname=$0 - -# need to know common directories -srcdir="@srcdir@" -top_srcdir="@top_srcdir@" -top_builddir=".." -prefix="@prefix@" - -# need to know some file and library location -gtkxconfig="$top_builddir/gtk+/gtk+.xconfig" -libgimp="$top_builddir/libgimp/libgimp.la" -libgimpui="$top_builddir/libgimp/libgimpui.la" -libgtk="$top_builddir/gtk+/gtk/libgtk.la" -libgdk="$top_builddir/gtk+/gdk/libgdk.la" -libglib="$top_builddir/gtk+/glib/libglib.la" - -# print out a usage summary and exit -usage () -{ - cat <" - - -h Display this help message and exit. - --help - - -s Specify a source file or files. If - --source a source file is not specified the name - of the source file will be determined - from the name of the plugin. For example, - the plugin "blur" would have the source - file "blur.c" associated with it. - - -v Print out messages saying what is happening - --verbose at each step of the build process. - - -n Print out commands that would be executed - --nothing but don't actually execute them. - - -e Print the build environment and exit. - --environment - - = Set the build environment variable tp - have the value . - -= Append to the build environment - variable . - += Prepend to the build environment - variable -EOF - exit 0 -} - -# initialize various variable to blank -plugin= -sources= -verbose= -environment= -nothing= -prev= - -# loop over the options -for option -do - # if the previous option takes an argument - # we take care of setting the appropriate variable - # here - if test -n "$prev"; then - eval "$prev=\"\$$prev \$option\"" - prev= - continue - fi - - case "$option" in - -h|--help) usage ;; - -s|--source) prev="sources" ;; - -v|--verbose) verbose="true" ;; - -e|--environment) environment="true" ;; - -n|--nothing) nothing="true" ;; - *=*) - # if the option was of the form [-+]= - # then we want to evaluate the argument as it - # is intended to set an environment variable. - # this would fairly simple, except for having to - # deal with the [-+] symbols that can be prepended. - # these have to be stripped off and converted into - # the corresponding "post_" and "pre_" strings - # respectively. - opt=`echo "$option" | sed 's/=[_a-zA-Z0-9]*//'` - arg=`echo "$option" | sed 's/[-+_a-zA-Z0-9]*=//'` - - case "$opt" in - -*) opt=`echo "$opt" | sed 's/-//'` - opt="post_$opt" ;; - +*) opt=`echo "$opt" | sed 's/+//'` - opt="pre_$opt" ;; - esac - - eval "$opt=\$arg" ;; - *) - if test -z "$plugin"; then - plugin="$option" - else - usage - fi ;; - esac -done - -# get build environment variables - -if test ! -f $gtkxconfig; then - echo "error: could not find \"$gtkxconfig\"" -fi - -# extract the X flags from the gtk+.xconfig file -X_CFLAGS=`grep X_CFLAGS $gtkxconfig | sed 's/X_CFLAGS[ \t]*=[ \t]*//'` -X_LDFLAGS=`grep X_LDFLAGS $gtkxconfig | sed 's/X_LDFLAGS[ \t]*=[ \t]*//'` -X_LIBS=`grep X_LIBS $gtkxconfig | sed 's/X_LIBS[ \t]*=[ \t]*//'` - -# we only set environment variables if they aren't already defined -CC=${CC:-"$pre_CC @CC@ $post_CC"} -LIBTOOL=${LIBTOOL:-"$pre_LIBTOOL $top_builddir/libtool $post_LIBTOOL"} -CFLAGS=${CFLAGS:-"$pre_CFLAGS @CFLAGS@ $post_CFLAGS"} -INCLUDES=${INCLUDES:-"$pre_INCLUDES $X_CFLAGS -I$top_srcdir -I$top_srcdir/gtk+ -I/usr/local/include $post_INCLUDES"} -DEFS=${DEFS:-"$pre_DEFS @DEFS@ -I. -I$srcdir -I.. $post_defs"} -CPPFLAGS=${CPPFLAGS:-"$pre_CPPFLAGS @CPPFLAGS@ $post_CPPFLAGS"} -LDFLAGS=${LDFLAGS:-"$pre_LDFLAGS @LDFLAGS@ $post_LDFLAGS"} -LDADD=${LDADD:-"$pre_LDADD $X_LDFLAGS -L/usr/local/lib $post_LDADD"} -LIBS=${LIBS:-"$pre_LIBS $X_LIBS $libgimp $libgtk $libgdk $libglib -lc -lm $post_LIBS"} -COMPILE=${COMPILE:-"$pre_COMPILE $CC $DEFS $INCLUDES $CPPFLAGS $CFLAGS $post_COMPILE"} -LINK=${LINK:-"$pre_LINK $LIBTOOL --mode=link $CC $LDFLAGS -o $plugin $post_LINK"} - -# print out the environment and exit if the user specified us to do so -if test -n "$environment"; then - echo CC = $CC - echo LIBTOOL = $LIBTOOL - echo CFLAGS = $CFLAGS - echo INCLUDES = $INCLUDES - echo DEFS = $DEFS - echo CPPFLAGS = $CPPFLAGS - echo LDFLAGS = $LDFLAGS - echo LDADD = $LDADD - echo LIBS = $LIBS - echo COMPILE = $COMPILE - echo LINK = $LINK - exit 0 -fi - -# if a name for a plugin wasn't specified then nothing can be done -if test -z "$plugin"; then - usage -fi - -# strip off the extension if it is present (we'll add it -# back in real soon to determine the name of the source file -# to use) -plugin=`echo $plugin | sed 's/\.c//'` - -# if the user didn't specify any sources, then calculate -# the source file based on the plugin name -if test -z "$sources"; then - sources="$plugin.c" -fi - -# show the user what we're doing -echo "plugin: $plugin" -echo "sources: $sources" - -# compile the source files. a source file is only compiled -# if either a) its object file doesn't exist or b) it is -# newer than its object file. -objects= -for file in $sources; do - objfile=`echo "$file" | sed 's/\.c/\.o/'` - - if test ! -f "$objfile" || test "$file" -nt "$objfile"; then - cmd="$COMPILE -c $file" - - if test -n "$verbose"; then - echo $cmd - else - echo "compiling $file" - fi - - if test -z "$nothing"; then - eval "$cmd" - fi - fi - - objects="$objects $objfile"; -done - -deps="$objects $libgimp $libgtk $libgdk $libglib" - -# determine if the plugin needs to be linked with libgimpui. -# (most plugins don't). we simply check the sources to see -# if they include "gimpui.h" -needlibgimpui=`grep gimpui.h $sources` -if test -n "needlibgimpui"; then - LIBS="$libgimpui $LIBS" - deps="$deps $libgimpui" -fi - -# determine if the plugin needs to be linked. if any of the -# dependencies (objects or libraries) are newer than the plugin -# or the plugin does not exist it will be built. -cmd= -for file in $deps; do - if test ! -f "$plugin" || test "$file" -nt "$plugin"; then - cmd="$LINK $objects $LDADD $LIBS" - break - fi -done - -if test -n "$cmd"; then - if test -n "$verbose"; then - echo $cmd - else - echo "linking $plugin" - fi - - if test -z "$nothing"; then - eval "$cmd" - fi -else - echo "\`$plugin' is up to date" -fi diff --git a/plug-ins/bumpmap/Makefile.am b/plug-ins/bumpmap/Makefile.am index 528d8d92c4..8dd2111871 100644 --- a/plug-ins/bumpmap/Makefile.am +++ b/plug-ins/bumpmap/Makefile.am @@ -8,20 +8,19 @@ bumpmap_SOURCES = \ bumpmap.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la bumpmap_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/bz2/Makefile.am b/plug-ins/bz2/Makefile.am index fe4fba5634..67a17af8ff 100644 --- a/plug-ins/bz2/Makefile.am +++ b/plug-ins/bz2/Makefile.am @@ -8,20 +8,19 @@ bz2_SOURCES = \ bz2.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la bz2_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/c_astretch/Makefile.am b/plug-ins/c_astretch/Makefile.am index d17d7aba38..d3d2221474 100644 --- a/plug-ins/c_astretch/Makefile.am +++ b/plug-ins/c_astretch/Makefile.am @@ -8,20 +8,19 @@ c_astretch_SOURCES = \ c_astretch.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la c_astretch_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/checkerboard/Makefile.am b/plug-ins/checkerboard/Makefile.am index 62cfb8dac8..2112cbde6e 100644 --- a/plug-ins/checkerboard/Makefile.am +++ b/plug-ins/checkerboard/Makefile.am @@ -8,20 +8,19 @@ checkerboard_SOURCES = \ checkerboard.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la checkerboard_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/colorify/Makefile.am b/plug-ins/colorify/Makefile.am index f5a6d4cdab..cc30a3cee8 100644 --- a/plug-ins/colorify/Makefile.am +++ b/plug-ins/colorify/Makefile.am @@ -8,20 +8,19 @@ colorify_SOURCES = \ colorify.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la colorify_DEPENDENCIES = $(DEPS) @@ -37,6 +36,3 @@ files: echo $$subdir/$$file; \ done; \ done - - - diff --git a/plug-ins/compose/Makefile.am b/plug-ins/compose/Makefile.am index da3762e21a..d81bba1009 100644 --- a/plug-ins/compose/Makefile.am +++ b/plug-ins/compose/Makefile.am @@ -8,20 +8,19 @@ compose_SOURCES = \ compose.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la compose_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/convmatrix/Makefile.am b/plug-ins/convmatrix/Makefile.am index a31e9d2318..44892b1069 100644 --- a/plug-ins/convmatrix/Makefile.am +++ b/plug-ins/convmatrix/Makefile.am @@ -8,20 +8,19 @@ convmatrix_SOURCES = \ convmatrix.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la convmatrix_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/cubism/Makefile.am b/plug-ins/cubism/Makefile.am index 48347a183c..0cf75772c8 100644 --- a/plug-ins/cubism/Makefile.am +++ b/plug-ins/cubism/Makefile.am @@ -8,20 +8,19 @@ cubism_SOURCES = \ cubism.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la cubism_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/dbbrowser/Makefile.am b/plug-ins/dbbrowser/Makefile.am index 7735648f91..2ab017e1e7 100644 --- a/plug-ins/dbbrowser/Makefile.am +++ b/plug-ins/dbbrowser/Makefile.am @@ -13,19 +13,19 @@ dbbrowser_SOURCES = \ dbbrowser_utils.h INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la dbbrowser_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/decompose/Makefile.am b/plug-ins/decompose/Makefile.am index 31e7522feb..ab144894be 100644 --- a/plug-ins/decompose/Makefile.am +++ b/plug-ins/decompose/Makefile.am @@ -8,20 +8,19 @@ decompose_SOURCES = \ decompose.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la decompose_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/deinterlace/Makefile.am b/plug-ins/deinterlace/Makefile.am index 340f9e15fc..8f50d42d64 100644 --- a/plug-ins/deinterlace/Makefile.am +++ b/plug-ins/deinterlace/Makefile.am @@ -5,24 +5,25 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = deinterlace deinterlace_SOURCES = \ - deinterlace.c $(top_srcdir)/plug-ins/megawidget/megawidget.h + $(top_srcdir)/plug-ins/megawidget/megawidget.h \ + deinterlace.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a deinterlace_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/depthmerge/Makefile.am b/plug-ins/depthmerge/Makefile.am index 9ac1b8a93a..d33f8d7fb4 100644 --- a/plug-ins/depthmerge/Makefile.am +++ b/plug-ins/depthmerge/Makefile.am @@ -8,20 +8,19 @@ depthmerge_SOURCES = \ depthmerge.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la depthmerge_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/despeckle/Makefile.am b/plug-ins/despeckle/Makefile.am index 8b87eeb0d1..7e6d5ca7ca 100644 --- a/plug-ins/despeckle/Makefile.am +++ b/plug-ins/despeckle/Makefile.am @@ -8,20 +8,19 @@ despeckle_SOURCES = \ despeckle.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la despeckle_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/destripe/Makefile.am b/plug-ins/destripe/Makefile.am index e4d59c7e19..bd12da0664 100644 --- a/plug-ins/destripe/Makefile.am +++ b/plug-ins/destripe/Makefile.am @@ -8,20 +8,19 @@ destripe_SOURCES = \ destripe.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la destripe_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/diffraction/Makefile.am b/plug-ins/diffraction/Makefile.am index f42d5a60f5..03a69b53ff 100644 --- a/plug-ins/diffraction/Makefile.am +++ b/plug-ins/diffraction/Makefile.am @@ -8,20 +8,19 @@ diffraction_SOURCES = \ diffraction.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la diffraction_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/displace/Makefile.am b/plug-ins/displace/Makefile.am index 668956dab7..9e202b1148 100644 --- a/plug-ins/displace/Makefile.am +++ b/plug-ins/displace/Makefile.am @@ -8,20 +8,19 @@ displace_SOURCES = \ displace.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la displace_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/edge/Makefile.am b/plug-ins/edge/Makefile.am index aa57fe65f3..8806b3b61b 100644 --- a/plug-ins/edge/Makefile.am +++ b/plug-ins/edge/Makefile.am @@ -8,20 +8,19 @@ edge_SOURCES = \ edge.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la edge_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/emboss/Makefile.am b/plug-ins/emboss/Makefile.am index f428133878..f12804cc40 100644 --- a/plug-ins/emboss/Makefile.am +++ b/plug-ins/emboss/Makefile.am @@ -5,24 +5,25 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = emboss emboss_SOURCES = \ - emboss.c $(top_srcdir)/plug-ins/megawidget/megawidget.h + $(top_srcdir)/plug-ins/megawidget/megawidget.h \ + emboss.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a emboss_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/engrave/Makefile.am b/plug-ins/engrave/Makefile.am index e28f28cc41..65c747f593 100644 --- a/plug-ins/engrave/Makefile.am +++ b/plug-ins/engrave/Makefile.am @@ -8,20 +8,19 @@ engrave_SOURCES = \ engrave.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la engrave_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/exchange/Makefile.am b/plug-ins/exchange/Makefile.am index 218ad35b1b..2e0cb7a529 100644 --- a/plug-ins/exchange/Makefile.am +++ b/plug-ins/exchange/Makefile.am @@ -8,20 +8,19 @@ exchange_SOURCES = \ exchange.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la exchange_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/faxg3/Makefile.am b/plug-ins/faxg3/Makefile.am index 9b76fdf960..db7c09134a 100644 --- a/plug-ins/faxg3/Makefile.am +++ b/plug-ins/faxg3/Makefile.am @@ -5,25 +5,25 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = faxg3 faxg3_SOURCES = \ - faxg3.c g3.c g3.h run_tbl.c + faxg3.c \ + g3.c \ + g3.h \ + run_tbl.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la faxg3_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/film/Makefile.am b/plug-ins/film/Makefile.am index b4bc262d9c..bdd420a1a1 100644 --- a/plug-ins/film/Makefile.am +++ b/plug-ins/film/Makefile.am @@ -8,20 +8,19 @@ film_SOURCES = \ film.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la film_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/fits/Makefile.am b/plug-ins/fits/Makefile.am index 7e5ab4677c..31cb62fbd7 100644 --- a/plug-ins/fits/Makefile.am +++ b/plug-ins/fits/Makefile.am @@ -5,23 +5,24 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = fits fits_SOURCES = \ - fits.c fitsrw.c fitsrw.h + fits.c \ + fitsrw.c \ + fitsrw.h INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la fits_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/flame/Makefile.am b/plug-ins/flame/Makefile.am index 710f55642d..cb11f3065a 100644 --- a/plug-ins/flame/Makefile.am +++ b/plug-ins/flame/Makefile.am @@ -5,23 +5,32 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = flame flame_SOURCES = \ - cmap.c cmap.h flame.c flame.h libifs.c libifs.h megawidget.c megawidget.h rect.c rect.h + cmap.c \ + cmap.h \ + flame.c \ + flame.h \ + libifs.c \ + libifs.h \ + megawidget.c \ + megawidget.h \ + rect.c \ + rect.h INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - $(LIBUCB_LIB) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ + $(LIBUCB_LIB) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la flame_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/flarefx/Makefile.am b/plug-ins/flarefx/Makefile.am index 8dccb814e7..445d2ff2a4 100644 --- a/plug-ins/flarefx/Makefile.am +++ b/plug-ins/flarefx/Makefile.am @@ -8,20 +8,19 @@ flarefx_SOURCES = \ flarefx.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la flarefx_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/fractaltrace/Makefile.am b/plug-ins/fractaltrace/Makefile.am index d9566509cf..1211a69f49 100644 --- a/plug-ins/fractaltrace/Makefile.am +++ b/plug-ins/fractaltrace/Makefile.am @@ -8,20 +8,19 @@ fractaltrace_SOURCES = \ fractaltrace.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la fractaltrace_DEPENDENCIES = $(DEPS) @@ -37,6 +36,3 @@ files: echo $$subdir/$$file; \ done; \ done - - - diff --git a/plug-ins/gauss_iir/Makefile.am b/plug-ins/gauss_iir/Makefile.am index fbd8aa09e1..de1a7dcbc1 100644 --- a/plug-ins/gauss_iir/Makefile.am +++ b/plug-ins/gauss_iir/Makefile.am @@ -8,20 +8,19 @@ gauss_iir_SOURCES = \ gauss_iir.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gauss_iir_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/gauss_rle/Makefile.am b/plug-ins/gauss_rle/Makefile.am index 8d0ebac5d0..7c60be9d95 100644 --- a/plug-ins/gauss_rle/Makefile.am +++ b/plug-ins/gauss_rle/Makefile.am @@ -8,20 +8,19 @@ gauss_rle_SOURCES = \ gauss_rle.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gauss_rle_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/gbr/Makefile.am b/plug-ins/gbr/Makefile.am index c84bb2c21b..7ffc84223b 100644 --- a/plug-ins/gbr/Makefile.am +++ b/plug-ins/gbr/Makefile.am @@ -8,20 +8,19 @@ gbr_SOURCES = \ gbr.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gbr_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/gee/Makefile.am b/plug-ins/gee/Makefile.am index 91d5f47c27..7175fc5428 100644 --- a/plug-ins/gee/Makefile.am +++ b/plug-ins/gee/Makefile.am @@ -8,20 +8,19 @@ gee_SOURCES = \ gee.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gee_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am index 4d7f3b06aa..14f6067e85 100644 --- a/plug-ins/gfig/Makefile.am +++ b/plug-ins/gfig/Makefile.am @@ -7,22 +7,23 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = gfig gfig_SOURCES = \ - gfig.c pix_data.h + gfig.c \ + pix_data.h INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gfig_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/gfig/gfig-examples/Makefile.am b/plug-ins/gfig/gfig-examples/Makefile.am index ed98896191..347c5e2345 100644 --- a/plug-ins/gfig/gfig-examples/Makefile.am +++ b/plug-ins/gfig/gfig-examples/Makefile.am @@ -14,9 +14,6 @@ gfigdata_DATA = \ star2 \ stars - - - EXTRA_DATA = EXTRA_DIST = $(gfigdata_DATA) diff --git a/plug-ins/gfli/Makefile.am b/plug-ins/gfli/Makefile.am index 1f955822c1..f3b1d5469d 100644 --- a/plug-ins/gfli/Makefile.am +++ b/plug-ins/gfli/Makefile.am @@ -5,25 +5,24 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = gfli gfli_SOURCES = \ - fli.h \ - fli.c \ - gfli.c + fli.h \ + fli.c \ + gfli.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gfli_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/gicon/Makefile.am b/plug-ins/gicon/Makefile.am index 4c48fdb334..06ac214cce 100644 --- a/plug-ins/gicon/Makefile.am +++ b/plug-ins/gicon/Makefile.am @@ -8,20 +8,19 @@ gicon_SOURCES = \ gicon.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gicon_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/gif/Makefile.am b/plug-ins/gif/Makefile.am index d9f7c851c0..bad667ae5f 100644 --- a/plug-ins/gif/Makefile.am +++ b/plug-ins/gif/Makefile.am @@ -8,20 +8,19 @@ gif_SOURCES = \ gif.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gif_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/glasstile/Makefile.am b/plug-ins/glasstile/Makefile.am index c7e2882e83..0f47df2ada 100644 --- a/plug-ins/glasstile/Makefile.am +++ b/plug-ins/glasstile/Makefile.am @@ -8,20 +8,19 @@ glasstile_SOURCES = \ glasstile.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la glasstile_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/gpc/Makefile.am b/plug-ins/gpc/Makefile.am index 2ddd71559a..5c69279093 100644 --- a/plug-ins/gpc/Makefile.am +++ b/plug-ins/gpc/Makefile.am @@ -5,22 +5,23 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_LIBRARIES = libgpc.a libgpc_a_SOURCES = \ - gpc.c gpc.h + gpc.c \ + gpc.h INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la libgpc_aDEPENDENCIES = $(DEPS) @@ -40,4 +41,3 @@ files: echo $$subdir/$$file; \ done; \ done - diff --git a/plug-ins/gqbist/Makefile.am b/plug-ins/gqbist/Makefile.am index deb0867935..35d03559bb 100644 --- a/plug-ins/gqbist/Makefile.am +++ b/plug-ins/gqbist/Makefile.am @@ -8,20 +8,19 @@ gqbist_SOURCES = \ gqbist.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gqbist_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/gradmap/Makefile.am b/plug-ins/gradmap/Makefile.am index e38a0ed86c..c394c50e14 100644 --- a/plug-ins/gradmap/Makefile.am +++ b/plug-ins/gradmap/Makefile.am @@ -8,20 +8,19 @@ gradmap_SOURCES = \ gradmap.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gradmap_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/grid/Makefile.am b/plug-ins/grid/Makefile.am index ac78a6d57d..db82253b53 100644 --- a/plug-ins/grid/Makefile.am +++ b/plug-ins/grid/Makefile.am @@ -8,20 +8,19 @@ grid_SOURCES = \ grid.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la grid_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/gtm/Makefile.am b/plug-ins/gtm/Makefile.am index 859c37a540..b104355c7f 100644 --- a/plug-ins/gtm/Makefile.am +++ b/plug-ins/gtm/Makefile.am @@ -8,20 +8,19 @@ gtm_SOURCES = \ gtm.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gtm_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/gz/Makefile.am b/plug-ins/gz/Makefile.am index 62bb232464..334204cdc7 100644 --- a/plug-ins/gz/Makefile.am +++ b/plug-ins/gz/Makefile.am @@ -8,20 +8,19 @@ gz_SOURCES = \ gz.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la gz_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/header/Makefile.am b/plug-ins/header/Makefile.am index a99d03596a..ec361a26fb 100644 --- a/plug-ins/header/Makefile.am +++ b/plug-ins/header/Makefile.am @@ -8,20 +8,19 @@ header_SOURCES = \ header.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la header_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/hot/Makefile.am b/plug-ins/hot/Makefile.am index 04b9165f90..1382b93748 100644 --- a/plug-ins/hot/Makefile.am +++ b/plug-ins/hot/Makefile.am @@ -5,24 +5,25 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = hot hot_SOURCES = \ - hot.c $(top_srcdir)/plug-ins/megawidget/megawidget.h + $(top_srcdir)/plug-ins/megawidget/megawidget.h \ + hot.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a hot_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/hrz/Makefile.am b/plug-ins/hrz/Makefile.am index f9aac1453e..f6979b54e7 100644 --- a/plug-ins/hrz/Makefile.am +++ b/plug-ins/hrz/Makefile.am @@ -8,20 +8,19 @@ hrz_SOURCES = \ hrz.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la hrz_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/ifscompose/Makefile.am b/plug-ins/ifscompose/Makefile.am index 7f24b47a01..be7f33c9c4 100644 --- a/plug-ins/ifscompose/Makefile.am +++ b/plug-ins/ifscompose/Makefile.am @@ -5,23 +5,24 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = ifscompose ifscompose_SOURCES = \ - ifscompose.c ifscompose.h ifscompose_utils.c + ifscompose.c \ + ifscompose.h \ + ifscompose_utils.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la ifscompose_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/illusion/Makefile.am b/plug-ins/illusion/Makefile.am index 9613ec74c9..7326ed211e 100644 --- a/plug-ins/illusion/Makefile.am +++ b/plug-ins/illusion/Makefile.am @@ -8,20 +8,19 @@ illusion_SOURCES = \ illusion.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la illusion_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/iwarp/Makefile.am b/plug-ins/iwarp/Makefile.am index 416ef32e7a..e1ddc5f20c 100644 --- a/plug-ins/iwarp/Makefile.am +++ b/plug-ins/iwarp/Makefile.am @@ -8,20 +8,19 @@ iwarp_SOURCES = \ iwarp.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la iwarp_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/jpeg/Makefile.am b/plug-ins/jpeg/Makefile.am index 6f28cdf519..d43e65c688 100644 --- a/plug-ins/jpeg/Makefile.am +++ b/plug-ins/jpeg/Makefile.am @@ -8,20 +8,20 @@ jpeg_SOURCES = \ jpeg.c INCLUDES = \ - $(X_CFLAGS) \ + $(GTK_CFLAGS) \ -I$(top_srcdir) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBJPEG_LIB@ \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ + @LIBJPEG_LIB@ \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la jpeg_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/laplace/Makefile.am b/plug-ins/laplace/Makefile.am index cd56232f4b..42509d231b 100644 --- a/plug-ins/laplace/Makefile.am +++ b/plug-ins/laplace/Makefile.am @@ -8,20 +8,19 @@ laplace_SOURCES = \ laplace.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la laplace_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/libgck/Makefile.am b/plug-ins/libgck/Makefile.am index 1f255540b6..e4a772d160 100644 --- a/plug-ins/libgck/Makefile.am +++ b/plug-ins/libgck/Makefile.am @@ -3,7 +3,15 @@ SRC_SUBDIRS = gck SUBDIRS = gck -EXTRA_DIST = TODO +EXTRA_DIST = \ + TODO \ + docs/html/gck.html \ + docs/html/gck_application_window.html \ + docs/html/gck_dialog_window.html \ + docs/html/gckcolor.html \ + docs/html/gckmath.html \ + docs/html/gckui.html \ + docs/html/gckvector.html .PHONY: files @@ -17,4 +25,3 @@ files: echo $$subdir/$$file; \ done; \ done - diff --git a/plug-ins/libgck/gck/Makefile.am b/plug-ins/libgck/gck/Makefile.am index 523ec32a4c..327793a352 100644 --- a/plug-ins/libgck/gck/Makefile.am +++ b/plug-ins/libgck/gck/Makefile.am @@ -2,33 +2,38 @@ gckincludedir = $(includedir)/gck -lib_LTLIBRARIES = libgck.la +lib_LTLIBRARIES = libgck-1.1.la -libgck_la_SOURCES = gckcolor.c \ - gcklistbox.c \ - gckmath.c \ - gckui.c \ - gckvector.c +libgck_1_1_la_SOURCES = \ + gckcolor.c \ + gcklistbox.c \ + gckmath.c \ + gckui.c \ + gckvector.c -gckinclude_HEADERS = gck.h \ - gckcolor.h \ - gckcommon.h \ - gckimage.h \ - gcklistbox.h \ - gckmath.h \ - gcktypes.h \ - gckui.h \ - gckvector.h +gckinclude_HEADERS = \ + gck.h \ + gckcolor.h \ + gckcommon.h \ + gckimage.h \ + gcklistbox.h \ + gckmath.h \ + gcktypes.h \ + gckui.h \ + gckvector.h -libgck_la_LDFLAGS = -version-info 1:0:0 +libgck_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) INCLUDES = \ -I.. \ -I$(srcdir)/.. \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) +LIBADD = \ + $(GTK_LIBS) + .PHONY: files files: diff --git a/plug-ins/mail/Makefile.am b/plug-ins/mail/Makefile.am index 9077a7ce07..b166513953 100644 --- a/plug-ins/mail/Makefile.am +++ b/plug-ins/mail/Makefile.am @@ -11,20 +11,19 @@ CPPFLAGS = \ @MAILER@ INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la mail_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/max_rgb/Makefile.am b/plug-ins/max_rgb/Makefile.am index 3a029642b8..3719d897bd 100644 --- a/plug-ins/max_rgb/Makefile.am +++ b/plug-ins/max_rgb/Makefile.am @@ -8,20 +8,19 @@ max_rgb_SOURCES = \ max_rgb.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la max_rgb_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/maze/Makefile.am b/plug-ins/maze/Makefile.am index 3febfed557..a648e9e536 100644 --- a/plug-ins/maze/Makefile.am +++ b/plug-ins/maze/Makefile.am @@ -5,23 +5,26 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = maze maze_SOURCES = \ - maze.c maze.h maze_face.c algorithms.c handy.c + algorithms.c \ + handy.c \ + maze.c \ + maze.h \ + maze_face.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la maze_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/mblur/Makefile.am b/plug-ins/mblur/Makefile.am index d69489436f..6e47aaad90 100644 --- a/plug-ins/mblur/Makefile.am +++ b/plug-ins/mblur/Makefile.am @@ -8,20 +8,19 @@ mblur_SOURCES = \ mblur.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la mblur_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/megawidget/Makefile.am b/plug-ins/megawidget/Makefile.am index ec254ab26e..62782eb3a2 100644 --- a/plug-ins/megawidget/Makefile.am +++ b/plug-ins/megawidget/Makefile.am @@ -5,24 +5,25 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_LIBRARIES = libmegawidget.a libmegawidget_a_SOURCES = \ - megawidget.c megawidget.h + megawidget.c \ + megawidget.h INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la -libmegawidget_aDEPENDENCIES = $(DEPS) +libmegawidget_a_DEPENDENCIES = $(DEPS) .PHONY: files diff --git a/plug-ins/mosaic/Makefile.am b/plug-ins/mosaic/Makefile.am index ef2c3ae956..82e77f4e34 100644 --- a/plug-ins/mosaic/Makefile.am +++ b/plug-ins/mosaic/Makefile.am @@ -5,23 +5,23 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = mosaic mosaic_SOURCES = \ - mosaic.c mosaic_logo.h + mosaic.c \ + mosaic_logo.h INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la mosaic_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/mpeg/Makefile.am b/plug-ins/mpeg/Makefile.am index 0e9fec9339..e3c28ba1f2 100644 --- a/plug-ins/mpeg/Makefile.am +++ b/plug-ins/mpeg/Makefile.am @@ -8,20 +8,20 @@ mpeg_SOURCES = \ mpeg.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBMPEG_LIB@ \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ + @LIBMPEG_LIB@ \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la mpeg_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/nlfilt/Makefile.am b/plug-ins/nlfilt/Makefile.am index cd053303be..cd969c2f50 100644 --- a/plug-ins/nlfilt/Makefile.am +++ b/plug-ins/nlfilt/Makefile.am @@ -5,24 +5,25 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = nlfilt nlfilt_SOURCES = \ - nlfilt.c $(top_srcdir)/plug-ins/megawidget/megawidget.h + $(top_srcdir)/plug-ins/megawidget/megawidget.h \ + nlfilt.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a nlfilt_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/noisify/Makefile.am b/plug-ins/noisify/Makefile.am index ce173f3234..1406a1f9e5 100644 --- a/plug-ins/noisify/Makefile.am +++ b/plug-ins/noisify/Makefile.am @@ -8,20 +8,19 @@ noisify_SOURCES = \ noisify.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la noisify_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/normalize/Makefile.am b/plug-ins/normalize/Makefile.am index 9f887f674a..b2549726c5 100644 --- a/plug-ins/normalize/Makefile.am +++ b/plug-ins/normalize/Makefile.am @@ -8,20 +8,19 @@ normalize_SOURCES = \ normalize.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la normalize_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/nova/Makefile.am b/plug-ins/nova/Makefile.am index 89a35d0184..59f39e1915 100644 --- a/plug-ins/nova/Makefile.am +++ b/plug-ins/nova/Makefile.am @@ -8,20 +8,19 @@ nova_SOURCES = \ nova.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la nova_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/oilify/Makefile.am b/plug-ins/oilify/Makefile.am index 35532f6582..18d136d04f 100644 --- a/plug-ins/oilify/Makefile.am +++ b/plug-ins/oilify/Makefile.am @@ -8,20 +8,19 @@ oilify_SOURCES = \ oilify.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la oilify_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/pagecurl/Makefile.am b/plug-ins/pagecurl/Makefile.am index a3620f07a3..bd66e6e405 100644 --- a/plug-ins/pagecurl/Makefile.am +++ b/plug-ins/pagecurl/Makefile.am @@ -5,22 +5,30 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = pagecurl pagecurl_SOURCES = \ - pagecurl.c curl0.xpm curl1.xpm curl2.xpm curl3.xpm curl4.xpm curl5.xpm curl6.xpm curl7.xpm + pagecurl.c \ + curl0.xpm \ + curl1.xpm \ + curl2.xpm \ + curl3.xpm \ + curl4.xpm \ + curl5.xpm \ + curl6.xpm \ + curl7.xpm INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la pagecurl_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/palette/Makefile.am b/plug-ins/palette/Makefile.am index 6622be2049..54e2d46d44 100644 --- a/plug-ins/palette/Makefile.am +++ b/plug-ins/palette/Makefile.am @@ -8,20 +8,19 @@ palette_SOURCES = \ palette.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la palette_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/papertile/Makefile.am b/plug-ins/papertile/Makefile.am index 94f02bd8ec..c48d42c0f2 100644 --- a/plug-ins/papertile/Makefile.am +++ b/plug-ins/papertile/Makefile.am @@ -8,20 +8,19 @@ papertile_SOURCES = \ papertile.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la papertile_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/pat/Makefile.am b/plug-ins/pat/Makefile.am index a8204137bd..9a38cb84fb 100644 --- a/plug-ins/pat/Makefile.am +++ b/plug-ins/pat/Makefile.am @@ -8,20 +8,19 @@ pat_SOURCES = \ pat.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la pat_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/pcx/Makefile.am b/plug-ins/pcx/Makefile.am index 3aea254dc8..0450bb49e7 100644 --- a/plug-ins/pcx/Makefile.am +++ b/plug-ins/pcx/Makefile.am @@ -8,20 +8,19 @@ pcx_SOURCES = \ pcx.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la pcx_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/pix/Makefile.am b/plug-ins/pix/Makefile.am index 2d29cd146f..8a077c81f5 100644 --- a/plug-ins/pix/Makefile.am +++ b/plug-ins/pix/Makefile.am @@ -8,20 +8,19 @@ pix_SOURCES = \ pix.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la pix_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/pixelize/Makefile.am b/plug-ins/pixelize/Makefile.am index 33d3490ac0..bae1ab3bc5 100644 --- a/plug-ins/pixelize/Makefile.am +++ b/plug-ins/pixelize/Makefile.am @@ -8,20 +8,19 @@ pixelize_SOURCES = \ pixelize.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la pixelize_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/plasma/Makefile.am b/plug-ins/plasma/Makefile.am index e0f166a623..6067a66bc9 100644 --- a/plug-ins/plasma/Makefile.am +++ b/plug-ins/plasma/Makefile.am @@ -8,20 +8,19 @@ plasma_SOURCES = \ plasma.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la plasma_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/png/Makefile.am b/plug-ins/png/Makefile.am index 6cfbba0357..2e4ee8e2f8 100644 --- a/plug-ins/png/Makefile.am +++ b/plug-ins/png/Makefile.am @@ -8,20 +8,20 @@ png_SOURCES = \ png.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBPNG_LIB@ \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ + @LIBPNG_LIB@ \ -lc -lm DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la png_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/pnm/Makefile.am b/plug-ins/pnm/Makefile.am index c17e60b770..40f923e414 100644 --- a/plug-ins/pnm/Makefile.am +++ b/plug-ins/pnm/Makefile.am @@ -8,20 +8,19 @@ pnm_SOURCES = \ pnm.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la pnm_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/polar/Makefile.am b/plug-ins/polar/Makefile.am index c1c96a0412..eff481cd85 100644 --- a/plug-ins/polar/Makefile.am +++ b/plug-ins/polar/Makefile.am @@ -8,20 +8,19 @@ polar_SOURCES = \ polar.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la polar_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/print/Makefile.am b/plug-ins/print/Makefile.am index a30a4be2d9..350d071122 100644 --- a/plug-ins/print/Makefile.am +++ b/plug-ins/print/Makefile.am @@ -5,7 +5,12 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = print print_SOURCES = \ - print-escp2.c print-pcl.c print-ps.c print-util.c print.c print.h + print-escp2.c \ + print-pcl.c \ + print-ps.c \ + print-util.c \ + print.c \ + print.h CPPFLAGS = \ @LP_DEF@ \ @@ -14,20 +19,19 @@ CPPFLAGS = \ @LPC_DEF@ INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la print_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/ps/Makefile.am b/plug-ins/ps/Makefile.am index d4e3489d25..ddbbb70798 100644 --- a/plug-ins/ps/Makefile.am +++ b/plug-ins/ps/Makefile.am @@ -8,20 +8,19 @@ ps_SOURCES = \ ps.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la ps_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/psd/Makefile.am b/plug-ins/psd/Makefile.am index f8a6632256..3a7eed9990 100644 --- a/plug-ins/psd/Makefile.am +++ b/plug-ins/psd/Makefile.am @@ -8,20 +8,19 @@ psd_SOURCES = \ psd.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la psd_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/randomize/Makefile.am b/plug-ins/randomize/Makefile.am index f4ced759a1..51d49a442b 100644 --- a/plug-ins/randomize/Makefile.am +++ b/plug-ins/randomize/Makefile.am @@ -5,24 +5,25 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = randomize randomize_SOURCES = \ - randomize.c $(top_srcdir)/plug-ins/gpc/gpc.h + $(top_srcdir)/plug-ins/gpc/gpc.h \ + randomize.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/plug-ins/gpc/libgpc.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/plug-ins/gpc/libgpc.a \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/gpc/libgpc.a \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(top_builddir)/plug-ins/gpc/libgpc.a randomize_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/ripple/Makefile.am b/plug-ins/ripple/Makefile.am index 25ee77565e..fee57eac74 100644 --- a/plug-ins/ripple/Makefile.am +++ b/plug-ins/ripple/Makefile.am @@ -8,20 +8,19 @@ ripple_SOURCES = \ ripple.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la ripple_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/rotate/Makefile.am b/plug-ins/rotate/Makefile.am index 1b7f3d98d7..90cfba0a1c 100644 --- a/plug-ins/rotate/Makefile.am +++ b/plug-ins/rotate/Makefile.am @@ -8,20 +8,19 @@ rotate_SOURCES = \ rotate.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la rotate_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/rotators/Makefile.am b/plug-ins/rotators/Makefile.am index 26d85a1e59..9118f43892 100644 --- a/plug-ins/rotators/Makefile.am +++ b/plug-ins/rotators/Makefile.am @@ -8,20 +8,19 @@ rotators_SOURCES = \ rotators.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la rotators_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/scatter_hsv/Makefile.am b/plug-ins/scatter_hsv/Makefile.am index d68004cd34..979b3a7fbf 100644 --- a/plug-ins/scatter_hsv/Makefile.am +++ b/plug-ins/scatter_hsv/Makefile.am @@ -8,20 +8,19 @@ scatter_hsv_SOURCES = \ scatter_hsv.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la scatter_hsv_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/screenshot/Makefile.am b/plug-ins/screenshot/Makefile.am index 287e8fa8a6..c192e27723 100644 --- a/plug-ins/screenshot/Makefile.am +++ b/plug-ins/screenshot/Makefile.am @@ -8,20 +8,19 @@ screenshot_SOURCES = \ screenshot.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la screenshot_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am index 7989d63fdd..ba8244a750 100644 --- a/plug-ins/script-fu/Makefile.am +++ b/plug-ins/script-fu/Makefile.am @@ -29,21 +29,21 @@ script_fu_SOURCES = \ regex.c INCLUDES = \ - $(X_CFLAGS) \ + $(GTK_CFLAGS) \ -I$(top_srcdir) \ -I$(includedir) LDADD = \ $(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o script_fu_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/semiflatten/Makefile.am b/plug-ins/semiflatten/Makefile.am index 4f7d8a860d..2255183b29 100644 --- a/plug-ins/semiflatten/Makefile.am +++ b/plug-ins/semiflatten/Makefile.am @@ -8,20 +8,19 @@ semiflatten_SOURCES = \ semiflatten.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la semiflatten_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/sgi/Makefile.am b/plug-ins/sgi/Makefile.am index a048b6d782..6273e34731 100644 --- a/plug-ins/sgi/Makefile.am +++ b/plug-ins/sgi/Makefile.am @@ -5,23 +5,24 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = sgi sgi_SOURCES = \ - sgi.c sgi.h sgilib.c + sgi.c \ + sgi.h \ + sgilib.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la sgi_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/sharpen/Makefile.am b/plug-ins/sharpen/Makefile.am index 2d62c7f8c0..064cfb3332 100644 --- a/plug-ins/sharpen/Makefile.am +++ b/plug-ins/sharpen/Makefile.am @@ -8,20 +8,19 @@ sharpen_SOURCES = \ sharpen.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la sharpen_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/shift/Makefile.am b/plug-ins/shift/Makefile.am index 5d6dcc9c2a..188d1a2c1c 100644 --- a/plug-ins/shift/Makefile.am +++ b/plug-ins/shift/Makefile.am @@ -8,20 +8,19 @@ shift_SOURCES = \ shift.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la shift_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/sinus/Makefile.am b/plug-ins/sinus/Makefile.am index 1ab5fe8d4c..3a4640bc80 100644 --- a/plug-ins/sinus/Makefile.am +++ b/plug-ins/sinus/Makefile.am @@ -5,24 +5,26 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = sinus sinus_SOURCES = \ - sinus.c sinus_logo.h $(top_srcdir)/plug-ins/megawidget/megawidget.h + $(top_srcdir)/plug-ins/megawidget/megawidget.h \ + sinus.c \ + sinus_logo.h INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a sinus_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/smooth_palette/Makefile.am b/plug-ins/smooth_palette/Makefile.am index 2d40bafc17..a8126cb9a3 100644 --- a/plug-ins/smooth_palette/Makefile.am +++ b/plug-ins/smooth_palette/Makefile.am @@ -8,20 +8,19 @@ smooth_palette_SOURCES = \ smooth_palette.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la smooth_palette_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/snoise/Makefile.am b/plug-ins/snoise/Makefile.am index 850a20701a..16c354e46b 100644 --- a/plug-ins/snoise/Makefile.am +++ b/plug-ins/snoise/Makefile.am @@ -8,20 +8,19 @@ snoise_SOURCES = \ snoise.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la snoise_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/snp/Makefile.am b/plug-ins/snp/Makefile.am index c1a7cdad17..c7636ee37b 100644 --- a/plug-ins/snp/Makefile.am +++ b/plug-ins/snp/Makefile.am @@ -8,20 +8,19 @@ snp_SOURCES = \ snp.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la snp_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/sobel/Makefile.am b/plug-ins/sobel/Makefile.am index da6af860d9..3b555f7a92 100644 --- a/plug-ins/sobel/Makefile.am +++ b/plug-ins/sobel/Makefile.am @@ -8,20 +8,19 @@ sobel_SOURCES = \ sobel.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la sobel_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/sparkle/Makefile.am b/plug-ins/sparkle/Makefile.am index a1c56939b2..9f002474fb 100644 --- a/plug-ins/sparkle/Makefile.am +++ b/plug-ins/sparkle/Makefile.am @@ -8,20 +8,19 @@ sparkle_SOURCES = \ sparkle.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la sparkle_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/spread/Makefile.am b/plug-ins/spread/Makefile.am index 55760947c4..94395408a5 100644 --- a/plug-ins/spread/Makefile.am +++ b/plug-ins/spread/Makefile.am @@ -8,20 +8,19 @@ spread_SOURCES = \ spread.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la spread_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/struc/Makefile.am b/plug-ins/struc/Makefile.am index ada499392d..9fcce8b9e7 100644 --- a/plug-ins/struc/Makefile.am +++ b/plug-ins/struc/Makefile.am @@ -5,22 +5,23 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = struc struc_SOURCES = \ - struc.c struc.h + struc.c \ + struc.h INCLUDES = \ - $(X_CFLAGS) \ + $(GTK_CFLAGS) \ -I$(top_srcdir) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la struc_DEPENDENCIES = $(DEPS) @@ -36,8 +37,3 @@ files: echo $$subdir/$$file; \ done; \ done - - - - - diff --git a/plug-ins/sunras/Makefile.am b/plug-ins/sunras/Makefile.am index 96d36622fa..c4e9a36d33 100644 --- a/plug-ins/sunras/Makefile.am +++ b/plug-ins/sunras/Makefile.am @@ -8,20 +8,19 @@ sunras_SOURCES = \ sunras.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la sunras_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/tga/Makefile.am b/plug-ins/tga/Makefile.am index cb00021d66..1865c35a37 100644 --- a/plug-ins/tga/Makefile.am +++ b/plug-ins/tga/Makefile.am @@ -8,20 +8,19 @@ tga_SOURCES = \ tga.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la tga_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/threshold_alpha/Makefile.am b/plug-ins/threshold_alpha/Makefile.am index 1be688d28a..55650db7ea 100644 --- a/plug-ins/threshold_alpha/Makefile.am +++ b/plug-ins/threshold_alpha/Makefile.am @@ -8,20 +8,19 @@ threshold_alpha_SOURCES = \ threshold_alpha.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la threshold_alpha_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/tiff/Makefile.am b/plug-ins/tiff/Makefile.am index 39b0db408d..b6e1074d59 100644 --- a/plug-ins/tiff/Makefile.am +++ b/plug-ins/tiff/Makefile.am @@ -8,20 +8,20 @@ tiff_SOURCES = \ tiff.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBTIFF_LIB@ \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ + @LIBTIFF_LIB@ \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la tiff_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/tile/Makefile.am b/plug-ins/tile/Makefile.am index 15372bcdcd..67ad6a4201 100644 --- a/plug-ins/tile/Makefile.am +++ b/plug-ins/tile/Makefile.am @@ -8,20 +8,19 @@ tile_SOURCES = \ tile.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la tile_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/tileit/Makefile.am b/plug-ins/tileit/Makefile.am index 1455a4565c..4df88da53f 100644 --- a/plug-ins/tileit/Makefile.am +++ b/plug-ins/tileit/Makefile.am @@ -8,20 +8,19 @@ tileit_SOURCES = \ tileit.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la tileit_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/tiler/Makefile.am b/plug-ins/tiler/Makefile.am index 39d9862f4f..5bf6a7f735 100644 --- a/plug-ins/tiler/Makefile.am +++ b/plug-ins/tiler/Makefile.am @@ -8,20 +8,19 @@ tiler_SOURCES = \ tiler.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la tiler_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/url/Makefile.am b/plug-ins/url/Makefile.am index 62227d92f8..a4731a3700 100644 --- a/plug-ins/url/Makefile.am +++ b/plug-ins/url/Makefile.am @@ -8,20 +8,19 @@ url_SOURCES = \ url.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la url_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/video/Makefile.am b/plug-ins/video/Makefile.am index 8221c9bec0..729e8e4197 100644 --- a/plug-ins/video/Makefile.am +++ b/plug-ins/video/Makefile.am @@ -8,20 +8,19 @@ video_SOURCES = \ video.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la video_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/vinvert/Makefile.am b/plug-ins/vinvert/Makefile.am index 9edb849e4a..2f2ee98504 100644 --- a/plug-ins/vinvert/Makefile.am +++ b/plug-ins/vinvert/Makefile.am @@ -8,20 +8,19 @@ vinvert_SOURCES = \ vinvert.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la vinvert_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/vpropagate/Makefile.am b/plug-ins/vpropagate/Makefile.am index 6ada528817..54e872d9f1 100644 --- a/plug-ins/vpropagate/Makefile.am +++ b/plug-ins/vpropagate/Makefile.am @@ -8,20 +8,19 @@ vpropagate_SOURCES = \ vpropagate.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la vpropagate_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/waves/Makefile.am b/plug-ins/waves/Makefile.am index e775f426eb..3c47e1ccdb 100644 --- a/plug-ins/waves/Makefile.am +++ b/plug-ins/waves/Makefile.am @@ -5,24 +5,25 @@ pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = waves waves_SOURCES = \ - waves.c $(top_srcdir)/plug-ins/megawidget/megawidget.h + $(top_srcdir)/plug-ins/megawidget/megawidget.h \ + waves.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a waves_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/webbrowser/Makefile.am b/plug-ins/webbrowser/Makefile.am index 791f186589..857b83eda1 100644 --- a/plug-ins/webbrowser/Makefile.am +++ b/plug-ins/webbrowser/Makefile.am @@ -12,20 +12,20 @@ webbrowser_SOURCES = \ webbrowser.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBXMU_LIB@ \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ + @LIBXMU_LIB@ \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la webbrowser_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/whirlpinch/Makefile.am b/plug-ins/whirlpinch/Makefile.am index 55fbd97842..ab192af23b 100644 --- a/plug-ins/whirlpinch/Makefile.am +++ b/plug-ins/whirlpinch/Makefile.am @@ -8,20 +8,19 @@ whirlpinch_SOURCES = \ whirlpinch.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la whirlpinch_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/xd/Makefile.am b/plug-ins/xd/Makefile.am index 80e6b780c0..fe9c6672b1 100644 --- a/plug-ins/xd/Makefile.am +++ b/plug-ins/xd/Makefile.am @@ -8,20 +8,20 @@ xd_SOURCES = \ xd.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBXDELTA_LIB@ \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ + @LIBXDELTA_LIB@ \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la xd_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/xpm/Makefile.am b/plug-ins/xpm/Makefile.am index 2ff6a80e47..70f4c0f0c9 100644 --- a/plug-ins/xpm/Makefile.am +++ b/plug-ins/xpm/Makefile.am @@ -8,20 +8,20 @@ xpm_SOURCES = \ xpm.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - @LIBXPM_LIB@ \ - $(X_LIBS) \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ + @LIBXPM_LIB@ \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la xpm_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/xwd/Makefile.am b/plug-ins/xwd/Makefile.am index c21ff38f6d..9801a81fd4 100644 --- a/plug-ins/xwd/Makefile.am +++ b/plug-ins/xwd/Makefile.am @@ -8,20 +8,19 @@ xwd_SOURCES = \ xwd.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la xwd_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/zealouscrop/Makefile.am b/plug-ins/zealouscrop/Makefile.am index 263b790b8b..6b4ba0cb64 100644 --- a/plug-ins/zealouscrop/Makefile.am +++ b/plug-ins/zealouscrop/Makefile.am @@ -8,20 +8,19 @@ zealouscrop_SOURCES = \ zealouscrop.c INCLUDES = \ - $(X_CFLAGS) \ -I$(top_srcdir) \ + $(GTK_CFLAGS) \ -I$(includedir) LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - \ + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la \ + $(GTK_LIBS) \ -lc DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la + $(top_builddir)/libgimp/libgimpui-@LT_RELEASE@.la \ + $(top_builddir)/libgimp/libgimp-@LT_RELEASE@.la zealouscrop_DEPENDENCIES = $(DEPS)