diff --git a/ChangeLog b/ChangeLog index fe9acc28f6..eea52db4e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jun 23 17:55:58 PDT 1999 Manish Singh + + * more makefile fixes + Wed Jun 23 23:52:54 BST 1999 Andy Thomas * gimp/app/gimppreviewcache.c diff --git a/app/Makefile.am b/app/Makefile.am index 0f61705d54..0bcade47a1 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -421,12 +421,6 @@ gimp_LDADD = \ $(GIMP_MP_LIBS) \ $(INTLLIBS) -DEPS = \ - libgimpim.a \ - $(top_builddir)/libgimp/libgimpi.a - -gimp_DEPENDENCIES = $(DEPS) - .PHONY: files files: diff --git a/configure.in b/configure.in index 7106a5bc59..3387ab7dcd 100644 --- a/configure.in +++ b/configure.in @@ -171,46 +171,46 @@ LDFLAGS="$LDFLAGS `echo $GTK_LIBS | sed 's/\(.*\)\(-lgtk.*\)/\1/'`" LIBS="$LIBS $GTK_LIBS" dnl Test for Xmu - if test -z "$LIBXMU_LIB"; then + if test -z "$LIBXMU"; then AC_CHECK_LIB(Xmu, XmuClientWindow, AC_CHECK_HEADER(X11/Xmu/WinUtil.h, - WEBBROWSER="webbrowser"; LIBXMU_LIB='-lXmu -lXt -lSM -lICE', + WEBBROWSER="webbrowser"; LIBXMU='-lXmu -lXt -lSM -lICE', AC_MSG_WARN(*** webbrowser plug-in will not be built (XMU header file not found) ***)), AC_CHECK_LIB(Xmu, XmuUpdateMapHints, AC_CHECK_HEADER(X11/Xmu/WinUtil.h, - WEBBROWSER="webbrowser"; LIBXMU_LIB='-lXmu -lXt', + WEBBROWSER="webbrowser"; LIBXMU='-lXmu -lXt', AC_MSG_WARN(*** webbrowser plug-in will not be built (XMU header file not found) ***)), AC_MSG_WARN(*** webbrowser plug-in will not be built (XMU library not found) ***), -lXt), -lXt -lSM -lICE) fi dnl Test for libaa - if test -z "$LIBAA_LIB"; then + if test -z "$LIBAA"; then AC_CHECK_LIB(aa, aa_printf, AC_CHECK_HEADER(aalib.h, - AA='aa'; LIBAA_LIB='-laa', + AA='aa'; LIBAA='-laa', AC_MSG_WARN(*** AA plug-in will not be built (AA header file not found) ***)), AC_MSG_WARN(*** AA plug-in will not be built (AA library not found) ***)) fi dnl Test for libtiff - if test -z "$LIBTIFF_LIB"; then + if test -z "$LIBTIFF"; then AC_CHECK_LIB(tiff, TIFFReadScanline, AC_CHECK_HEADER(tiffio.h, - TIFF='tiff'; LIBTIFF_LIB='-ltiff', + TIFF='tiff'; LIBTIFF='-ltiff', AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), AC_CHECK_LIB(tiff, TIFFWriteScanline, AC_CHECK_HEADER(tiffio.h, - TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz', + TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz', AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), AC_CHECK_LIB(tiff34, TIFFFlushData, AC_CHECK_HEADER(tiffio.h, - TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz', + TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz', AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)), AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm) fi dnl Test for libjpeg - if test -z "$LIBJPEG_LIB"; then + if test -z "$LIBJPEG"; then AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, jpeg_ok=yes, jpeg_ok=no @@ -227,7 +227,7 @@ dnl Test for libjpeg jpeg_ok=no) AC_MSG_RESULT($jpeg_ok) if test "$jpeg_ok" = yes; then - JPEG='jpeg'; XJT='xjt'; LIBJPEG_LIB='-ljpeg' + JPEG='jpeg'; XJT='xjt'; LIBJPEG='-ljpeg' AC_CHECK_LIB(jpeg, jpeg_simple_progression, AC_DEFINE(HAVE_PROGRESSIVE_JPEG), AC_MSG_WARN(JPEG library does not support progressive saving.)) @@ -239,7 +239,7 @@ dnl Test for libjpeg fi dnl Test for libpng - if test -z "$LIBPNG_LIB"; then + if test -z "$LIBPNG"; then AC_CHECK_LIB(png, png_read_info, AC_CHECK_HEADER(png.h, png_ok=yes, @@ -253,7 +253,7 @@ dnl Test for libpng png_ok=no) AC_MSG_RESULT($png_ok) if test "$png_ok" = yes; then - PNG='png'; LIBPNG_LIB='-lpng -lz' + PNG='png'; LIBPNG='-lpng -lz' else AC_MSG_WARN(*** PNG plug-in will not be built (PNG library is too old) ***) fi @@ -263,19 +263,19 @@ dnl Test for libpng fi dnl Test for libmpeg - if test -z "$LIBMPEG_LIB"; then + if test -z "$LIBMPEG"; then AC_CHECK_LIB(mpeg, GetMPEGFrame, AC_CHECK_HEADER(mpeg.h, - MPEG='mpeg'; LIBMPEG_LIB='-lmpeg', + MPEG='mpeg'; LIBMPEG='-lmpeg', AC_MSG_WARN(*** MPEG plug-in will not be built (MPEG header file not found) ***)), AC_MSG_WARN(*** MPEG plug-in will not be built (MPEG library not found) ***)) fi dnl Test for libXpm - if test -z "$LIBXPM_LIB"; then + if test -z "$LIBXPM"; then AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage, AC_CHECK_HEADER(X11/xpm.h, - XPM='xpm'; LIBXPM_LIB='-lXpm', + XPM='xpm'; LIBXPM='-lXpm', AC_MSG_WARN(*** XPM plug-in will not be built (XPM header file not found) ***)), AC_MSG_WARN(*** XPM plug-in will not be built (XPM library not found) ***), $X_LIBS) fi @@ -348,14 +348,14 @@ if test $gimp_ok = no; then fi dnl Check for random number functions -LIBUCB_LIB="" +LIBUCB="" AC_CHECK_FUNC(random, [ AC_DEFINE(RAND_FUNC, random) AC_DEFINE(SRAND_FUNC, srandom)], [AC_CHECK_LIB(ucb, random, [ AC_DEFINE(RAND_FUNC, random) AC_DEFINE(SRAND_FUNC, srandom) - LIBUCB_LIB='-lucb'], + LIBUCB='-lucb'], [AC_CHECK_FUNC(lrand48, [AC_DEFINE(RAND_FUNC, lrand48) AC_DEFINE(SRAND_FUNC, srand48)], [AC_DEFINE(RAND_FUNC, rand) AC_DEFINE(SRAND_FUNC, srand)])])]) @@ -581,21 +581,21 @@ AC_SUBST(gradientdata) AC_SUBST(palettedata) AC_SUBST(patterndata) AC_SUBST(WEBBROWSER) -AC_SUBST(LIBXMU_LIB) +AC_SUBST(LIBXMU) AC_SUBST(TIFF) -AC_SUBST(LIBTIFF_LIB) +AC_SUBST(LIBTIFF) AC_SUBST(JPEG) AC_SUBST(XJT) -AC_SUBST(LIBJPEG_LIB) +AC_SUBST(LIBJPEG) AC_SUBST(PNG) -AC_SUBST(LIBPNG_LIB) +AC_SUBST(LIBPNG) AC_SUBST(AA) -AC_SUBST(LIBAA_LIB) +AC_SUBST(LIBAA) AC_SUBST(MPEG) -AC_SUBST(LIBMPEG_LIB) +AC_SUBST(LIBMPEG) AC_SUBST(XPM) -AC_SUBST(LIBXPM_LIB) -AC_SUBST(LIBUCB_LIB) +AC_SUBST(LIBXPM) +AC_SUBST(LIBUCB) AC_SUBST(LP_DEF) AC_SUBST(LPSTAT_DEF) AC_SUBST(LPR_DEF) @@ -645,10 +645,6 @@ plug-ins/fits/Makefile plug-ins/flame/Makefile plug-ins/fp/Makefile plug-ins/gap/Makefile -plug-ins/gap/iter_ALT/Makefile -plug-ins/gap/iter_ALT/gen/Makefile -plug-ins/gap/iter_ALT/mod/Makefile -plug-ins/gap/iter_ALT/old/Makefile plug-ins/gdyntext/Makefile plug-ins/gfig/Makefile plug-ins/gfig/gfig-examples/Makefile diff --git a/plug-ins/AlienMap/INSTALL b/plug-ins/AlienMap/INSTALL deleted file mode 100644 index f4fc223940..0000000000 --- a/plug-ins/AlienMap/INSTALL +++ /dev/null @@ -1,94 +0,0 @@ -------------------------------------------- - GIMP-Plug-In -------------------------------------------- - Written by Daniel Cotting - Bahnhofstrasse 31 - CH-3066 Stettlen (Switzerland) - - cotting@mygale.org - www.mygale.org/~cotting -------------------------------------------- - Some code is taken out of other plug-ins - written by other authors. -------------------------------------------- - - -------------------------------------------- - INSTALLATION -------------------------------------------- - To install it, you have to edit the Make- - file (change install-path). Afterwards run - 'make'. This will compile and install the - plug-in in the right directory. Once the - new code is installed, you can run the GIMP - and enjoy the new functions and effects it - provides. -------------------------------------------- - - -------------------------------------------- - COLOR-CYCLING SCRIPT -------------------------------------------- - This version of the alienmap plug-in inclu- - des a script for color cycling animations. - It is recommended to start the alienmap - plug-in, to fiddle about with the parame- - ters until you have found optimal start va- - lues. Then put these values in the appro- - priate edit fields in the animation dialog. - Now you can change the values in the alien- - map plug-in to find interesting end values. - After you have inserted these new values in - the corresponding fields of the animation - script, you can start the calculation of - the animation. The script will create a new - picture with a layer for each animation - frame. With each new frame the start values - will gradually turn into the specified end - values, creating an amazing effect of color - cycling. -------------------------------------------- - - -------------------------------------------- - REDUCE CODE SIZE -------------------------------------------- - If you find that the plug-in binary is - too big, you can compress the executables - with the gzexe program (if it is avaiable - on your system). To do so, change to the - plug-in directory of the GIMP... - - cd /usr/local/lib/gimp/VERSION/plug-ins - - ...and execute the command... - - gzexe PLUGIN_NAME - - ...and remember to remove the uncompres- - sed binary, which has been renamed to - PLUGIN_NAME~, by running the command: - - rm PLUGIN_NAME~ - - This will result in a code size of about - 20 kB, which isn't too much IMHO. ------------------------------------------- - - ------------------------------------------- - FEEDBACK ------------------------------------------- - I'm interested in any feedback, comments, - bug-reports, suggestions etc. If you have - anything you would like to tell me, you - can write to cotting@mygale.org. - Also have a look at the GIMP-section of - my homepage at www.mygale.org/~cotting. ------------------------------------------- - - Thank you and happy GIMPing! - Daniel Cotting - ------------------------------------------- - \ No newline at end of file diff --git a/plug-ins/AlienMap/Makefile.am b/plug-ins/AlienMap/Makefile.am index 53ccc52583..57f6ad79b0 100644 --- a/plug-ins/AlienMap/Makefile.am +++ b/plug-ins/AlienMap/Makefile.am @@ -18,20 +18,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -AlienMap_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/AlienMap/README b/plug-ins/AlienMap/README deleted file mode 100644 index f4fc223940..0000000000 --- a/plug-ins/AlienMap/README +++ /dev/null @@ -1,94 +0,0 @@ -------------------------------------------- - GIMP-Plug-In -------------------------------------------- - Written by Daniel Cotting - Bahnhofstrasse 31 - CH-3066 Stettlen (Switzerland) - - cotting@mygale.org - www.mygale.org/~cotting -------------------------------------------- - Some code is taken out of other plug-ins - written by other authors. -------------------------------------------- - - -------------------------------------------- - INSTALLATION -------------------------------------------- - To install it, you have to edit the Make- - file (change install-path). Afterwards run - 'make'. This will compile and install the - plug-in in the right directory. Once the - new code is installed, you can run the GIMP - and enjoy the new functions and effects it - provides. -------------------------------------------- - - -------------------------------------------- - COLOR-CYCLING SCRIPT -------------------------------------------- - This version of the alienmap plug-in inclu- - des a script for color cycling animations. - It is recommended to start the alienmap - plug-in, to fiddle about with the parame- - ters until you have found optimal start va- - lues. Then put these values in the appro- - priate edit fields in the animation dialog. - Now you can change the values in the alien- - map plug-in to find interesting end values. - After you have inserted these new values in - the corresponding fields of the animation - script, you can start the calculation of - the animation. The script will create a new - picture with a layer for each animation - frame. With each new frame the start values - will gradually turn into the specified end - values, creating an amazing effect of color - cycling. -------------------------------------------- - - -------------------------------------------- - REDUCE CODE SIZE -------------------------------------------- - If you find that the plug-in binary is - too big, you can compress the executables - with the gzexe program (if it is avaiable - on your system). To do so, change to the - plug-in directory of the GIMP... - - cd /usr/local/lib/gimp/VERSION/plug-ins - - ...and execute the command... - - gzexe PLUGIN_NAME - - ...and remember to remove the uncompres- - sed binary, which has been renamed to - PLUGIN_NAME~, by running the command: - - rm PLUGIN_NAME~ - - This will result in a code size of about - 20 kB, which isn't too much IMHO. ------------------------------------------- - - ------------------------------------------- - FEEDBACK ------------------------------------------- - I'm interested in any feedback, comments, - bug-reports, suggestions etc. If you have - anything you would like to tell me, you - can write to cotting@mygale.org. - Also have a look at the GIMP-section of - my homepage at www.mygale.org/~cotting. ------------------------------------------- - - Thank you and happy GIMPing! - Daniel Cotting - ------------------------------------------- - \ No newline at end of file diff --git a/plug-ins/FractalExplorer/Makefile.am b/plug-ins/FractalExplorer/Makefile.am index 0330cb3285..0632f0c132 100644 --- a/plug-ins/FractalExplorer/Makefile.am +++ b/plug-ins/FractalExplorer/Makefile.am @@ -27,12 +27,6 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la - -FractalExplorer_DEPENDENCIES = $(DEPS) - .PHONY: files files: diff --git a/plug-ins/FractalExplorer/README b/plug-ins/FractalExplorer/README deleted file mode 100644 index 351970ec62..0000000000 --- a/plug-ins/FractalExplorer/README +++ /dev/null @@ -1,91 +0,0 @@ -------------------------------------------- - GIMP-Plug-In -------------------------------------------- - Written by Daniel Cotting - Quellenstrasse 10 - CH-8005 Zuerich (Switzerland) - - cotting@multimania.com - www.multimania.com/cotting -------------------------------------------- - Some code is taken out of other plug-ins - written by other authors. -------------------------------------------- - - Ported to GIMP 1.1 by - Michael Natterer - -------------------------------------------- - INSTALLATION -------------------------------------------- - To install it, you have to edit the - Makefile (change install-path). - Afterwards run make. This will compile - and install the plug-in in the right - directory. Once the new code is installed, - you can run the GIMP and enjoy the new - functions and effects it provides. - - Note that this plug-in has some sample - files which must be installed in one of - the following directories: - - ~/.gimp/fractalexplorer - /usr/share/gimp/fractalexplorer - - You can find the sample files in the - subdirectory fractalexplorer-examples - of this distribution. - - You will have to add the following lines - to your gimprc file (usually - /usr/share/gimp/gimprc): - - # fractalexplorer directory - (fractalexplorer-path "${gimp_data_dir}/fractalexplorer:${gimp_dir}/fractalexplorer") - -------------------------------------------- - - -------------------------------------------- - REDUCE CODE SIZE -------------------------------------------- - If you find that the plug-in is too big, - you can compress the executables with the - gzexe program (if it is avaiable on your - system). To do so, change to the plug-in - directory of the GIMP... - - cd /usr/lib/gimp/VERSION/plug-ins - - ...and execute the command... - - gzexe PLUGIN_NAME - - ...and remember to remove the uncompres- - sed binary, which has been renamed to - PLUGIN_NAME~, by running the command: - - rm PLUGIN_NAME~ - - This will result in a code size of about - 50 kB, which isn't too much IMHO. ------------------------------------------- - - ------------------------------------------- - FEEDBACK ------------------------------------------- - I'm interested in any feedback, comments, - bug-reports, suggestions etc. If you - have anything you would like to tell - me, you can write to cotting@multimania.com. - Also have a look at the GIMP-section of - my homepage at www.multimania.com/cotting. ------------------------------------------- - - Thank you and happy GIMPing! - Daniel Cotting - ------------------------------------------- - \ No newline at end of file diff --git a/plug-ins/Lighting/Makefile.am b/plug-ins/Lighting/Makefile.am index 3a17406b97..88b65b101c 100644 --- a/plug-ins/Lighting/Makefile.am +++ b/plug-ins/Lighting/Makefile.am @@ -45,22 +45,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(top_builddir)/plug-ins/libgck/gck/libgck.la - -Lighting_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am index 4e992f2934..48efe26f66 100644 --- a/plug-ins/Makefile.am +++ b/plug-ins/Makefile.am @@ -7,8 +7,6 @@ SUBDIRS = \ dbbrowser \ script-fu \ $(GIMP_PERL) \ - $(WEBBROWSER) \ - $(XJT) \ AlienMap \ FractalExplorer \ Lighting \ @@ -32,10 +30,10 @@ SUBDIRS = \ sinus \ struc \ unsharp \ + $(WEBBROWSER) \ + $(XJT) \ common -scriptdata = - .PHONY: files files: diff --git a/plug-ins/MapObject/Makefile.am b/plug-ins/MapObject/Makefile.am index e964a2c424..0e1e1fc6c8 100644 --- a/plug-ins/MapObject/Makefile.am +++ b/plug-ins/MapObject/Makefile.am @@ -44,22 +44,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(top_builddir)/plug-ins/libgck/gck/libgck.la - -MapObject_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/bmp/Makefile.am b/plug-ins/bmp/Makefile.am index 44a7348736..1feb9f5089 100644 --- a/plug-ins/bmp/Makefile.am +++ b/plug-ins/bmp/Makefile.am @@ -23,20 +23,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -bmp_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am index bc7d6099be..6ab8e1616e 100644 --- a/plug-ins/common/Makefile.am +++ b/plug-ins/common/Makefile.am @@ -9,127 +9,127 @@ INCLUDES = \ -I$(includedir) pluginlib_PROGRAMS = \ - CEL \ - CML_explorer \ - $(AA) \ - align_layers \ - animationplay \ - animoptimize \ - apply_lens \ - autocrop \ - autostretch_hsv \ - blinds \ - blur \ - borderaverage \ - bumpmap \ - bz2 \ - c_astretch \ - checkerboard \ - colorify \ - compose \ - convmatrix \ - cubism \ - decompose \ - deinterlace \ - depthmerge \ - despeckle \ - destripe \ - diffraction \ - displace \ - edge \ - emboss \ - engrave \ - exchange \ - film \ - flarefx \ - fractaltrace \ - gauss_iir \ - gauss_rle \ - gbr \ - gee \ - gicon \ - gif \ - gifload \ - glasstile \ - gqbist \ - gradmap \ - grid \ - gtm \ - guillotine \ - gz \ - header \ - hot \ - hrz \ - illusion \ - iwarp \ - jigsaw \ - $(JPEG) \ - laplace \ - lic \ - mail \ - mapcolor \ - max_rgb \ - mblur \ - $(MPEG) \ - newsprint \ - nlfilt \ - noisify \ - normalize \ - nova \ - oilify \ - palette \ - papertile \ - pat \ - pcx \ - pix \ - pixelize \ - plasma \ - plugindetails \ - $(PNG) \ - pnm \ - polar \ - ps \ - psd \ - randomize \ - ripple \ - rotate \ - rotators \ - scatter_hsv \ - screenshot \ - semiflatten \ - sharpen \ - shift \ - smooth_palette \ - snoise \ - sobel \ - sparkle \ - spread \ - sunras \ - tga \ - threshold_alpha \ - $(TIFF) \ - tile \ - tileit \ - tiler \ - url \ - video \ - vinvert \ - vpropagate \ - waves \ - whirlpinch \ - wind \ - wmf \ - xbm \ - $(XPM) \ - xwd \ + CEL \ + CML_explorer \ + $(AA) \ + align_layers \ + animationplay \ + animoptimize \ + apply_lens \ + autocrop \ + autostretch_hsv \ + blinds \ + blur \ + borderaverage \ + bumpmap \ + bz2 \ + c_astretch \ + checkerboard \ + colorify \ + compose \ + convmatrix \ + cubism \ + decompose \ + deinterlace \ + depthmerge \ + despeckle \ + destripe \ + diffraction \ + displace \ + edge \ + emboss \ + engrave \ + exchange \ + film \ + flarefx \ + fractaltrace \ + gauss_iir \ + gauss_rle \ + gbr \ + gee \ + gicon \ + gif \ + gifload \ + glasstile \ + gqbist \ + gradmap \ + grid \ + gtm \ + guillotine \ + gz \ + header \ + hot \ + hrz \ + illusion \ + iwarp \ + jigsaw \ + $(JPEG) \ + laplace \ + lic \ + mail \ + mapcolor \ + max_rgb \ + mblur \ + $(MPEG) \ + newsprint \ + nlfilt \ + noisify \ + normalize \ + nova \ + oilify \ + palette \ + papertile \ + pat \ + pcx \ + pix \ + pixelize \ + plasma \ + plugindetails \ + $(PNG) \ + pnm \ + polar \ + ps \ + psd \ + randomize \ + ripple \ + rotate \ + rotators \ + scatter_hsv \ + screenshot \ + semiflatten \ + sharpen \ + shift \ + smooth_palette \ + snoise \ + sobel \ + sparkle \ + spread \ + sunras \ + tga \ + threshold_alpha \ + $(TIFF) \ + tile \ + tileit \ + tiler \ + url \ + video \ + vinvert \ + vpropagate \ + waves \ + whirlpinch \ + wind \ + wmf \ + xbm \ + $(XPM) \ + xwd \ zealouscrop EXTRA_PROGRAMS = \ - aa \ - jpeg \ - mpeg \ - png \ - tiff \ + aa \ + jpeg \ + mpeg \ + png \ + tiff \ xpm CEL_SOURCES = \ @@ -153,7 +153,7 @@ aa_SOURCES = \ aa_LDADD = \ $(top_builddir)/libgimp/libgimp.la \ - $(LIBAA_LIB) \ + $(LIBAA) \ $(GTK_LIBS) \ $(INTLLIBS) @@ -580,7 +580,7 @@ jpeg_SOURCES = \ jpeg_LDADD = \ $(top_builddir)/libgimp/libgimp.la \ - $(LIBJPEG_LIB) \ + $(LIBJPEG) \ $(GTK_LIBS) \ $(INTLLIBS) @@ -638,7 +638,7 @@ mpeg_SOURCES = \ mpeg_LDADD = \ $(top_builddir)/libgimp/libgimp.la \ - $(LIBMPEG_LIB) \ + $(LIBMPEG) \ $(GTK_LIBS) \ $(INTLLIBS) @@ -760,7 +760,7 @@ png_SOURCES = \ png_LDADD = \ $(top_builddir)/libgimp/libgimp.la \ - $(LIBPNG_LIB) \ + $(LIBPNG) \ $(GTK_LIBS) \ $(INTLLIBS) @@ -938,7 +938,7 @@ tiff_SOURCES = \ tiff_LDADD = \ $(top_builddir)/libgimp/libgimp.la \ - $(LIBTIFF_LIB) \ + $(LIBTIFF) \ $(GTK_LIBS) \ $(INTLLIBS) @@ -1044,7 +1044,7 @@ xpm_SOURCES = \ xpm_LDADD = \ $(top_builddir)/libgimp/libgimp.la \ - $(LIBXPM_LIB) \ + $(LIBXPM) \ $(GTK_LIBS) \ $(INTLLIBS) diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl index b79d4b6ecb..b0d3684ca6 100755 --- a/plug-ins/common/mkgen.pl +++ b/plug-ins/common/mkgen.pl @@ -10,15 +10,16 @@ foreach (sort keys %plugins) { $bins .= "\t"; if (exists $plugins{$_}->{optional}) { $bins .= "\$(\U$_\E)"; - $opts .= "\t$_\t\t\\\n"; + $opts .= "\t$_ \\\n"; } else { $bins .= $_; } - $bins .= "\t\t\\\n"; + $bins .= " \\\n"; } -foreach ($bins, $opts) { s/\t\t\\\n$//s } + +foreach ($bins, $opts) { s/ \\\n$//s } print MK <{optional}) { - $optlib = "\n\t\$(LIB\U$_\E_LIB)\t\\"; + $optlib = "\n\t\$(LIB\U$_\E)\t\\"; } if (exists $plugins{$_}->{libsupp}) { diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl index 0f0726451a..484f32a97b 100644 --- a/plug-ins/common/plugin-defs.pl +++ b/plug-ins/common/plugin-defs.pl @@ -94,7 +94,6 @@ 'sobel' => { libdep => 'gtk' }, 'sparkle' => { libdep => 'gtk' }, 'spread' => { libdep => 'gtk' }, - 'struc' => { libdep => 'gtk' }, 'sunras' => { libdep => 'gtk' }, 'tga' => { libdep => 'gtk' }, 'threshold_alpha' => { libdep => 'gtk' }, diff --git a/plug-ins/dbbrowser/INSTALL b/plug-ins/dbbrowser/INSTALL deleted file mode 100644 index 185c625847..0000000000 --- a/plug-ins/dbbrowser/INSTALL +++ /dev/null @@ -1,34 +0,0 @@ - -put files in the right directories : - - $ cd /usr/src - $ tar zvf dbbrowser-x.xx.tar.gz - $ cd dbbrowser-x.xx - $ cp *.c *.h compile_dbbrowser ../gimp-0.99.xx/plug-ins - -compile & install dbbrowser : - - $ cd gimp-0.99.xx/plug-ins - $ sh ./compile_dbbrowser - $ cp dbbrowser ~/.gimp/plug-ins/ - -patch script-fu : - - $ cd gimp-0.99.xx/plug-ins/script-fu - $ patch < ../../dbbrowser-x.x/dbbrowser-script-fu-console.patch - (it modifies script-fu-console.c and Makefile.in) - -compile & install script-fu with browse : - - $ make - $ make install - -test dbbrowser : - - $ gimp - -> Xtns/DB Browser - -> Xtns/Script-Fu/Console - - - - diff --git a/plug-ins/dbbrowser/Makefile.am b/plug-ins/dbbrowser/Makefile.am index 1401dfeaaa..404e23935c 100644 --- a/plug-ins/dbbrowser/Makefile.am +++ b/plug-ins/dbbrowser/Makefile.am @@ -22,20 +22,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -dbbrowser_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/faxg3/Makefile.am b/plug-ins/faxg3/Makefile.am index 5afec73b05..a7a88ade5a 100644 --- a/plug-ins/faxg3/Makefile.am +++ b/plug-ins/faxg3/Makefile.am @@ -20,20 +20,9 @@ LDADD = \ $(GLIB_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -faxg3_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/fits/Makefile.am b/plug-ins/fits/Makefile.am index cde5924f2b..efc82aa3f6 100644 --- a/plug-ins/fits/Makefile.am +++ b/plug-ins/fits/Makefile.am @@ -19,20 +19,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -fits_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/fits/doc b/plug-ins/fits/doc deleted file mode 100644 index 1fcb7f39ac..0000000000 --- a/plug-ins/fits/doc +++ /dev/null @@ -1,71 +0,0 @@ - -FITS file plugin V1.04 for the GIMP Peter Kirchgessner, 12-Oct-97 -================================== e-mail: pkirchg@aol.com - WWW : http://members.aol.com/pkirchg - -Here is the FITS file plugin for the GIMP V 0.99.10 and up. -It is based on a FITS-reading/writing library FitsRW. -This library was designed for the FITS-plug-in, but can also -be used separately. -This plug-in will not work with GIMP V 0.54 ! -In the directory - - ftp://members.aol.com/pkirchg/pub/gimp - -you will find the following files: - - fits.txt : this document - fits.tgz : gzipped tarfile with sources and documentation - fits.linux.386.elf.tgz : gzipped tarfile with Linux exectuable - -News: -V 1.01: - - Bug with compilation on Irix fixed -V 1.02: - - Bug with saving GRAY-images fixed -V 1.03: - - Parse rc file (changes font for dialogues) -V 1.04: - - no progress bars for non-interactive mode - -FITS-reading support --------------------- - The plug-in reads simple FITS images with standard data arrays and - also XTENSION='IMAGE'. - The plug-in supports BITPIX values of 8, 16 and 32. - BITPIX values of -32 and -64 are supported on machines which support - IEEE-floating point format (Linux-386 does). - BLANK or NaN-pixels can be replaced by black or white. - The range of the pixel values kept in the data arrays are automatically - detected and can be scaled automatically. - FITS-files with NAXIS=3 and NAXIS3=2,...,4 can be composed to - GRAYA_IMAGE, RGB_IMAGE and RGBA_IMAGE. - -FITS-writing support --------------------- - The plugin supports all GIMP image types on writing. GRAY_IMAGEs are stored - with NAXIS=2, other images are stored with NAXIS=3. NAXIS3 will have values - of 2 (GRAYA_IMAGE), 3 (RGB_IMAGE) or 4 (RGBA_IMAGE). - -Installation of executable --------------------------- - To tell the GIMP about the FITS-file-plugin, copy the fits-executable - to /usr/local/lib/gimp/0.99.x/plug-ins . - -Installation from source ------------------------- - The FITS-plug-in consists of the files fits.c, fitsrw.c and fitsrw.h. - If you can work with automake, modify the Makefile.am in the plug-ins- - directory: - Add fits to the variable pluginlib_PROGRAMS - and add - fits_SOURCES = fits.c fitsrw.c fitsrw.h - - If you dont have automake and you must use the standard Makefile, - look at the occurances of the nlfilt-plug-in. It also depends on - another source megawidget.c and megawidget.h. Add the fits-plug-in - in a similar way. - -Suggestions ------------ - Suggestions about the plug-in should be mailed to pkirchg@aol.com diff --git a/plug-ins/fits/fits.txt b/plug-ins/fits/fits.txt deleted file mode 100644 index de736879fe..0000000000 --- a/plug-ins/fits/fits.txt +++ /dev/null @@ -1,73 +0,0 @@ - -FITS file plugin V1.05 for the GIMP Peter Kirchgessner, 23-Dec-97 -================================== e-mail: pkirchg@aol.com - WWW : http://members.aol.com/pkirchg - -Here is the FITS file plugin for the GIMP V 0.99.10 and up. -It is based on a FITS-reading/writing library FitsRW. -This library was designed for the FITS-plug-in, but can also -be used separately. -This plug-in will not work with GIMP V 0.54 ! -In the directory - - ftp://members.aol.com/pkirchg/pub/gimp - -you will find the following files: - - fits.txt : this document - fits.tgz : gzipped tarfile with sources and documentation - fits.linux.386.elf.tgz : gzipped tarfile with Linux exectuable - -News: - V 1.05, 23-Dec-97: - Add changes that came with gimp V 0.99.16 (initialize variables) - V 1.04: - no progress bars for non-interactive mode - V 1.03: - Parse rc file (changes font for dialogues) - V 1.02: - Bug with saving GRAY-images fixed - V 1.01: - Bug with compilation on Irix fixed - -FITS-reading support --------------------- - The plug-in reads simple FITS images with standard data arrays and - also XTENSION='IMAGE'. - The plug-in supports BITPIX values of 8, 16 and 32. - BITPIX values of -32 and -64 are supported on machines which support - IEEE-floating point format (Linux-386 does). - BLANK or NaN-pixels can be replaced by black or white. - The range of the pixel values kept in the data arrays are automatically - detected and can be scaled automatically. - FITS-files with NAXIS=3 and NAXIS3=2,...,4 can be composed to - GRAYA_IMAGE, RGB_IMAGE and RGBA_IMAGE. - -FITS-writing support --------------------- - The plugin supports all GIMP image types on writing. GRAY_IMAGEs are stored - with NAXIS=2, other images are stored with NAXIS=3. NAXIS3 will have values - of 2 (GRAYA_IMAGE), 3 (RGB_IMAGE) or 4 (RGBA_IMAGE). - -Installation of executable --------------------------- - To tell the GIMP about the FITS-file-plugin, copy the fits-executable - to /usr/local/lib/gimp/0.99.x/plug-ins . - -Installation from source ------------------------- - The FITS-plug-in consists of the files fits.c, fitsrw.c and fitsrw.h. - If you can work with automake, modify the Makefile.am in the plug-ins- - directory: - Add fits to the variable pluginlib_PROGRAMS - and add - fits_SOURCES = fits.c fitsrw.c fitsrw.h - - If you dont have automake and you must use the standard Makefile, - look at the occurances of the nlfilt-plug-in. It also depends on - another source megawidget.c and megawidget.h. Add the fits-plug-in - in a similar way. - -Suggestions ------------ - Suggestions about the plug-in should be mailed to pkirchg@aol.com diff --git a/plug-ins/flame/Makefile.am b/plug-ins/flame/Makefile.am index f620139b90..311f5688de 100644 --- a/plug-ins/flame/Makefile.am +++ b/plug-ins/flame/Makefile.am @@ -2,6 +2,8 @@ pluginlibdir = $(gimpplugindir)/plug-ins +EXTRA_DIST = README + pluginlib_PROGRAMS = flame flame_SOURCES = \ @@ -25,24 +27,12 @@ LDADD = \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ $(GTK_LIBS) \ - $(LIBUCB_LIB) \ + $(LIBUCB) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la - -flame_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/fp/Makefile.am b/plug-ins/fp/Makefile.am index 077e7eb701..89f8713265 100644 --- a/plug-ins/fp/Makefile.am +++ b/plug-ins/fp/Makefile.am @@ -23,20 +23,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -fp_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/gap/Makefile.am b/plug-ins/gap/Makefile.am index 959e4ac902..0df6c8cc60 100644 --- a/plug-ins/gap/Makefile.am +++ b/plug-ins/gap/Makefile.am @@ -4,13 +4,100 @@ pluginlibdir = $(gimpplugindir)/plug-ins scriptdatadir = $(gimpdatadir)/scripts -SUBDIRS = iter_ALT - scriptdata_DATA = sel-to-anim-img.scm -EXTRA_DIST = README README_developers TESTPROT_iter_ALT $(scriptdata_DATA) +EXTRA_DIST = \ + README \ + README_developers \ + TESTPROT_iter_ALT \ + iter_ALT/README_iter_subdirs \ + iter_ALT/gen/plug_in_CML_explorer_iter_ALT.inc \ + iter_ALT/gen/plug_in_alpha2color_iter_ALT.inc \ + iter_ALT/gen/plug_in_blinds_iter_ALT.inc \ + iter_ALT/gen/plug_in_borderaverage_iter_ALT.inc \ + iter_ALT/gen/plug_in_bump_map_iter_ALT.inc \ + iter_ALT/gen/plug_in_checkerboard_iter_ALT.inc \ + iter_ALT/gen/plug_in_color_map_iter_ALT.inc \ + iter_ALT/gen/plug_in_colorify_iter_ALT.inc \ + iter_ALT/gen/plug_in_cubism_iter_ALT.inc \ + iter_ALT/gen/plug_in_destripe_iter_ALT.inc \ + iter_ALT/gen/plug_in_diffraction_iter_ALT.inc \ + iter_ALT/gen/plug_in_displace_iter_ALT.inc \ + iter_ALT/gen/plug_in_edge_iter_ALT.inc \ + iter_ALT/gen/plug_in_engrave_iter_ALT.inc \ + iter_ALT/gen/plug_in_flarefx_iter_ALT.inc \ + iter_ALT/gen/plug_in_fractal_trace_iter_ALT.inc \ + iter_ALT/gen/plug_in_gauss_iir_iter_ALT.inc \ + iter_ALT/gen/plug_in_gauss_rle_iter_ALT.inc \ + iter_ALT/gen/plug_in_gfig_iter_ALT.inc \ + iter_ALT/gen/plug_in_glasstile_iter_ALT.inc \ + iter_ALT/gen/plug_in_grid_iter_ALT.inc \ + iter_ALT/gen/plug_in_jigsaw_iter_ALT.inc \ + iter_ALT/gen/plug_in_mblur_iter_ALT.inc \ + iter_ALT/gen/plug_in_mosaic_iter_ALT.inc \ + iter_ALT/gen/plug_in_newsprint_iter_ALT.inc \ + iter_ALT/gen/plug_in_noisify_iter_ALT.inc \ + iter_ALT/gen/plug_in_paper_tile_iter_ALT.inc \ + iter_ALT/gen/plug_in_pixelize_iter_ALT.inc \ + iter_ALT/gen/plug_in_randomize_hurl_iter_ALT.inc \ + iter_ALT/gen/plug_in_randomize_pick_iter_ALT.inc \ + iter_ALT/gen/plug_in_randomize_slur_iter_ALT.inc \ + iter_ALT/gen/plug_in_ripple_iter_ALT.inc \ + iter_ALT/gen/plug_in_rotate_iter_ALT.inc \ + iter_ALT/gen/plug_in_scatter_hsv_iter_ALT.inc \ + iter_ALT/gen/plug_in_sharpen_iter_ALT.inc \ + iter_ALT/gen/plug_in_shift_iter_ALT.inc \ + iter_ALT/gen/plug_in_spread_iter_ALT.inc \ + iter_ALT/gen/plug_in_video_iter_ALT.inc \ + iter_ALT/gen/plug_in_vpropagate_iter_ALT.inc \ + iter_ALT/gen/plug_in_waves_iter_ALT.inc \ + iter_ALT/gen/plug_in_whirl_pinch_iter_ALT.inc \ + iter_ALT/gen/plug_in_wind_iter_ALT.inc \ + iter_ALT/mod/plug_in_Twist_iter_ALT.inc \ + iter_ALT/mod/plug_in_alienmap_iter_ALT.inc \ + iter_ALT/mod/plug_in_applylens_iter_ALT.inc \ + iter_ALT/mod/plug_in_blur_iter_ALT.inc \ + iter_ALT/mod/plug_in_convmatrix_iter_ALT.inc \ + iter_ALT/mod/plug_in_depth_merge_iter_ALT.inc \ + iter_ALT/mod/plug_in_despeckle_iter_ALT.inc \ + iter_ALT/mod/plug_in_emboss_iter_ALT.inc \ + iter_ALT/mod/plug_in_exchange_iter_ALT.inc \ + iter_ALT/mod/plug_in_flame_iter_ALT.inc \ + iter_ALT/mod/plug_in_lighting_iter_ALT.inc \ + iter_ALT/mod/plug_in_map_object_iter_ALT.inc \ + iter_ALT/mod/plug_in_maze_iter_ALT.inc \ + iter_ALT/mod/plug_in_nlfilt_iter_ALT.inc \ + iter_ALT/mod/plug_in_nova_iter_ALT.inc \ + iter_ALT/mod/plug_in_oilify_iter_ALT.inc \ + iter_ALT/mod/plug_in_pagecurl_iter_ALT.inc \ + iter_ALT/mod/plug_in_plasma_iter_ALT.inc \ + iter_ALT/mod/plug_in_polar_coords_iter_ALT.inc \ + iter_ALT/mod/plug_in_sample_colorize_iter_ALT.inc \ + iter_ALT/mod/plug_in_sinus_iter_ALT.inc \ + iter_ALT/mod/plug_in_solid_noise_iter_ALT.inc \ + iter_ALT/mod/plug_in_sparkle_iter_ALT.inc \ + iter_ALT/old/Colorify_iter_ALT.inc \ + iter_ALT/old/plug_in_CentralReflection_iter_ALT.inc \ + iter_ALT/old/plug_in_anamorphose_iter_ALT.inc \ + iter_ALT/old/plug_in_blur2_iter_ALT.inc \ + iter_ALT/old/plug_in_encript_iter_ALT.inc \ + iter_ALT/old/plug_in_figures_iter_ALT.inc \ + iter_ALT/old/plug_in_gflare_iter_ALT.inc \ + iter_ALT/old/plug_in_holes_iter_ALT.inc \ + iter_ALT/old/plug_in_julia_iter_ALT.inc \ + iter_ALT/old/plug_in_magic_eye_iter_ALT.inc \ + iter_ALT/old/plug_in_mandelbrot_iter_ALT.inc \ + iter_ALT/old/plug_in_randomize_iter_ALT.inc \ + iter_ALT/old/plug_in_refract_iter_ALT.inc \ + iter_ALT/old/plug_in_struc_iter_ALT.inc \ + iter_ALT/old/plug_in_tileit_iter_ALT.inc \ + iter_ALT/old/plug_in_universal_filter_iter_ALT.inc \ + iter_ALT/old/plug_in_warp_iter_ALT.inc \ + $(scriptdata_DATA) -pluginlib_PROGRAMS = gap_plugins gap_filter +pluginlib_PROGRAMS = \ + gap_plugins \ + gap_filter gap_plugins_SOURCES = \ gap_main.c \ @@ -46,8 +133,7 @@ gap_plugins_SOURCES = \ gap_pdb_calls.c \ gap_pdb_calls.h \ resize.c \ - resize.h \ - appenv.h + resize.h gap_filter_SOURCES = \ @@ -78,26 +164,7 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la - -gap_plugins_DEPENDENCIES = $(DEPS) - -gap_filter_DEPENDENCIES = $(DEPS) - files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done - - - - - diff --git a/plug-ins/gap/appenv.h b/plug-ins/gap/appenv.h deleted file mode 100644 index 9199fe191d..0000000000 --- a/plug-ins/gap/appenv.h +++ /dev/null @@ -1,46 +0,0 @@ -/* The GIMP -- an image manipulation program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ -#ifndef __APPENV_H__ -#define __APPENV_H__ - -#include "gdk/gdkx.h" -#include "gtk/gtk.h" - -#define DISPLAY ((Display *) GDK_DISPLAY()) - -/* important macros */ -#define BOUNDS(a,x,y) ((a < x) ? x : ((a > y) ? y : a)) -#define MINIMUM(x,y) ((x < y) ? x : y) -#define MAXIMUM(x,y) ((x > y) ? x : y) - -typedef enum { - MESSAGE_BOX, - CONSOLE -} MessageHandlerType; - -extern int no_interface; -extern int no_splash; -extern int no_splash_image; -extern int no_data; -extern int be_verbose; -extern int use_debug_handler; -extern int console_messages; - -extern MessageHandlerType message_handler; - -#endif /* APPENV_H */ diff --git a/plug-ins/gap/iter_ALT/.cvsignore b/plug-ins/gap/iter_ALT/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/plug-ins/gap/iter_ALT/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/plug-ins/gap/iter_ALT/Makefile.am b/plug-ins/gap/iter_ALT/Makefile.am deleted file mode 100644 index 7c1a2b4822..0000000000 --- a/plug-ins/gap/iter_ALT/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## Process this file with automake to produce Makefile.in - -SUBDIRS = \ - gen \ - mod \ - old - -EXTRA_DIST = README_iter_subdirs - -files: - @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ - echo $$p; \ - done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done - diff --git a/plug-ins/gap/iter_ALT/gen/.cvsignore b/plug-ins/gap/iter_ALT/gen/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/plug-ins/gap/iter_ALT/gen/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/plug-ins/gap/iter_ALT/gen/Makefile.am b/plug-ins/gap/iter_ALT/gen/Makefile.am deleted file mode 100644 index a82879201f..0000000000 --- a/plug-ins/gap/iter_ALT/gen/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = \ - plug_in_CML_explorer_iter_ALT.inc \ - plug_in_alpha2color_iter_ALT.inc \ - plug_in_blinds_iter_ALT.inc \ - plug_in_borderaverage_iter_ALT.inc \ - plug_in_bump_map_iter_ALT.inc \ - plug_in_checkerboard_iter_ALT.inc \ - plug_in_color_map_iter_ALT.inc \ - plug_in_colorify_iter_ALT.inc \ - plug_in_cubism_iter_ALT.inc \ - plug_in_destripe_iter_ALT.inc \ - plug_in_diffraction_iter_ALT.inc \ - plug_in_displace_iter_ALT.inc \ - plug_in_edge_iter_ALT.inc \ - plug_in_engrave_iter_ALT.inc \ - plug_in_flarefx_iter_ALT.inc \ - plug_in_fractal_trace_iter_ALT.inc \ - plug_in_gauss_iir_iter_ALT.inc \ - plug_in_gauss_rle_iter_ALT.inc \ - plug_in_gfig_iter_ALT.inc \ - plug_in_glasstile_iter_ALT.inc \ - plug_in_grid_iter_ALT.inc \ - plug_in_jigsaw_iter_ALT.inc \ - plug_in_mblur_iter_ALT.inc \ - plug_in_mosaic_iter_ALT.inc \ - plug_in_newsprint_iter_ALT.inc \ - plug_in_noisify_iter_ALT.inc \ - plug_in_paper_tile_iter_ALT.inc \ - plug_in_pixelize_iter_ALT.inc \ - plug_in_randomize_hurl_iter_ALT.inc \ - plug_in_randomize_pick_iter_ALT.inc \ - plug_in_randomize_slur_iter_ALT.inc \ - plug_in_ripple_iter_ALT.inc \ - plug_in_rotate_iter_ALT.inc \ - plug_in_scatter_hsv_iter_ALT.inc \ - plug_in_sharpen_iter_ALT.inc \ - plug_in_shift_iter_ALT.inc \ - plug_in_spread_iter_ALT.inc \ - plug_in_video_iter_ALT.inc \ - plug_in_vpropagate_iter_ALT.inc \ - plug_in_waves_iter_ALT.inc \ - plug_in_whirl_pinch_iter_ALT.inc \ - plug_in_wind_iter_ALT.inc - - -files: - @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ - echo $$p; \ - done - diff --git a/plug-ins/gap/iter_ALT/mod/.cvsignore b/plug-ins/gap/iter_ALT/mod/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/plug-ins/gap/iter_ALT/mod/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/plug-ins/gap/iter_ALT/mod/Makefile.am b/plug-ins/gap/iter_ALT/mod/Makefile.am deleted file mode 100644 index d11bf55889..0000000000 --- a/plug-ins/gap/iter_ALT/mod/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = \ - plug_in_Twist_iter_ALT.inc \ - plug_in_alienmap_iter_ALT.inc \ - plug_in_applylens_iter_ALT.inc \ - plug_in_convmatrix_iter_ALT.inc \ - plug_in_depth_merge_iter_ALT.inc \ - plug_in_despeckle_iter_ALT.inc \ - plug_in_emboss_iter_ALT.inc \ - plug_in_exchange_iter_ALT.inc \ - plug_in_flame_iter_ALT.inc \ - plug_in_map_object_iter_ALT.inc \ - plug_in_maze_iter_ALT.inc \ - plug_in_nlfilt_iter_ALT.inc \ - plug_in_nova_iter_ALT.inc \ - plug_in_oilify_iter_ALT.inc \ - plug_in_polar_coords_iter_ALT.inc \ - plug_in_sinus_iter_ALT.inc \ - plug_in_sparkle_iter_ALT.inc \ - plug_in_blur_iter_ALT.inc \ - plug_in_pagecurl_iter_ALT.inc \ - plug_in_plasma_iter_ALT.inc \ - plug_in_sample_colorize_iter_ALT.inc \ - plug_in_solid_noise_iter_ALT.inc \ - plug_in_lighting_iter_ALT.inc - - -files: - @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ - echo $$p; \ - done - diff --git a/plug-ins/gap/iter_ALT/old/.cvsignore b/plug-ins/gap/iter_ALT/old/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/plug-ins/gap/iter_ALT/old/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/plug-ins/gap/iter_ALT/old/Makefile.am b/plug-ins/gap/iter_ALT/old/Makefile.am deleted file mode 100644 index 04cb8e68fa..0000000000 --- a/plug-ins/gap/iter_ALT/old/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## Process this file with automake to produce Makefile.in - -EXTRA_DIST = \ - Colorify_iter_ALT.inc \ - plug_in_CentralReflection_iter_ALT.inc \ - plug_in_anamorphose_iter_ALT.inc \ - plug_in_blur2_iter_ALT.inc \ - plug_in_encript_iter_ALT.inc \ - plug_in_figures_iter_ALT.inc \ - plug_in_gflare_iter_ALT.inc \ - plug_in_holes_iter_ALT.inc \ - plug_in_julia_iter_ALT.inc \ - plug_in_magic_eye_iter_ALT.inc \ - plug_in_mandelbrot_iter_ALT.inc \ - plug_in_randomize_iter_ALT.inc \ - plug_in_refract_iter_ALT.inc \ - plug_in_struc_iter_ALT.inc \ - plug_in_tileit_iter_ALT.inc \ - plug_in_universal_filter_iter_ALT.inc \ - plug_in_warp_iter_ALT.inc - -files: - @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ - echo $$p; \ - done - diff --git a/plug-ins/gap/resize.c b/plug-ins/gap/resize.c index 2efb92e187..07c3c7a493 100644 --- a/plug-ins/gap/resize.c +++ b/plug-ins/gap/resize.c @@ -18,13 +18,14 @@ #include #include #include -#include "appenv.h" +#include #include "resize.h" #define EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK #define DRAWING_AREA_SIZE 200 #define TEXT_WIDTH 35 + typedef struct _ResizePrivate ResizePrivate; struct _ResizePrivate @@ -371,9 +372,9 @@ resize_bound_off_x (Resize *resize, private = (ResizePrivate *) resize->private_part; if (private->old_width <= resize->width) - off_x = BOUNDS (off_x, 0, (resize->width - private->old_width)); + off_x = CLAMP (off_x, 0, (resize->width - private->old_width)); else - off_x = BOUNDS (off_x, (resize->width - private->old_width), 0); + off_x = CLAMP (off_x, (resize->width - private->old_width), 0); return off_x; } @@ -387,9 +388,9 @@ resize_bound_off_y (Resize *resize, private = (ResizePrivate *) resize->private_part; if (private->old_height <= resize->height) - off_y = BOUNDS (off_y, 0, (resize->height - private->old_height)); + off_y = CLAMP (off_y, 0, (resize->height - private->old_height)); else - off_y = BOUNDS (off_y, (resize->height - private->old_height), 0); + off_y = CLAMP (off_y, (resize->height - private->old_height), 0); return off_y; } diff --git a/plug-ins/gdyntext/Makefile.am b/plug-ins/gdyntext/Makefile.am index cff186bbef..779255963b 100644 --- a/plug-ins/gdyntext/Makefile.am +++ b/plug-ins/gdyntext/Makefile.am @@ -44,20 +44,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -gdyntext_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am index f6be034f0f..0099937c33 100644 --- a/plug-ins/gfig/Makefile.am +++ b/plug-ins/gfig/Makefile.am @@ -4,6 +4,8 @@ SUBDIRS = gfig-examples pluginlibdir = $(gimpplugindir)/plug-ins +EXTRA_DIST = README + pluginlib_PROGRAMS = gfig gfig_SOURCES = \ @@ -21,12 +23,6 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la - -gfig_DEPENDENCIES = $(DEPS) - .PHONY: files files: diff --git a/plug-ins/gfli/Makefile.am b/plug-ins/gfli/Makefile.am index 47505edb91..d3c38eaf0c 100644 --- a/plug-ins/gfli/Makefile.am +++ b/plug-ins/gfli/Makefile.am @@ -19,11 +19,6 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -gfli_DEPENDENCIES = $(DEPS) - .PHONY: files files: diff --git a/plug-ins/gpc/Makefile.am b/plug-ins/gpc/Makefile.am index 4a9fb159db..18f7af43c7 100644 --- a/plug-ins/gpc/Makefile.am +++ b/plug-ins/gpc/Makefile.am @@ -18,14 +18,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la +EXTRA_DIST = gpc.3 gpc.man -libgpc_a_DEPENDENCIES = $(DEPS) - -EXTRA_DIST=gpc.3 gpc.man - -man_MANS=gpc.3 +man_MANS = gpc.3 .PHONY: files @@ -33,9 +28,3 @@ files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/ifscompose/Makefile.am b/plug-ins/ifscompose/Makefile.am index cef4612869..cbef8c865c 100644 --- a/plug-ins/ifscompose/Makefile.am +++ b/plug-ins/ifscompose/Makefile.am @@ -2,6 +2,8 @@ pluginlibdir = $(gimpplugindir)/plug-ins +EXTRA_DIST = README.ifscompose + pluginlib_PROGRAMS = ifscompose ifscompose_SOURCES = \ @@ -19,20 +21,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -ifscompose_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/libgck/Makefile.am b/plug-ins/libgck/Makefile.am index e4a772d160..2e39f0c091 100644 --- a/plug-ins/libgck/Makefile.am +++ b/plug-ins/libgck/Makefile.am @@ -1,9 +1,11 @@ ## Process this file with automake to produce Makefile.in -SRC_SUBDIRS = gck SUBDIRS = gck EXTRA_DIST = \ + ChangeLog \ + NEWS \ + README \ TODO \ docs/html/gck.html \ docs/html/gck_application_window.html \ diff --git a/plug-ins/maze/Makefile.am b/plug-ins/maze/Makefile.am index 132d221a6d..9bd36be528 100644 --- a/plug-ins/maze/Makefile.am +++ b/plug-ins/maze/Makefile.am @@ -21,20 +21,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -maze_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/megawidget/Makefile.am b/plug-ins/megawidget/Makefile.am index da0ccd69df..47e20557ba 100644 --- a/plug-ins/megawidget/Makefile.am +++ b/plug-ins/megawidget/Makefile.am @@ -18,20 +18,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -libmegawidget_a_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/mosaic/Makefile.am b/plug-ins/mosaic/Makefile.am index 158d86b0f7..5bba00c1e1 100644 --- a/plug-ins/mosaic/Makefile.am +++ b/plug-ins/mosaic/Makefile.am @@ -18,20 +18,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -mosaic_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/pagecurl/Makefile.am b/plug-ins/pagecurl/Makefile.am index acafd12658..f8d4ab7e43 100644 --- a/plug-ins/pagecurl/Makefile.am +++ b/plug-ins/pagecurl/Makefile.am @@ -25,20 +25,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -pagecurl_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/print/Makefile.am b/plug-ins/print/Makefile.am index 57635c9ee6..30f08c1f05 100644 --- a/plug-ins/print/Makefile.am +++ b/plug-ins/print/Makefile.am @@ -29,20 +29,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -print_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/rcm/Makefile.am b/plug-ins/rcm/Makefile.am index b3817ad9ac..b4a573daec 100644 --- a/plug-ins/rcm/Makefile.am +++ b/plug-ins/rcm/Makefile.am @@ -27,20 +27,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -rcm_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am index 70fccc20d7..60424164ee 100644 --- a/plug-ins/script-fu/Makefile.am +++ b/plug-ins/script-fu/Makefile.am @@ -2,8 +2,6 @@ SUBDIRS = scripts -scriptdata = - pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = script-fu @@ -40,13 +38,6 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la - -script_fu_DEPENDENCIES = $(DEPS) - AM_CPPFLAGS = \ -DREGEX_MALLOC diff --git a/plug-ins/sgi/Makefile.am b/plug-ins/sgi/Makefile.am index d1720276f9..cf1a4c4c06 100644 --- a/plug-ins/sgi/Makefile.am +++ b/plug-ins/sgi/Makefile.am @@ -19,20 +19,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -sgi_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/sinus/Makefile.am b/plug-ins/sinus/Makefile.am index 75684a40c1..e7709c9297 100644 --- a/plug-ins/sinus/Makefile.am +++ b/plug-ins/sinus/Makefile.am @@ -19,21 +19,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la - -sinus_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/struc/Makefile.am b/plug-ins/struc/Makefile.am index ab685712d7..6449875ef2 100644 --- a/plug-ins/struc/Makefile.am +++ b/plug-ins/struc/Makefile.am @@ -18,20 +18,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -struc_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/unsharp/Makefile.am b/plug-ins/unsharp/Makefile.am index c8018f1c2d..ff62221ef6 100644 --- a/plug-ins/unsharp/Makefile.am +++ b/plug-ins/unsharp/Makefile.am @@ -19,20 +19,9 @@ LDADD = \ $(GTK_LIBS) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -unsharp_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/webbrowser/Makefile.am b/plug-ins/webbrowser/Makefile.am index 718f3ee662..99e89b65fb 100644 --- a/plug-ins/webbrowser/Makefile.am +++ b/plug-ins/webbrowser/Makefile.am @@ -19,14 +19,9 @@ INCLUDES = \ LDADD = \ $(top_builddir)/libgimp/libgimp.la \ $(GTK_LIBS) \ - @LIBXMU_LIB@ \ + $(LIBXMU) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimp.la - -webbrowser_DEPENDENCIES = $(DEPS) - EXTRA_DIST = $(scriptdata_DATA) .PHONY: files @@ -35,9 +30,3 @@ files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done diff --git a/plug-ins/xjt/Makefile.am b/plug-ins/xjt/Makefile.am index 3fd2d72c0b..8cf00540fe 100644 --- a/plug-ins/xjt/Makefile.am +++ b/plug-ins/xjt/Makefile.am @@ -7,7 +7,11 @@ pluginlib_PROGRAMS = xjt EXTRA_DIST = README README_xjt_fileformat.txt xjt_SOURCES = \ - xjt.c xjpeg.c xjpeg.h xpdb_calls.c xpdb_calls.h + xjt.c \ + xjpeg.c \ + xjpeg.h \ + xpdb_calls.c \ + xpdb_calls.h INCLUDES = \ -I$(top_srcdir) \ @@ -18,29 +22,12 @@ LDADD = \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ $(GTK_LIBS) \ - @LIBJPEG_LIB@ \ + $(LIBJPEG) \ $(INTLLIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la - -xjt_DEPENDENCIES = $(DEPS) - .PHONY: files files: @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ echo $$p; \ done - @for subdir in $(SUBDIRS); do \ - files=`cd $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"`; \ - for file in $$files; do \ - echo $$subdir/$$file; \ - done; \ - done - - - - -