diff -ruN gimp-1.0.2/ChangeLog gimp-1.0.3/ChangeLog --- gimp-1.0.2/ChangeLog Wed Oct 14 20:11:44 1998 +++ gimp-1.0.3/ChangeLog Mon Mar 29 12:34:49 1999 @@ -1,3 +1,197 @@ +Mon Mar 29 11:33:38 PST 1999 Manish Singh + + * Made 1.0.3 release + + * Added various #include files to some plug-ins to make them + compile cleanly + + * configure.in: Makefile in docs/white-paper too + + * README + * NEWS: updated + +Sun Mar 28 14:38:53 PST 1999 Manish Singh + + * updated to libtool 1.2f + + * configure.in: require gtk 1.2 + +Sat Mar 27 01:13:42 EST 1999 Matt Wilson + + * app/app_procs.c: removed the idle function from the + splash screen, added code that services the event + queue. This reduces flicker in the splash screen. + (backport from 1.1) + + * app/brushes.c: s/gpointer/gconstpointer for hash table + functions (backport from 1.1) + + * app/fileops.c: added #include to get + prototype for strtol() + + * app/gdisplay.c: added a check to see if we have a gdisplay + hash table set up before we go looking for the gdisplay + for this toplevel widget. (backport from 1.1) + + * app/interface.c: added a bound check for progress_update + (backport from 1.1) + + * app/main.c: added a cast to make g_set-message_handler happy + (backport from 1.1) + + * app/patterns.c: s/gpointer/gconstpointer for hash table + functions (backport from 1.1) + + * app/plug_in.c: added bounds check for progress bar update + + * app/procedural_db.c: s/gpointer/gconstpointer for hash table + functions, changed to using g_str_equal for comparison + (backport from 1.1) + + * plug-ins/MapObject/mapobject_ui.c: now uses the right widget + for adjustment callbacks (backport from 1.1 branch) + + * plug-ins/dbbrowser/dbbrowser_utils.c: fixed the clist of + db functions so that the scrollbar shows, added viewports + for non-scrollable description table + + * plug-ins/gfig/gfig.c: reverted to the gfig version from + the 1.0 branch, ported to GTK+ 1.2 + + * plug-ins/script-fu/script-fu-server.c: set up the clientname + hash table to use g_direct_hash (backport from 1.1), + added stdlib.h for malloc() prototype. + +Mon Mar 15 13:13:36 1999 Owen Taylor + + * plug-ins/xd/xd.c plug-ins/film/film.c: + gtk_scrolled_window_add_with_viewport() changes. + +Mon Mar 15 12:50:46 1999 Owen Taylor + + * app/image_render.c (render_image_indexed): Put in + missing code to increment the source pointer + for indexed images. + +Mon Mar 15 12:07:59 1999 Owen Taylor + + * app/menus.[ch] app/gimprc.c app/gradient.c (menus_quit): + Merge in menufactory => itemfactory changes from head + +Mon Mar 15 11:44:13 1999 Owen Taylor + + * app/gradient.c (cpopup_create_color_item): Use an + accel label when creating a menuitem by hand. + +Mon Mar 15 11:30:04 1999 Owen Taylor + + * app/layers_dialog.c (lc_dialog_create): Show dialog + after updating the lists. This looks better and + works around an obscure bug with size requests + that was being triggered. + +Sun Mar 14 23:33:14 1999 Owen Taylor + + * app/app_procs.c (app_exit_finish): Call plug_in_kill() + before procedural_db_free(). + +Sun Mar 14 23:27:38 1999 Owen Taylor + + * app/channels_dialog.c app/global_edit.c app/gradient.c + app/layers_dialog.c app/text_tool.c: + Use gtk_scrolled_window_add_with_viewport() + +Sun Mar 14 15:27:15 EST 1999 Matt Wilson + + * gimp.spec: updated to use new group entries. + +Sun Mar 14 15:07:47 EST 1999 Matt Wilson + + * configure.in: preparing for 1.0.3 release + +Sun Mar 14 14:27:25 EST 1999 Matt Wilson + + * plug-ins/gfig/gfig.c: backport from HEAD + * plug-ins/libgck/gck/*.[ch]: backport from HEAD + +Sun Mar 14 12:46:41 EST 1999 Matt Wilson + + * app/image_render.c: rendering functions seem to work for all + image types and zoom levels. + +Sat Mar 13 21:07:34 EST 1999 Matt Wilson + + * app/image_render.c: Off by a factor of 3 vertical. GRAY and INDEXED + work. The rest appear to have endian and bitshift errors. + * app/gximage.[ch]: more gdk_rgb functionality + * app/gdisplay.c: updated to new gximage_put arguments + +Sat Mar 13 21:07:34 EST 1999 Matt Wilson + + * app/gdisplay.c, app/gximage.[ch], app/image_render.c: First + steps to migrate to gdk_rgb displays. You get half of the 256x256 + image rendered properly now. + +Sat Mar 13 20:22:00 EST 1999 Matt Wilson + + (some earlier commits on this branch to make app/ build under GTK+ + 1.2 not logged here.) + + * app/colormaps.[ch], app/gdisplay.[ch], app/image_render.c: + Changes to allow the GIMP to run without crashing. We need to + figure out how to do the image rendering work without the color + cube we used to get from GtkPreview. Now that GtkPreview uses + gdk_rgb, we don't have the color cube anymore. We may want to + move the rendering functions to paint to gdk_rgb instead of + gdk_pixmap like the old code did. + +Sun Jan 3 14:39:01 PST 1999 Manish Singh + + * plug-ins/ps/ps.c: update from author + +Sat Jan 2 15:04:16 PST 1999 Manish Singh + + * ltconfig: cases for Unixware 2.1.2 (from Geoff Clare) + and BSD/OS 4.0 (from Chris P. Ross) + + * app/Makefile.am + * plug-ins/script-fu/scripts/Makefile.am: use -DREGEX_MALLOC, + seems to be more portable + + * plug-ins/png/png.c: use a default gamma of 2.2 when gamma + correction isn't enabled + +Wed Nov 18 17:35:38 MET 1998 Sven Neumann + + * app/app_procs.c: fixed a longstanding bug in the splash-screen. + Finally it shouldn't resize any more even with LARGE fonts. + +Sun Nov 8 18:19:37 PST 1998 Manish Singh + + * Makefile.am + * configure.in: check for GTK+ 1.0.3 or higher, we use stuff + from it. Add a convenience configure option for me. + + * gimptool.in: sync with 1.1 + + * tile_swap.c: ok, a further attempt to get rid of a bunch o' + dialogs + + * docs/Makefile.am + * docs/white-paper/Makefile.am: helpers for make dist + + * libgimp/gimp.c: match header declaration + + * checkerboard.c: avoid a FP exception in psychobilly mode + + * plug-ins/cubism/cubism.c + * plug-ins/mosaic/mosaic.c: speedups from 1.1 + + * plug-ins/png/png.c: bugfix for indexed image, default to level 6 + compression + + * plug-ins/tiff/tiff.c: 1.1 sync + Wed Oct 14 20:11:29 PDT 1998 Manish Singh * Made 1.0.2 release @@ -60,7 +254,7 @@ Sun Sep 27 14:51:47 PDT 1998 Manish Singh * gimptool.in: sync with 1.1 gimptool - + * gimptool.1: man page update Mon Sep 21 02:11:27 PDT 1998 Manish Singh @@ -75,7 +269,7 @@ * plug-ins/script-fu/script-fu.c * plug-ins/script-fu/script-fu-console.[ch]: added an eval PDB interface for running arbitrary scheme code - + * app/batch.c: redid batch mode to use script-fu-eval * app/main.c: fixed command line parsing for batch mode and @@ -178,8 +372,8 @@ Wed Jul 22 23:32:50 MEST 1998 Sven Neumann * docs/quick_reference.ps - * docs/quick_reference.tar.gz: - Updated the Quick Reference Sheet to the much improved version made + * docs/quick_reference.tar.gz: + Updated the Quick Reference Sheet to the much improved version made by Sven Anders . Fri Jul 17 01:37:21 PDT 1998 Manish Singh @@ -227,7 +421,7 @@ foreground as a fill type option. Mon Jul 6 5:12:00 CST 1998 Seth Burgess - + * plug-ins/gbr/gbr.c: added gbr version 1 support Mon Jul 6 12:07:37 PDT 1998 Manish Singh diff -ruN gimp-1.0.2/Makefile.am gimp-1.0.3/Makefile.am --- gimp-1.0.2/Makefile.am Sun Jun 14 00:54:29 1998 +++ gimp-1.0.3/Makefile.am Sun Mar 14 13:11:17 1999 @@ -1,10 +1,10 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = libgimp plug-ins app data +SUBDIRS = libgimp plug-ins app data @GIMPDOCS@ bin_SCRIPTS = gimptool -EXTRA_DIST = TODO gtkrc gimp_logo.ppm gimp_splash.ppm rmshm user_install gimp_tips.txt ps-menurc gimp.1 gimptool.1 gtkrc.forest2 gimp.m4 +EXTRA_DIST = TODO gtkrc gimp_logo.ppm gimp_splash.ppm rmshm user_install gimp_tips.txt ps-menurc gimp.1 gimptool.1 gtkrc.forest2 gimp.m4 RPM/gimp.wmconfig RPM/wilbur.xpm RPM/mini-wilbur.xpm gimpdata_DATA = gimprc gimprc_user gtkrc gimp_logo.ppm gimp_splash.ppm gimp_tips.txt ps-menurc gtkrc.forest2 diff -ruN gimp-1.0.2/Makefile.in gimp-1.0.3/Makefile.in --- gimp-1.0.2/Makefile.in Wed Oct 14 20:18:37 1998 +++ gimp-1.0.3/Makefile.in Mon Mar 29 13:12:32 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -115,22 +118,22 @@ palettedata = @palettedata@ patterndata = @patterndata@ -SUBDIRS = libgimp plug-ins app data +SUBDIRS = libgimp plug-ins app data @GIMPDOCS@ bin_SCRIPTS = gimptool -EXTRA_DIST = TODO gtkrc gimp_logo.ppm gimp_splash.ppm rmshm user_install gimp_tips.txt ps-menurc gimp.1 gimptool.1 gtkrc.forest2 gimp.m4 +EXTRA_DIST = TODO gtkrc gimp_logo.ppm gimp_splash.ppm rmshm user_install gimp_tips.txt ps-menurc gimp.1 gimptool.1 gtkrc.forest2 gimp.m4 RPM/gimp.wmconfig RPM/wilbur.xpm RPM/mini-wilbur.xpm gimpdata_DATA = gimprc gimprc_user gtkrc gimp_logo.ppm gimp_splash.ppm gimp_tips.txt ps-menurc gtkrc.forest2 gimpdata_SCRIPTS = user_install -man_MANS=gimp.1 gimptool.1 +man_MANS = gimp.1 gimptool.1 m4datadir = $(datadir)/aclocal m4data_DATA = gimp.m4 -scriptdata = +scriptdata = ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -143,45 +146,51 @@ NROFF = nroff DATA = $(gimpdata_DATA) $(m4data_DATA) -DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess config.h.in \ -config.sub configure configure.in gimprc.in gimprc_user.in gimptool.in \ -install-sh ltconfig ltmain.sh missing mkinstalldirs stamp-h.in +DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ +Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \ +config.h.in config.sub configure configure.in gimprc.in gimprc_user.in \ +gimptool.in install-sh ltconfig ltmain.sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: all-recursive-am all-am - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): @MAINT@ configure.in +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in cd $(srcdir) && $(ACLOCAL) -config.status: $(srcdir)/configure +config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) config.h: stamp-h - @: + @if test ! -f $@; then \ + rm -f stamp-h; \ + $(MAKE) stamp-h; \ + else :; fi stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=config.h \ $(SHELL) ./config.status - @echo timestamp > stamp-h -$(srcdir)/config.h.in: @MAINT@$(srcdir)/stamp-h.in + @echo timestamp > stamp-h 2> /dev/null +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in + @if test ! -f $@; then \ + rm -f $(srcdir)/stamp-h.in; \ + $(MAKE) $(srcdir)/stamp-h.in; \ + else :; fi $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in + @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null mostlyclean-hdr: @@ -192,11 +201,11 @@ maintainer-clean-hdr: gimprc: $(top_builddir)/config.status gimprc.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status gimprc_user: $(top_builddir)/config.status gimprc_user.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status gimptool: $(top_builddir)/config.status gimptool.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) @@ -270,10 +279,10 @@ done install-man: $(MANS) @$(NORMAL_INSTALL) - $(MAKE) install-man1 + $(MAKE) $(AM_MAKEFLAGS) install-man1 uninstall-man: @$(NORMAL_UNINSTALL) - $(MAKE) uninstall-man1 + $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 install-gimpdataDATA: $(gimpdata_DATA) @$(NORMAL_INSTALL) @@ -326,41 +335,65 @@ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) tags); \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ done; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ @@ -386,117 +419,122 @@ # tarfile. distcheck: dist -rm -rf $(distdir) - GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \ cd $(distdir)/=build \ && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) \ - && $(MAKE) dvi \ - && $(MAKE) check \ - && $(MAKE) install \ - && $(MAKE) installcheck \ - && $(MAKE) dist + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) dist -rm -rf $(distdir) - @echo "========================"; \ - echo "$(distdir).tar.gz is ready for distribution"; \ - echo "========================" + @banner="$(distdir).tar.gz is ready for distribution"; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes" dist: distdir -chmod -R a+r $(distdir) - GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) - GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) + $(mkinstalldirs) $(distdir)/RPM @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ done +info-am: info: info-recursive +dvi-am: dvi: dvi-recursive -check: all-am - $(MAKE) check-recursive +check-am: all-am +check: check-recursive +installcheck-am: installcheck: installcheck-recursive all-recursive-am: config.h - $(MAKE) all-recursive - -all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive install-exec-am: install-binSCRIPTS +install-exec: install-exec-recursive -install-data-am: install-gimpdataSCRIPTS install-man install-gimpdataDATA install-m4dataDATA - -uninstall-am: uninstall-binSCRIPTS uninstall-gimpdataSCRIPTS uninstall-man uninstall-gimpdataDATA uninstall-m4dataDATA - -install-exec: install-exec-recursive install-exec-am - @$(NORMAL_INSTALL) - -install-data: install-data-recursive install-data-am - @$(NORMAL_INSTALL) - -install: install-recursive install-exec-am install-data-am - @: - -uninstall: uninstall-recursive uninstall-am - +install-data-am: install-gimpdataSCRIPTS install-man \ + install-gimpdataDATA install-m4dataDATA +install-data: install-data-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-recursive +uninstall-am: uninstall-binSCRIPTS uninstall-gimpdataSCRIPTS \ + uninstall-man uninstall-gimpdataDATA \ + uninstall-m4dataDATA +uninstall: uninstall-recursive +all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) config.h +all-redirect: all-recursive-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive - $(mkinstalldirs) $(DATADIR)$(bindir) $(DATADIR)$(gimpdatadir) \ - $(DESTDIR)$(mandir)/man1 $(DATADIR)$(gimpdatadir) \ - $(DATADIR)$(m4datadir) +installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(gimpdatadir) \ + $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(gimpdatadir) \ + $(DESTDIR)$(m4datadir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic -clean-am: clean-hdr clean-tags clean-generic mostlyclean-am - -distclean-am: distclean-hdr distclean-tags distclean-generic clean-am +mostlyclean: mostlyclean-recursive -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ - maintainer-clean-generic distclean-am +clean-am: clean-hdr clean-tags clean-generic mostlyclean-am -mostlyclean: mostlyclean-recursive mostlyclean-am +clean: clean-recursive -clean: clean-recursive clean-am +distclean-am: distclean-hdr distclean-tags distclean-generic clean-am + -rm -f libtool -distclean: distclean-recursive distclean-am +distclean: distclean-recursive -rm -f config.status - -rm -f libtool -maintainer-clean: maintainer-clean-recursive maintainer-clean-am +maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-recursive -rm -f config.status .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ @@ -509,9 +547,10 @@ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck all-recursive-am all-am install-exec-am install-data-am \ -uninstall-am install-exec install-data install uninstall all \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/NEWS gimp-1.0.3/NEWS --- gimp-1.0.2/NEWS Wed Oct 14 20:17:39 1998 +++ gimp-1.0.3/NEWS Mon Mar 29 11:39:16 1999 @@ -1,3 +1,7 @@ +What's new in GIMP 1.0.3 + +* GTK+ 1.2 support. Now the GIMP *requires* GTK+ 1.2 + What's new in GIMP 1.0.2 * Evil GIF infinite file bug introduced in 1.0.1 fixed diff -ruN gimp-1.0.2/README gimp-1.0.3/README --- gimp-1.0.2/README Tue Oct 13 16:39:01 1998 +++ gimp-1.0.3/README Mon Mar 29 12:29:33 1999 @@ -1,7 +1,7 @@ The GIMP: the GNU Image Manipulation Program -------------------------------------------- -The main difference between v1.0.2 and much earlier versions is the +The main difference between v1.0.3 and much earlier versions is the use of a tile based memory management for images. This allows the GIMP to work with images much larger than physical memory in a usable fashion. Before such memory management, the GIMP was nearly unusable @@ -93,9 +93,10 @@ the GIMP :-) On Byxnet (a private mostly-GIMP network) there is #gimp. Many of the developers hang out there. Some of the Byxnet servers are: - irc.mint.net:6666 - irc.canweb.net:6667 - rudolf.canberra.edu.au:6666 + irc.gimp.org:6667 + irc.olg.com:6667 + irc.coherent.net:6667 + irc.mint.net:6667 You can customize the look of the interface quite a bit my editing the ~/.gimp/gtkrc file. A sample file, gtkrc.forest2, is included (Thanks to diff -ruN gimp-1.0.2/RPM/gimp.wmconfig gimp-1.0.3/RPM/gimp.wmconfig --- gimp-1.0.2/RPM/gimp.wmconfig Wed Dec 31 16:00:00 1969 +++ gimp-1.0.3/RPM/gimp.wmconfig Tue Apr 21 13:27:56 1998 @@ -0,0 +1,6 @@ +gimp name "The GIMP" +gimp description "GNU Image Manipulation Program" +gimp icon "wilbur.xpm" +gimp mini-icon "mini-wilbur.xpm" +gimp exec "gimp &" +gimp group Graphics diff -ruN gimp-1.0.2/RPM/mini-wilbur.xpm gimp-1.0.3/RPM/mini-wilbur.xpm --- gimp-1.0.2/RPM/mini-wilbur.xpm Wed Dec 31 16:00:00 1969 +++ gimp-1.0.3/RPM/mini-wilbur.xpm Mon Apr 20 07:43:04 1998 @@ -0,0 +1,132 @@ +/* XPM */ +static char * wilbur_mini_xpm[] = { +"18 18 111 2", +" c None", +". c #8E38861771C6", +"X c #BEFBB6DAA699", +"o c #71C669A65965", +"O c #AEBA9E798E38", +"+ c #B6DAAEBAA699", +"@ c #71C671C65965", +"# c #69A661854924", +"$ c #B6DAAEBA9E79", +"% c #8E38820769A6", +"& c #AEBAAAAAA699", +"* c #79E775D66185", +"= c #618561854924", +"- c #69A665955144", +"; c #C71BC30BBEFB", +": c #96588A2871C6", +"> c #79E771C65965", +", c #A699A2899658", +"< c #A6999E799658", +"1 c #71C66DB65965", +"2 c #69A661855144", +"3 c #618559654924", +"4 c #79E779E769A6", +"5 c #D75CD34CCF3C", +"6 c #9E7996588617", +"7 c #8E387DF769A6", +"8 c #861779E76185", +"9 c #965892488617", +"0 c #86177DF771C6", +"q c #61855D754924", +"w c #596555554103", +"e c #9E7996589658", +"r c #F7DEF3CEF7DE", +"t c #E79DE79DE79D", +"y c #A6999A698617", +"u c #DF7DDB6CD75C", +"i c #FFFFFBEEF7DE", +"p c #C71BC30BB6DA", +"a c #79E771C66185", +"s c #596559654924", +"d c #596551444103", +"f c #51444D344103", +"g c #618561855144", +"h c #618565956185", +"j c #9E799A699E79", +"k c #E79DE38DDF7D", +"l c #B6DAB2CAB6DA", +"z c #79E77DF779E7", +"x c #E79DE79DDF7D", +"c c #F7DEF7DEF7DE", +"v c #AEBAAEBAAEBA", +"b c #DF7DDF7DDF7D", +"n c #514451444103", +"m c #4924451438E3", +"M c #4103410330C2", +"N c #4924492438E3", +"B c #8617820779E7", +"V c #71C675D671C6", +"C c #8E388E388E38", +"Z c #30C230C230C2", +"A c #8E388A2879E7", +"S c #69A66DB669A6", +"D c #514455555144", +"F c #CF3CCB2BC71B", +"G c #514451445144", +"H c #965896589658", +"J c #41033CF330C2", +"K c #38E338E328A2", +"L c #514451444924", +"P c #596559655965", +"I c #861786178617", +"U c #30C234D330C2", +"Y c #514455554924", +"T c #AEBAA2899E79", +"R c #AEBAAAAA9E79", +"E c #CF3CCB2BCF3C", +"W c #28A22CB228A2", +"Q c #A6999E79A699", +"! c #596555555144", +"~ c #492449244924", +"^ c #410341034103", +"/ c #596559655144", +"( c #86177DF769A6", +") c #BEFBBEFBBEFB", +"_ c #96588E388617", +"` c #51444D3438E3", +"' c #38E334D330C2", +"] c #410345144103", +"[ c #514455555965", +"{ c #69A669A66185", +"} c #4924410330C2", +"| c #A699A2899E79", +" . c #30C230C228A2", +".. c #38E33CF338E3", +"X. c #71C671C669A6", +"o. c #38E338E330C2", +"O. c #61855D755144", +"+. c #38E334D328A2", +"@. c #208120811861", +"#. c #208124921861", +"$. c #20811C711040", +"%. c #186118611040", +"&. c #596555554924", +"*. c #18611C711861", +"=. c #618561856185", +"-. c #4103410338E3", +";. c #104014511040", +":. c #38E338E338E3", +">. c #208124922081", +",. c #208120812081", +"<. c #28A228A228A2", +" ", +" . ", +" X o ", +" O + @ # ", +" $ % & * = - ", +" ; : > , < 1 2 3 4 ", +" 5 6 7 8 . 9 6 0 1 2 q 3 w e ", +" r t y u i p a 2 s d f f g ", +" h j k l z x c v b . q n m M N B ", +"V C Z A S D k F G H A 3 N J K L ", +"P I U Y , T R E W Q a w m K K ! ", +"U ~ ^ / 1 8 ( + ) _ q ` M K ' h ", +"] ^ [ { q 1 > 1 - q N } J K U z ", +"| D S { f 3 2 = 3 ` J N K ... ", +" j X.n m ` d N o. .O.f +.@.P ", +" | J #.$.%.@.+.&.O.K *.Z ", +" =.W @. .m -.@.;.W h ", +" =.:.>.@.,.<.-. "}; diff -ruN gimp-1.0.2/RPM/wilbur.xpm gimp-1.0.3/RPM/wilbur.xpm --- gimp-1.0.2/RPM/wilbur.xpm Wed Dec 31 16:00:00 1969 +++ gimp-1.0.3/RPM/wilbur.xpm Mon Apr 20 07:43:04 1998 @@ -0,0 +1,244 @@ +/* XPM */ +static char * wilbur_xpm[] = { +"66 50 191 2", +" c None", +". c #79E775D66185", +"X c #79E771C66185", +"o c #CF3CBEFB9E79", +"O c #79E771C65965", +"+ c #D75CCB2BB6DA", +"@ c #CF3CBEFBA699", +"# c #965892488617", +"$ c #71C66DB65965", +"% c #DF7DDB6CD75C", +"& c #BEFBB2CA9658", +"* c #BEFBB6DAA699", +"= c #BEFBAEBA9658", +"- c #B6DAAAAA8E38", +"; c #B6DAAEBA9658", +": c #71C669A65144", +"> c #71C669A65965", +", c #CF3CC71BB6DA", +"< c #B6DAA6998E38", +"1 c #AEBA9E798617", +"2 c #A6999E798E38", +"3 c #69A669A65144", +"4 c #69A669A65965", +"5 c #69A665955144", +"6 c #E79DDF7DDF7D", +"7 c #AEBAA6998E38", +"8 c #9E79924879E7", +"9 c #86177DF769A6", +"0 c #69A661855144", +"q c #9E79965879E7", +"w c #96588A2871C6", +"e c #C71BBEFBB6DA", +"r c #69A661854924", +"t c #618561855144", +"y c #CF3CC71BBEFB", +"u c #8E38820769A6", +"i c #79E779E76185", +"p c #BEFBBEFBBEFB", +"a c #61855D754924", +"s c #618559654924", +"d c #96588E3871C6", +"f c #861775D66185", +"g c #79E76DB65965", +"h c #9E7992488617", +"j c #A6999E799658", +"k c #71C671C66185", +"l c #DF7DDB6CDF7D", +"z c #A699965879E7", +"x c #9E798E3871C6", +"c c #8E38861771C6", +"v c #8617820771C6", +"b c #596555554103", +"n c #8E38861779E7", +"m c #CF3CCB2BC71B", +"M c #A6999A6979E7", +"N c #AEBAAEBAAEBA", +"B c #96588E388617", +"V c #596559654103", +"C c #AEBAAAAAAEBA", +"Z c #D75CD34CD75C", +"A c #B6DAAEBAA699", +"S c #596559654924", +"D c #596551444103", +"F c #C71BC30BBEFB", +"G c #861779E76185", +"H c #AEBAA699A699", +"J c #9E799A698E38", +"K c #514455554924", +"L c #8E388A288617", +"P c #C71BC71BC71B", +"I c #AEBAAAAAA699", +"U c #9658861771C6", +"Y c #8E387DF769A6", +"T c #A699A2899658", +"R c #9E799A699658", +"E c #9E7996588E38", +"W c #DF7DDF7DDF7D", +"Q c #514451444103", +"! c #965896589658", +"~ c #EFBEEBADEFBE", +"^ c #EFBEEFBEEFBE", +"/ c #F7DEF3CEF7DE", +"( c #FFFFFFFFFFFF", +") c #F7DEEFBEEFBE", +"_ c #CF3CCB2BBEFB", +"` c #9E79924871C6", +"' c #AEBAA6999658", +"] c #DF7DD75CD75C", +"[ c #F7DEF3CEEFBE", +"{ c #D75CD75CD75C", +"} c #AEBAA6999E79", +"| c #86177DF76185", +" . c #69A669A66185", +".. c #F7DEF7DEF7DE", +"X. c #E79DE38DDF7D", +"o. c #FFFFFBEEFFFF", +"O. c #D75CCF3CC71B", +"+. c #71C671C65965", +"@. c #51444D344103", +"#. c #51444D3438E3", +"$. c #5144492438E3", +"%. c #9E799E799E79", +"&. c #C71BC30BC71B", +"*. c #CF3CCF3CCF3C", +"=. c #FFFFF7DEF7DE", +"-. c #4924451438E3", +";. c #4924492438E3", +":. c #8E388A288E38", +">. c #B6DAB6DAB6DA", +",. c #618565956185", +"<. c #49244D344924", +"1. c #59655D755965", +"2. c #861782078617", +"3. c #B6DAB2CAB6DA", +"4. c #28A22CB228A2", +"5. c #B6DAB2CAAEBA", +"6. c #BEFBBAEAB6DA", +"7. c #E79DE79DE79D", +"8. c #EFBEEBADE79D", +"9. c #4103410330C2", +"0. c #4924410330C2", +"q. c #79E779E779E7", +"w. c #A699A289A699", +"e. c #514451445144", +"r. c #410345144103", +"t. c #38E338E338E3", +"y. c #28A228A228A2", +"u. c #208120812081", +"i. c #30C230C230C2", +"p. c #000000000000", +"a. c #9E799A699E79", +"s. c #69A669A669A6", +"d. c #208124922081", +"f. c #CF3CCB2BCF3C", +"g. c #41033CF330C2", +"h. c #410338E328A2", +"j. c #38E33CF328A2", +"k. c #71C671C671C6", +"l. c #492449244924", +"z. c #618561856185", +"x. c #861786178617", +"c. c #410341034103", +"v. c #186118611861", +"b. c #000004100000", +"n. c #104010401040", +"m. c #082008200820", +"M. c #38E338E328A2", +"N. c #38E33CF330C2", +"B. c #69A66DB669A6", +"V. c #79E77DF779E7", +"C. c #965892489658", +"Z. c #596559655965", +"A. c #38E338E330C2", +"S. c #492449244103", +"D. c #08200C300820", +"F. c #18611C711861", +"G. c #38E33CF338E3", +"H. c #514455555144", +"J. c #D75CD34CCF3C", +"K. c #104014511040", +"L. c #38E334D328A2", +"P. c #30C234D330C2", +"I. c #AEBAAAAA9E79", +"U. c #8E388E388E38", +"Y. c #A699A699A699", +"T. c #30C230C228A2", +"R. c #618561855965", +"E. c #38E334D330C2", +"W. c #71C675D671C6", +"Q. c #30C22CB228A2", +"!. c #4924410338E3", +"~. c #410338E330C2", +"^. c #71C671C669A6", +"/. c #208120811861", +"(. c #28A228A22081", +"). c #514455554103", +"_. c #186118611040", +"`. c #30C230C22081", +"'. c #20811C711861", +"]. c #41033CF338E3", +"[. c #596559655144", +"{. c #28A224922081", +"}. c #4103451438E3", +"|. c #186114511040", +" X c #10400C300820", +".X c #104010400820", +"XX c #082008200000", +"oX c #082004100000", +"OX c #BEFBBAEABEFB", +"+X c #A699A2899E79", +"@X c #492445144103", +" ", +" ", +" . ", +" X ", +" o O O ", +" + @ # O $ ", +" % & * O $ $ ", +" = - ; $ $ : > ", +" , < 1 2 $ > 3 4 5 ", +" 6 7 1 8 8 9 : : 5 5 0 ", +" * 2 q w w e 9 : 3 0 r t t ", +" y 2 q w u i p $ > 5 5 0 a s a ", +" % 7 q d u f g h j $ 5 5 0 a a s a k ", +" l * z x c 9 . $ v u $ $ 5 5 t a s b b n ", +" m M 8 w u f $ > 3 N B $ $ : 5 5 t a s V b b C ", +" Z A z x c 9 . g : 5 v # $ $ > : r r a s S b D 5 ", +" F M x w u G . O $ > $ 9 H y J $ > : : : 5 5 0 0 a a S b D K L ", +" P I 8 d U Y 9 G . . X . . . G G c T j R E E X 0 0 5 5 : 5 5 5 5 t t a a S s b b D a ", +" W y T q 8 d U Y 9 G G G . G G 9 G i . O O 4 5 0 r t r r a a a a a s b s b b D D Q Q ! ", +" ~ ^ / ( ) _ ` w c u 9 ' ] [ ( / { } | i . O > 3 0 t a a a a s b b b b b b Q D D D Q . ", +" ....( ( ( ( ( X.d U c ] ( ( ( ( ( ( o.O.| . +.$ 5 5 a s b b Q D Q @.Q @.#.$.@.Q @.#.b %. ", +" { o.~ ( ..{ &.*./ ( y w % ( ( ( ( ( ( o.=./ m . g : 5 r a s b D Q @.#.$.-.-.;.;.;.#.#.b :. ", +" >.,.<.<.1.2. ] [ ( p 3.4.4.5.( ^ 6.( ( ( o.7.*.P X./ / 8.T +.3 5 a s b D #.;.;.-.9.9.0.0.0.-.;.#.q. ", +" w.e.r.r.t.y.u.e.5.m z ( ( e.w.i.p.4.( ( X.( ( ( { a.s.d.,.f.~ X.e : : 5 a s b Q $.-.9.9.g.h.g.j.g.9.;.k. ", +" 3.l.z.x.x.s.l.4.u.c.$ x [ ( v.d.b.p.n.( 8.[ o.o.( ! >.3.i.m.q.7.l *.$ 5 0 a V D #.;.-.9.g.M.N.M.h.g.-.z.B.V. ", +" B.e.C.P p :.Z.A.d.d.S.X y ( ,.D.p.D.z.o.e ^ ......z.q.q.F.p.l.W { P 3 3 r s b D $.;.9.g.g.M.M.A.M.g.<.1.B.2. ", +" G.H.w.{ Z ! 1.t.y.4.t.Q w % l B.G.s.] J.U J./ / ..Z.v.K.p.p.e.{ f.H 5 t a V Q Q $.0.g.g.M.M.L.L.N.g.<.1.k. ", +" i.<.x.C w.q.<.P.i.P.G.l.X u e 7.o.7.e c c I.^ ^ ^ %.d.p.p.u.:.*.P B 0 a s b @.#.-.9.g.h.M.M.M.L.M.c.<.z.q. ", +" C u.G.s.2.q.Z.G.i.P.G.r.<.S G G G 9 u u 9 Y Y P ~ 7.Z ! <.l.U.&.&.a.5 0 r s b Q -.-.9.9.N.M.L.M.M.A.G.e.s. ", +" Y.d.i.e.z.Z.l.G.t.G.r.<.H.H.$ . . G G 9 9 9 9 9 6.W l l % l Z *.j $ r a a b D #.;.-.9.g.h.N.M.A.M.T.c.H.k. ", +" y.d.t.r.r.G.t.G.l.<.H.1.R.5 $ g . i G | | G G i T A P { *.5.# 5 0 0 s D Q @.;.-.0.g.g.M.M.L.M.E.i.r.z. ", +" i.u.i.P.t.G.c.r.e.Z.z.,.,.a 5 : $ O . G f . . X . X $ > $ 5 5 r t a S -.9.$.;.0.9.g.g.L.M.M.M.T.P.<.s. ", +" k.y.y.P.G.c.l.e.Z.z.,.k. .b a t 3 $ O O . O g O $ : 4 : 5 0 0 t s s @.L.g.-.-.9.g.h.L.L.M.M.L.d.t.H.W. ", +" G.i.t.c.l.e.Z.z.s.B.q. .D V s a 5 : $ +.+.$ : > 5 5 0 5 a a s V b Q.M.9.!.9.g.M.M.M.M.~.g.d.y.c.z.V. ", +" x.l.c.l.e.Z.z.s.k.q.V.S #.Q b V s t 5 : 5 5 5 5 r t t s s b V D 4.T.9.Q #.g.N.h.M.A.M.M.4.F.i.<.s. ", +" V.e.H.1.,.B.^.q.2.^.;.;.$.#.b D b a 0 a a a a s V s b b Q ;./.(.c.K 1.).h.M.L.M.M.M.T._.d.t.Z.q. ", +" P :.,.z.s.k.V.2.V.Z.-.-.-.;.$.Q D b s s S b V b D D Q @.`.'.4.].D ,.$ [.~.M.A.M.M.M._.v.i.l.R. ", +" w.2.^.q.2.s.).;.0.9.0.;.$.$.@.Q b Q Q #.@.Q Q -.{.'./.4.N.Q 5 . X -.N.M.M.L.M.F.K.u.t.Z. ", +" Z J 5 a s D ;.-.9.}.-.-.;.-.;.#.;.#.9.T./.F.'./.(.P.g.Q R.B.W.,.M.M.M.L.T.n.n.F.i.l.,. ", +" >.k g.`.(.T.T.T.T.T.`./.|._.K. X.X_.'./.Q.L.g.S.D a .> 5 g.M.~.M.(.n.n.F.4.c.1. ", +" .Q..X.Xm.XXXXXXoXXXD. XK.F./.(.P.N.;.Q 1.R.5 5 R.N.N.j.T.K.D.n.F.y.G.H. ", +" OX a.R.P._.D.D.m.D.K._./.(.P.M.}.#.H.a ,.,.a ;.~.Q.F.D.D.n._.u.4.].H.B. ", +" +XC.V.B.1.G.T./.d.{.T.M.].-.@.[.t t Q ].u._.m.D.D.n.K.v.d.i.r.Z.k. ", +" :.W.,.H.r.t.4.u.v.K.K.n.D.m.D.D.D.D.D.D.n.K.v.F.y.i.G.l. ", +" x.k.,.e.@Xt.i.y.d.F.F.v.v.v.v.v.v.F.u.u.{.4.P. ", +" x.q.s.1.<.r.G.t.i.i.i.4.4.4.i.i.i.P.G.c. ", +" x.W.B.z.Z.H.e.<.<.l.l.<.l.<.e.H. ", +" 2.q.W.k.B.k.B.B.B. ", +" ! C.! ", +" "}; diff -ruN gimp-1.0.2/aclocal.m4 gimp-1.0.3/aclocal.m4 --- gimp-1.0.2/aclocal.m4 Tue Oct 13 16:50:01 1998 +++ gimp-1.0.3/aclocal.m4 Mon Mar 29 12:52:09 1999 @@ -1,7 +1,7 @@ -dnl aclocal.m4 generated automatically by aclocal 1.3 +dnl aclocal.m4 generated automatically by aclocal 1.4 -dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -dnl This Makefile.in is free software; the Free Software Foundation +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -20,7 +20,7 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AM_PROG_INSTALL]) +[AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -30,8 +30,8 @@ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) AC_REQUIRE([AM_SANITY_CHECK]) AC_REQUIRE([AC_ARG_PROGRAM]) dnl FIXME This is truly gross. @@ -43,15 +43,6 @@ AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AC_REQUIRE([AC_PROG_MAKE_SET])]) - -# serial 1 - -AC_DEFUN(AM_PROG_INSTALL, -[AC_REQUIRE([AC_PROG_INSTALL]) -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' -AC_SUBST(INSTALL_SCRIPT)dnl -]) - # # Check to make sure that the build environment is sane. # @@ -135,15 +126,18 @@ changequote([,]))]) -# serial 24 AM_PROG_LIBTOOL +# serial 29 AM_PROG_LIBTOOL AC_DEFUN(AM_PROG_LIBTOOL, [AC_REQUIRE([AM_ENABLE_SHARED])dnl AC_REQUIRE([AM_ENABLE_STATIC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AM_PROG_LD])dnl AC_REQUIRE([AM_PROG_NM])dnl +AC_REQUIRE([AM_SYS_NM_PARSE])dnl +AC_REQUIRE([AM_SYS_SYMBOL_UNDERSCORE])dnl AC_REQUIRE([AC_PROG_LN_S])dnl dnl # Always use our own libtool. @@ -182,16 +176,45 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; + +*-*-cygwin32*) + AM_SYS_LIBTOOL_CYGWIN32 ;; + esac +# enable the --disable-libtool-lock switch + +AC_ARG_ENABLE(libtool-lock, +[ --disable-libtool-lock force libtool not to do file locking], +need_locks=$enableval, +need_locks=yes) + +if test x"$need_locks" = xno; then + libtool_flags="$libtool_flags --disable-lock" +fi + + # Actually configure libtool. ac_aux_dir is where install-sh is found. CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ +DLLTOOL="$DLLTOOL" AS="$AS" \ +${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || AC_MSG_ERROR([libtool configure failed]) + +# Redirect the config.log output again, so that the ltconfig log is not +# clobbered by the next message. +exec 5>>./config.log ]) # AM_ENABLE_SHARED - implement the --enable-shared flag @@ -202,10 +225,8 @@ [define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(shared, changequote(<<, >>)dnl -<< --enable-shared build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT] +<< --enable-shared[=PKGS] build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT], changequote([, ])dnl -[ --enable-shared=PKGS only build shared libraries if the current package - appears as an element in the PKGS list], [p=${PACKAGE-default} case "$enableval" in yes) enable_shared=yes ;; @@ -241,10 +262,8 @@ [define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(static, changequote(<<, >>)dnl -<< --enable-static build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT] +<< --enable-static[=PKGS] build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT], changequote([, ])dnl -[ --enable-static=PKGS only build shared libraries if the current package - appears as an element in the PKGS list], [p=${PACKAGE-default} case "$enableval" in yes) enable_static=yes ;; @@ -270,17 +289,59 @@ [AC_ARG_WITH(gnu-ld, [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC]) +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by GCC]) ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in - # Accept absolute paths. - /* | [A-Za-z]:\\*) - test -z "$LD" && LD="$ac_prog" - ;; + # Accept absolute paths. +changequote(,)dnl + /* | [A-Za-z]:/*) + # Canonicalize the path of ld + re_direlt='/[^/][^/]*/\.\./' + sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%' +changequote([,])dnl + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + case "$host_os" in + cygwin*) + # Convert to a UNC path for cygwin + test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"` + ;; + *) + test -z "$LD" && LD="$ac_prog" + ;; + esac + ;; + ## + ## FIXME: The code fails later on if we try to use an $LD with + ## '\\' path separators. + ## +changequote(,)dnl + [A-Za-z]:[\\]*) + # Canonicalize the path of ld + re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)' + sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%' +changequote([,])dnl + sub_uncdir='s%\\%/%g' + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"` + done + case "$host_os" in + cygwin*) + # Convert to a UNC path for cygwin + test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"` + ;; + *) + test -z "$LD" && LD="$ac_prog" + ;; + esac + ;; "") # If it fails, then pretend we aren't using GCC. ac_prog=ld @@ -341,11 +402,10 @@ AC_DEFUN(AM_PROG_NM, [AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(ac_cv_path_NM, -[case "$NM" in -/* | [A-Za-z]:\\*) - ac_cv_path_NM="$NM" # Let the user override the test with a path. - ;; -*) +[if test -n "$NM"; then + # Let the user override the test. + ac_cv_path_NM="$NM" +else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do test -z "$ac_dir" && ac_dir=. @@ -365,13 +425,228 @@ done IFS="$ac_save_ifs" test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm - ;; -esac]) +fi]) NM="$ac_cv_path_NM" AC_MSG_RESULT([$NM]) AC_SUBST(NM) ]) +# AM_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed +# by C symbol name from nm. +AC_DEFUN(AM_SYS_NM_PARSE, +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AM_PROG_NM])dnl +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output]) +AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe, +[# These are sane defaults that work on at least a few old systems. +# {They come from Ultrix. What could be older than Ultrix?!! ;)} + +changequote(,)dnl +# Character class describing NM global symbol codes. +ac_symcode='[BCDEGRSTU]' + +# Regexp to match symbols that can be accessed directly from C. +ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + +# Transform the above into a raw symbol and a C symbol. +ac_symxfrm='\1 \1' + +# Define system-specific variables. +case "$host_os" in +aix*) + ac_symcode='[BCDTU]' + ;; +sunos* | cygwin32* | mingw32*) + ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)' + ac_symxfrm='_\1 \1' + ;; +irix*) + # Cannot use undefined symbols on IRIX because inlined functions mess us up. + ac_symcode='[BCDEGRST]' + ;; +solaris*) + ac_symcode='[BDTU]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then + ac_symcode='[ABCDGISTUW]' +fi + +case "$host_os" in +cygwin32* | mingw32*) + # We do not want undefined symbols on cygwin32. The user must + # arrange to define them via -l arguments. + ac_symcode='[ABCDGISTW]' + ;; +esac +changequote([,])dnl + +# Write the raw and C identifiers. +ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'" + +# Check to see that the pipe works correctly. +ac_pipe_works=no +cat > conftest.$ac_ext < $ac_nlist) && test -s "$ac_nlist"; then + + # Try sorting and uniquifying the output. + if sort "$ac_nlist" | uniq > "$ac_nlist"T; then + mv -f "$ac_nlist"T "$ac_nlist" + ac_wcout=`wc "$ac_nlist" 2>/dev/null` +changequote(,)dnl + ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'` +changequote([,])dnl + (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1 + else + rm -f "$ac_nlist"T + ac_count=-1 + fi + + # Make sure that we snagged all the symbols we need. + if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then + if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then + cat < conftest.c +#ifdef __cplusplus +extern "C" { +#endif + +EOF + # Now generate the symbol file. + sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c + + cat <> conftest.c +#if defined (__STDC__) && __STDC__ +# define __ptr_t void * +#else +# define __ptr_t char * +#endif + +/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */ +int dld_preloaded_symbol_count = $ac_count; + +/* The mapping between symbol names and symbols. */ +struct { + char *name; + __ptr_t address; +} +changequote(,)dnl +dld_preloaded_symbols[] = +changequote([,])dnl +{ +EOF + sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c + cat <<\EOF >> conftest.c + {0, (__ptr_t) 0} +}; + +#ifdef __cplusplus +} +#endif +EOF + # Now try linking the two files. + mv conftest.$ac_objext conftestm.$ac_objext + ac_save_LIBS="$LIBS" + ac_save_CFLAGS="$CFLAGS" + LIBS="conftestm.$ac_objext" + CFLAGS="$CFLAGS$no_builtin_flag" + if AC_TRY_EVAL(ac_link) && test -s conftest; then + ac_pipe_works=yes + else + echo "configure: failed program was:" >&AC_FD_CC + cat conftest.c >&AC_FD_CC + fi + LIBS="$ac_save_LIBS" + CFLAGS="$ac_save_CFLAGS" + else + echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC + fi + else + echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC + fi + else + echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC + fi +else + echo "$progname: failed program was:" >&AC_FD_CC + cat conftest.c >&AC_FD_CC +fi +rm -rf conftest* + +# Do not use the global_symbol_pipe unless it works. +test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe= +]) + +ac_result=yes +if test -z "$ac_cv_sys_global_symbol_pipe"; then + ac_result=no +fi +AC_MSG_RESULT($ac_result) +]) + +# AM_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32 +AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN32, +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +AC_CHECK_TOOL(AS, as, false) +]) + +# AM_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols +# with an underscore? +AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, +[AC_REQUIRE([AM_PROG_NM])dnl +AC_REQUIRE([AM_SYS_NM_PARSE])dnl +AC_MSG_CHECKING([for _ prefix in compiled symbols]) +AC_CACHE_VAL(ac_cv_sys_symbol_underscore, +[ac_cv_sys_symbol_underscore=no +cat > conftest.$ac_ext < $ac_nlist) && test -s "$ac_nlist"; then + # See whether the symbols have a leading underscore. + if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then + ac_cv_sys_symbol_underscore=yes + else + if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then + : + else + echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC + fi + fi + else + echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC + fi +else + echo "configure: failed program was:" >&AC_FD_CC + cat conftest.c >&AC_FD_CC +fi +rm -rf conftest* +]) +AC_MSG_RESULT($ac_cv_sys_symbol_underscore) +if test x$ac_cv_sys_symbol_underscore = xyes; then + AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1, + [define if compiled symbols have a leading underscore]) +fi +]) + # Add --enable-maintainer-mode option to configure. # From Jim Meyering @@ -386,19 +661,29 @@ USE_MAINTAINER_MODE=$enableval, USE_MAINTAINER_MODE=no) AC_MSG_RESULT($USE_MAINTAINER_MODE) - if test $USE_MAINTAINER_MODE = yes; then - MAINT= - else - MAINT='#M#' - fi + AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) + MAINT=$MAINTAINER_MODE_TRUE AC_SUBST(MAINT)dnl ] ) +# Define a conditional. + +AC_DEFUN(AM_CONDITIONAL, +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + # Configure paths for GTK+ # Owen Taylor 97-11-3 -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS dnl AC_DEFUN(AM_PATH_GTK, @@ -412,6 +697,15 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], , enable_gtktest=yes) + for module in . $4 + do + case "$module" in + gthread) + gtk_config_args="$gtk_config_args gthread" + ;; + esac + done + if test x$gtk_config_exec_prefix != x ; then gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" if test x${GTK_CONFIG+set} != xset ; then @@ -444,7 +738,7 @@ ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" + LIBS="$GTK_LIBS $LIBS" dnl dnl Now check if the installed GTK is sufficiently new. (Also sanity dnl checks the results of gtk-config to some extent diff -ruN gimp-1.0.2/app/Makefile.am gimp-1.0.3/app/Makefile.am --- gimp-1.0.2/app/Makefile.am Sat May 2 14:50:23 1998 +++ gimp-1.0.3/app/Makefile.am Sat Jan 2 15:11:49 1999 @@ -287,7 +287,8 @@ CPPFLAGS = \ -DLIBDIR=\""$(gimpplugindir)"\" \ -DDATADIR=\""$(gimpdatadir)"\" \ - -DGIMPDIR=\""$(gimpdir)"\" + -DGIMPDIR=\""$(gimpdir)"\" \ + -DREGEX_MALLOC INCLUDES = \ $(X_CFLAGS) \ diff -ruN gimp-1.0.2/app/Makefile.in gimp-1.0.3/app/Makefile.in --- gimp-1.0.2/app/Makefile.in Wed Oct 14 20:31:37 1998 +++ gimp-1.0.3/app/Makefile.in Mon Mar 29 13:15:07 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -115,306 +118,27 @@ palettedata = @palettedata@ patterndata = @patterndata@ -scriptdata = +scriptdata = bin_PROGRAMS = gimp -gimp_SOURCES = \ - about_dialog.c \ - about_dialog.h \ - actionarea.c \ - actionarea.h \ - airbrush.c \ - airbrush.h \ - app_procs.c \ - app_procs.h \ - appenv.h \ - asupsample.c \ - asupsample.h \ - batch.c \ - batch.h \ - bezier_select.c \ - bezier_select.h \ - bezier_selectP.h \ - blend.c \ - blend.h \ - boundary.c \ - boundary.h \ - brightness_contrast.c \ - brightness_contrast.h \ - brush_header.h \ - brush_select.c \ - brush_select.h \ - brushes.c \ - brushes.h \ - bucket_fill.c \ - bucket_fill.h \ - buildmenu.c \ - buildmenu.h \ - by_color_select.c \ - by_color_select.h \ - channel.c \ - channel.h \ - channel_pvt.h \ - channel_cmds.c \ - channel_cmds.h \ - channels_dialog.c \ - channels_dialog.h \ - channel_ops.c \ - channel_ops.h \ - clone.c \ - clone.h \ - color_area.c \ - color_area.h \ - color_balance.c \ - color_balance.h \ - color_panel.c \ - color_panel.h \ - color_picker.c \ - color_picker.h \ - color_select.c \ - color_select.h \ - color_transfer.c \ - color_transfer.h \ - colormaps.c \ - colormaps.h \ - commands.c \ - commands.h \ - convert.c \ - convert.h \ - convolve.c \ - convolve.h \ - crop.c \ - crop.h \ - cursorutil.c \ - cursorutil.h \ - curves.c \ - curves.h \ - datafiles.c \ - datafiles.h \ - desaturate.c \ - desaturate.h \ - dialog_types.h \ - disp_callbacks.c \ - disp_callbacks.h \ - draw_core.c \ - draw_core.h \ - drawable.c \ - drawable.h \ - drawable_pvt.h \ - drawable_cmds.c \ - drawable_cmds.h \ - edit_cmds.c \ - edit_cmds.h \ - edit_selection.c \ - edit_selection.h \ - ellipse_select.c \ - ellipse_select.h \ - eraser.c \ - eraser.h \ - errors.c \ - errors.h \ - equalize.c \ - equalize.h \ - fileops.c \ - fileops.h \ - flip_tool.c \ - flip_tool.h \ - floating_sel.c \ - floating_sel.h \ - floating_sel_cmds.c \ - floating_sel_cmds.h \ - frac.c \ - frac.h \ - free_select.c \ - free_select.h \ - fsdither.h \ - fuzzy_select.c \ - fuzzy_select.h \ - gdisplay.c \ - gdisplay.h \ - gdisplayP.h \ - gdisplay_cmds.c \ - gdisplay_cmds.h \ - gdisplay_ops.c \ - gdisplay_ops.h \ - general.c \ - general.h \ - gimage.c \ - gimage.h \ - gimage_cmds.c \ - gimage_cmds.h \ - gimage_mask.c \ - gimage_mask.h \ - gimage_mask_cmds.c \ - gimage_mask_cmds.h \ - gimprc.c \ - gimprc.h \ - global_edit.c \ - global_edit.h \ - gradient.c \ - gradient.h \ - gximage.c \ - gximage.h \ - histogram.c \ - histogram.h \ - histogram_tool.c \ - histogram_tool.h \ - hue_saturation.c \ - hue_saturation.h \ - image_map.c \ - image_map.h \ - image_render.c \ - image_render.h \ - indexed_palette.c \ - indexed_palette.h \ - info_dialog.c \ - info_dialog.h \ - info_window.c \ - info_window.h \ - install.c \ - install.h \ - interface.c \ - interface.h \ - internal_procs.c \ - internal_procs.h \ - invert.c \ - invert.h \ - iscissors.c \ - iscissors.h \ - layer.c \ - layer.h \ - layer_pvt.h \ - layer_cmds.c \ - layer_cmds.h \ - layer_select.c \ - layer_select.h \ - layers_dialog.c \ - layers_dialog.h \ - layers_dialogP.h \ - levels.c \ - levels.h \ - magnify.c \ - magnify.h \ - main.c \ - marching_ants.h \ - menus.c \ - menus.h \ - move.c \ - move.h \ - ops_buttons.c \ - ops_buttons.h \ - palette.c \ - palette.h \ - paint_core.c \ - paint_core.h \ - paint_funcs.c \ - paint_funcs.h \ - paintbrush.c \ - paintbrush.h \ - pattern_header.h \ - pattern_select.c \ - pattern_select.h \ - patterns.c \ - patterns.h \ - pencil.c \ - pencil.h \ - perspective_tool.c \ - perspective_tool.h \ - pixel_region.c \ - pixel_region.h \ - pixmaps.h \ - plug_in.c \ - plug_in.h \ - posterize.c \ - posterize.h \ - procedural_db.c \ - procedural_db.h \ - rect_select.c \ - rect_select.h \ - rect_selectP.h \ - regex.h \ - regex.c \ - resize.c \ - resize.h \ - rotate_tool.c \ - rotate_tool.h \ - scale.c \ - scale.h \ - scale_tool.c \ - scale_tool.h \ - scroll.c \ - scroll.h \ - selection.c \ - selection.h \ - shear_tool.c \ - shear_tool.h \ - temp_buf.c \ - temp_buf.h \ - text_tool.c \ - text_tool.h \ - threshold.c \ - threshold.h \ - tile.c \ - tile.h \ - tile_cache.c \ - tile_cache.h \ - tile_manager.c \ - tile_manager.h \ - tile_manager_pvt.h \ - tile_swap.c \ - tile_swap.h \ - tips_dialog.c \ - tips_dialog.h \ - tools.c \ - tools.h \ - transform_core.c \ - transform_core.h \ - transform_tool.c \ - transform_tool.h \ - undo.c \ - undo.h \ - undo_cmds.c \ - undo_cmds.h \ - wilber.h \ - xcf.c \ - xcf.h - -EXTRA_DIST = \ - tools/channel.xbm \ - tools/eye.xbm \ - tools/layer.xbm \ - tools/linked.xbm \ - tools/mask.xbm \ - tools/anchor.xpm \ - tools/anchor_is.xpm \ - tools/delete.xpm \ - tools/delete_is.xpm \ - tools/duplicate.xpm \ - tools/duplicate_is.xpm \ - tools/lower.xpm \ - tools/lower_is.xpm \ - tools/new.xpm \ - tools/new_is.xpm \ - tools/raise.xpm \ - tools/raise_is.xpm - -CPPFLAGS = \ - -DLIBDIR=\""$(gimpplugindir)"\" \ - -DDATADIR=\""$(gimpdatadir)"\" \ - -DGIMPDIR=\""$(gimpdir)"\" - -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -gimp_LDADD = \ - $(top_builddir)/libgimp/libgimpi.a \ - $(X_LIBS) +gimp_SOURCES = about_dialog.c about_dialog.h actionarea.c actionarea.h airbrush.c airbrush.h app_procs.c app_procs.h appenv.h asupsample.c asupsample.h batch.c batch.h bezier_select.c bezier_select.h bezier_selectP.h blend.c blend.h boundary.c boundary.h brightness_contrast.c brightness_contrast.h brush_header.h brush_select.c brush_select.h brushes.c brushes.h bucket_fill.c bucket_fill.h buildmenu.c buildmenu.h by_color_select.c by_color_select.h channel.c channel.h channel_pvt.h channel_cmds.c channel_cmds.h channels_dialog.c channels_dialog.h channel_ops.c channel_ops.h clone.c clone.h color_area.c color_area.h color_balance.c color_balance.h color_panel.c color_panel.h color_picker.c color_picker.h color_select.c color_select.h color_transfer.c color_transfer.h colormaps.c colormaps.h commands.c commands.h convert.c convert.h convolve.c convolve.h crop.c crop.h cursorutil.c cursorutil.h curves.c curves.h datafiles.c datafiles.h desaturate.c desaturate.h dialog_types.h disp_callbacks.c disp_callbacks.h draw_core.c draw_core.h drawable.c drawable.h drawable_pvt.h drawable_cmds.c drawable_cmds.h edit_cmds.c edit_cmds.h edit_selection.c edit_selection.h ellipse_select.c ellipse_select.h eraser.c eraser.h errors.c errors.h equalize.c equalize.h fileops.c fileops.h flip_tool.c flip_tool.h floating_sel.c floating_sel.h floating_sel_cmds.c floating_sel_cmds.h frac.c frac.h free_select.c free_select.h fsdither.h fuzzy_select.c fuzzy_select.h gdisplay.c gdisplay.h gdisplayP.h gdisplay_cmds.c gdisplay_cmds.h gdisplay_ops.c gdisplay_ops.h general.c general.h gimage.c gimage.h gimage_cmds.c gimage_cmds.h gimage_mask.c gimage_mask.h gimage_mask_cmds.c gimage_mask_cmds.h gimprc.c gimprc.h global_edit.c global_edit.h gradient.c gradient.h gximage.c gximage.h histogram.c histogram.h histogram_tool.c histogram_tool.h hue_saturation.c hue_saturation.h image_map.c image_map.h image_render.c image_render.h indexed_palette.c indexed_palette.h info_dialog.c info_dialog.h info_window.c info_window.h install.c install.h interface.c interface.h internal_procs.c internal_procs.h invert.c invert.h iscissors.c iscissors.h layer.c layer.h layer_pvt.h layer_cmds.c layer_cmds.h layer_select.c layer_select.h layers_dialog.c layers_dialog.h layers_dialogP.h levels.c levels.h magnify.c magnify.h main.c marching_ants.h menus.c menus.h move.c move.h ops_buttons.c ops_buttons.h palette.c palette.h paint_core.c paint_core.h paint_funcs.c paint_funcs.h paintbrush.c paintbrush.h pattern_header.h pattern_select.c pattern_select.h patterns.c patterns.h pencil.c pencil.h perspective_tool.c perspective_tool.h pixel_region.c pixel_region.h pixmaps.h plug_in.c plug_in.h posterize.c posterize.h procedural_db.c procedural_db.h rect_select.c rect_select.h rect_selectP.h regex.h regex.c resize.c resize.h rotate_tool.c rotate_tool.h scale.c scale.h scale_tool.c scale_tool.h scroll.c scroll.h selection.c selection.h shear_tool.c shear_tool.h temp_buf.c temp_buf.h text_tool.c text_tool.h threshold.c threshold.h tile.c tile.h tile_cache.c tile_cache.h tile_manager.c tile_manager.h tile_manager_pvt.h tile_swap.c tile_swap.h tips_dialog.c tips_dialog.h tools.c tools.h transform_core.c transform_core.h transform_tool.c transform_tool.h undo.c undo.h undo_cmds.c undo_cmds.h wilber.h xcf.c xcf.h + + +EXTRA_DIST = tools/channel.xbm tools/eye.xbm tools/layer.xbm tools/linked.xbm tools/mask.xbm tools/anchor.xpm tools/anchor_is.xpm tools/delete.xpm tools/delete_is.xpm tools/duplicate.xpm tools/duplicate_is.xpm tools/lower.xpm tools/lower_is.xpm tools/new.xpm tools/new_is.xpm tools/raise.xpm tools/raise_is.xpm + + +CPPFLAGS = -DLIBDIR=\""$(gimpplugindir)"\" -DDATADIR=\""$(gimpdatadir)"\" -DGIMPDIR=\""$(gimpdir)"\" -DREGEX_MALLOC + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +gimp_LDADD = $(top_builddir)/libgimp/libgimpi.a $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpi.a -DEPS = \ - $(top_builddir)/libgimp/libgimpi.a gimp_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -453,24 +177,24 @@ undo_cmds.o xcf.o gimp_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in TODO DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gimp_SOURCES) OBJECTS = $(gimp_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps app/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -492,15 +216,15 @@ $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -548,8 +272,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -578,9 +306,13 @@ $(mkinstalldirs) $(distdir)/tools @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done about_dialog.o: about_dialog.c ../libgimp/gimpfeatures.h about_dialog.h \ interface.h ../config.h @@ -1153,68 +885,78 @@ tile_swap.h xcf.h frac.h drawable_pvt.h layer_pvt.h \ channel_pvt.h tile_manager_pvt.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: install-binPROGRAMS - @$(NORMAL_INSTALL) - -install-data: - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-binPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: install-binPROGRAMS +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-binPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ + clean-generic mostlyclean-am -distclean: distclean-binPROGRAMS distclean-compile distclean-libtool \ - distclean-tags distclean-generic clean - -rm -f config.status +clean: clean-am + +distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ + distclean-tags distclean-generic clean-am -rm -f libtool -maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ - maintainer-clean-libtool maintainer-clean-tags \ - maintainer-clean-generic distclean +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-binPROGRAMS \ + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-generic \ + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/app/app_procs.c gimp-1.0.3/app/app_procs.c --- gimp-1.0.2/app/app_procs.c Wed Jul 15 01:12:17 1998 +++ gimp-1.0.3/app/app_procs.c Fri Mar 26 22:15:31 1999 @@ -62,15 +62,15 @@ #include "config.h" #define LOGO_WIDTH_MIN 350 -#define LOGO_HEIGHT_MIN 110 +#define LOGO_HEIGHT_MIN 110 #define NAME "The GIMP" #define BROUGHT "brought to you by" -#define AUTHORS "Spencer Kimball and Peter Mattis" - +#define AUTHORS "Spencer Kimball and Peter Mattis" + #define SHOW_NEVER 0 #define SHOW_LATER 1 #define SHOW_NOW 2 - + /* Function prototype for affirmation dialog when exiting application */ static void really_quit_dialog (void); static Argument* quit_invoker (Argument *args); @@ -252,7 +252,7 @@ gdk_draw_string (widget->window, font, widget->style->fg_gc[GTK_STATE_NORMAL], - ((logo_area_width - gdk_string_width (font, NAME)) / 2), + ((logo_area_width - gdk_string_width (font, NAME)) / 2), (0.25 * logo_area_height), NAME); @@ -260,27 +260,21 @@ gdk_draw_string (widget->window, font, widget->style->fg_gc[GTK_STATE_NORMAL], - ((logo_area_width - gdk_string_width (font, GIMP_VERSION)) / 2), + ((logo_area_width - gdk_string_width (font, GIMP_VERSION)) / 2), (0.45 * logo_area_height), GIMP_VERSION); gdk_draw_string (widget->window, font, widget->style->fg_gc[GTK_STATE_NORMAL], - ((logo_area_width - gdk_string_width (font, BROUGHT)) / 2), + ((logo_area_width - gdk_string_width (font, BROUGHT)) / 2), (0.65 * logo_area_height), BROUGHT); gdk_draw_string (widget->window, font, widget->style->fg_gc[GTK_STATE_NORMAL], - ((logo_area_width - gdk_string_width (font, AUTHORS)) / 2), + ((logo_area_width - gdk_string_width (font, AUTHORS)) / 2), (0.80 * logo_area_height), AUTHORS); - /* - * This is a hack: we try to compute a good guess for the maximum number - * of charcters that will fit into the splash-screen using the given font - */ - max_label_length = (float)strlen (AUTHORS) * - ( (float)logo_area_width / (float)gdk_string_width (font, AUTHORS) ); } static void @@ -288,7 +282,7 @@ { gdk_draw_pixmap (widget->window, widget->style->black_gc, - logo_pixmap, + logo_pixmap, 0, 0, ((logo_area_width - logo_width) / 2), ((logo_area_height - logo_height) / 2), logo_width, logo_height); @@ -298,7 +292,7 @@ splash_logo_expose (GtkWidget *widget) { switch (show_logo) { - case SHOW_NEVER: + case SHOW_NEVER: case SHOW_LATER: splash_text_draw (widget); break; @@ -311,7 +305,6 @@ static GtkWidget *label1 = NULL; static GtkWidget *label2 = NULL; static GtkWidget *pbar = NULL; -static gint idle_tag = -1; static void destroy_initialization_status_window(void) @@ -323,7 +316,6 @@ gdk_pixmap_unref(logo_pixmap); win_initstatus = label1 = label2 = pbar = logo_area = NULL; logo_pixmap = NULL; - gtk_idle_remove(idle_tag); } } @@ -335,6 +327,7 @@ if (no_splash == FALSE) { GtkWidget *vbox; + GtkStyle *style; win_initstatus = gtk_window_new(GTK_WINDOW_DIALOG); gtk_signal_connect (GTK_OBJECT (win_initstatus), "delete_event", @@ -344,7 +337,7 @@ gtk_window_set_title(GTK_WINDOW(win_initstatus), "GIMP Startup"); - if (no_splash_image == FALSE && splash_logo_load_size (win_initstatus)) + if (no_splash_image == FALSE && splash_logo_load_size (win_initstatus)) { show_logo = SHOW_LATER; } @@ -371,22 +364,30 @@ gtk_box_pack_start_defaults(GTK_BOX(vbox), label1); label2 = gtk_label_new(""); gtk_box_pack_start_defaults(GTK_BOX(vbox), label2); - + pbar = gtk_progress_bar_new(); gtk_box_pack_start_defaults(GTK_BOX(vbox), pbar); - + gtk_widget_show(vbox); gtk_widget_show (logo_area); gtk_widget_show(label1); gtk_widget_show(label2); gtk_widget_show(pbar); - + gtk_window_position(GTK_WINDOW(win_initstatus), GTK_WIN_POS_CENTER); - + gtk_widget_show(win_initstatus); gtk_window_set_policy (GTK_WINDOW (win_initstatus), FALSE, TRUE, FALSE); + /* + * This is a hack: we try to compute a good guess for the maximum + * number of charcters that will fit into the splash-screen using + * the default_font + */ + style = gtk_widget_get_style (win_initstatus); + max_label_length = 0.95 * (float)strlen (AUTHORS) * + ( (float)logo_area_width / (float)gdk_string_width (style->font, AUTHORS) ); } } } @@ -419,15 +420,21 @@ } gtk_label_set(GTK_LABEL(label2), label2val); } - if(pct_progress >= 0 - && GTK_PROGRESS_BAR(pbar)->percentage != pct_progress) + if (pct_progress >= 0.0 && pct_progress <= 1.0 && + gtk_progress_get_current_percentage(&(GTK_PROGRESS_BAR(pbar)->progress)) != pct_progress) + /* + GTK_PROGRESS_BAR(pbar)->percentage != pct_progress) + */ { gtk_progress_bar_update(GTK_PROGRESS_BAR(pbar), pct_progress); } gtk_widget_draw(win_initstatus, &area); - idle_tag = gtk_idle_add((GtkFunction) gtk_true, NULL); - gtk_main_iteration(); - gtk_idle_remove(idle_tag); + while (gtk_events_pending()) + gtk_main_iteration(); + /* We sync here to make sure things get drawn before continuing, + * is the improved look worth the time? I'm not sure... + */ + gdk_flush(); } } @@ -456,7 +463,7 @@ if (no_interface == FALSE && no_splash == FALSE && win_initstatus) { splash_text_draw (logo_area); } - + /* * Initialize the procedural database * We need to do this first because any of the init @@ -559,8 +566,8 @@ pattern_select_dialog_free (); palette_free (); paint_funcs_free (); - procedural_db_free (); plug_in_kill (); + procedural_db_free (); menus_quit (); tile_swap_exit (); @@ -611,7 +618,7 @@ static gint really_quit_delete_callback (GtkWidget *widget, GdkEvent *event, - gpointer client_data) + gpointer client_data) { really_quit_cancel_callback (widget, (GtkWidget *) client_data); @@ -637,7 +644,7 @@ gtk_signal_connect (GTK_OBJECT (dialog), "delete_event", (GtkSignalFunc) really_quit_delete_callback, dialog); - + button = gtk_button_new_with_label ("Yes"); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", diff -ruN gimp-1.0.2/app/brushes.c gimp-1.0.3/app/brushes.c --- gimp-1.0.2/app/brushes.c Thu May 28 02:02:55 1998 +++ gimp-1.0.3/app/brushes.c Fri Mar 26 22:15:33 1999 @@ -58,7 +58,7 @@ static void load_brush (char *filename); static void free_brush (GBrushP); static void brushes_free_one (gpointer, gpointer); -static gint brush_compare_func (gpointer, gpointer); +static gint brush_compare_func (gconstpointer, gconstpointer); /* function declarations */ void @@ -91,18 +91,18 @@ list = g_slist_next(list); if(list) { GBrushP gb2 = (GBrushP)list->data; - + if(gb_start == NULL) { gb_start = gb; } - + if(gb_start->name && gb2->name && (strcmp(gb_start->name,gb2->name) == 0)) { - + gint b_digits = 2; gint gb_tmp_cnt = gb_count++; - + /* Alter gb2... */ g_free(gb2->name); while((gb_tmp_cnt /= 10) > 0) @@ -116,8 +116,8 @@ gb_start = gb2; gb_count = 0; } - } - } + } + } } @@ -129,7 +129,7 @@ static gint -brush_compare_func (gpointer first, gpointer second) +brush_compare_func (gconstpointer first, gconstpointer second) { return strcmp (((GBrushP)first)->name, ((GBrushP)second)->name); } @@ -370,7 +370,7 @@ else gdk_window_raise(brush_select_dialog->shell->window); } - + } @@ -460,10 +460,10 @@ brushes_refresh_brush_invoker (Argument *args) { - /* FIXME: I've hardcoded success to be 1, because brushes_init() is a - * void function right now. It'd be nice if it returned a value at + /* FIXME: I've hardcoded success to be 1, because brushes_init() is a + * void function right now. It'd be nice if it returned a value at * some future date, so we could tell if things blew up when reparsing - * the list (for whatever reason). + * the list (for whatever reason). * - Seth "Yes, this is a kludge" Burgess * */ @@ -526,7 +526,7 @@ "gimp_brushes_refresh", "Refresh current brushes", "This procedure retrieves all brushes currently in the user's brush path " - "and updates the brush dialog accordingly.", + "and updates the brush dialog accordingly.", "Seth Burgess", "Seth Burgess", "1997", diff -ruN gimp-1.0.2/app/buildmenu.c gimp-1.0.3/app/buildmenu.c --- gimp-1.0.2/app/buildmenu.c Sun Apr 12 22:36:59 1998 +++ gimp-1.0.3/app/buildmenu.c Thu Mar 11 18:16:29 1999 @@ -21,13 +21,13 @@ GtkWidget * build_menu (MenuItem *items, - GtkAcceleratorTable *table) + GtkAccelGroup *accel_group) { GtkWidget *menu; GtkWidget *menu_item; menu = gtk_menu_new (); - gtk_menu_set_accelerator_table (GTK_MENU (menu), table); + gtk_menu_set_accel_group (GTK_MENU (menu), accel_group); while (items->label) { @@ -41,12 +41,13 @@ menu_item = gtk_menu_item_new_with_label (items->label); gtk_container_add (GTK_CONTAINER (menu), menu_item); - if (items->accelerator_key && table) - gtk_widget_install_accelerator (menu_item, - table, - "activate", - items->accelerator_key, - items->accelerator_mods); + if (items->accelerator_key && accel_group) + gtk_widget_add_accelerator (menu_item, + "activate", + accel_group, + items->accelerator_key, + items->accelerator_mods, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); } if (items->callback) @@ -55,7 +56,7 @@ items->user_data); if (items->subitems) - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), build_menu (items->subitems, table)); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), build_menu (items->subitems, accel_group)); gtk_widget_show (menu_item); items->widget = menu_item; diff -ruN gimp-1.0.2/app/buildmenu.h gimp-1.0.3/app/buildmenu.h --- gimp-1.0.2/app/buildmenu.h Sun Apr 12 22:37:00 1998 +++ gimp-1.0.3/app/buildmenu.h Thu Mar 11 18:16:30 1999 @@ -42,6 +42,6 @@ /* Function declarations */ -GtkWidget * build_menu (MenuItem *, GtkAcceleratorTable *); +GtkWidget * build_menu (MenuItem *, GtkAccelGroup *); #endif /* BUILDMENU_H */ diff -ruN gimp-1.0.2/app/channels_dialog.c gimp-1.0.3/app/channels_dialog.c --- gimp-1.0.2/app/channels_dialog.c Sun Sep 6 13:00:45 1998 +++ gimp-1.0.3/app/channels_dialog.c Sun Mar 14 20:30:04 1999 @@ -92,7 +92,7 @@ GtkWidget *channel_list; GtkWidget *preview; GtkWidget *ops_menu; - GtkAcceleratorTable *accel_table; + GtkAccelGroup *accel_group; int num_components; int base_type; @@ -204,7 +204,7 @@ channelsD->active_channel = NULL; channelsD->floating_sel = NULL; channelsD->channel_widgets = NULL; - channelsD->accel_table = gtk_accelerator_table_new (); + channelsD->accel_group = gtk_accel_group_new (); if (preview_size) { @@ -217,7 +217,7 @@ gtk_container_border_width (GTK_CONTAINER (vbox), 2); /* The layers commands pulldown menu */ - channelsD->ops_menu = build_menu (channels_ops, channelsD->accel_table); + channelsD->ops_menu = build_menu (channels_ops, channelsD->accel_group); /* The channels listbox */ listbox = gtk_scrolled_window_new (NULL, NULL); @@ -225,7 +225,7 @@ gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 2); channelsD->channel_list = gtk_list_new (); - gtk_container_add (GTK_CONTAINER (listbox), channelsD->channel_list); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox), channelsD->channel_list); gtk_list_set_selection_mode (GTK_LIST (channelsD->channel_list), GTK_SELECTION_MULTIPLE); gtk_signal_connect (GTK_OBJECT (channelsD->channel_list), "event", (GtkSignalFunc) channel_list_events, @@ -233,7 +233,7 @@ gtk_container_set_focus_vadjustment (GTK_CONTAINER (channelsD->channel_list), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (listbox))); GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (listbox)->vscrollbar, GTK_CAN_FOCUS); - + gtk_widget_show (channelsD->channel_list); gtk_widget_show (listbox); @@ -584,7 +584,7 @@ /* get the list item data */ state = channel_widget->list_item->state; - if (channel_widget->type == Auxillary) + if (channel_widget->type == Auxillary) { /* turn on the specified auxillary channel */ index = gimage_get_channel_index (channel_widget->gimage, channel_widget->channel); @@ -594,8 +594,8 @@ gtk_list_select_item (GTK_LIST (channelsD->channel_list), index + channelsD->num_components); gtk_object_set_user_data (GTK_OBJECT (channel_widget->list_item), channel_widget); } - } - else + } + else { if (state != GTK_STATE_SELECTED) { @@ -638,7 +638,7 @@ /* get the list item data */ state = channel_widget->list_item->state; - if (channel_widget->type == Auxillary) + if (channel_widget->type == Auxillary) { /* turn off the specified auxillary channel */ index = gimage_get_channel_index (channel_widget->gimage, channel_widget->channel); @@ -673,7 +673,7 @@ gtk_object_set_user_data (GTK_OBJECT (channel_widget->list_item), channel_widget); } } - + suspend_gimage_notify--; } @@ -694,7 +694,7 @@ list = g_list_append (list, channel_widget->list_item); gtk_list_remove_items (GTK_LIST (channelsD->channel_list), list); channelsD->channel_widgets = g_slist_remove (channelsD->channel_widgets, channel_widget); - + suspend_gimage_notify--; /* Add it back at the proper index */ @@ -826,24 +826,24 @@ static void channels_dialog_map_callback (GtkWidget *w, - gpointer client_data) + gpointer client_data) { if (!channelsD) return; - gtk_window_add_accelerator_table (GTK_WINDOW (lc_shell), - channelsD->accel_table); + gtk_window_add_accel_group (GTK_WINDOW (lc_shell), + channelsD->accel_group); } static void channels_dialog_unmap_callback (GtkWidget *w, - gpointer client_data) + gpointer client_data) { if (!channelsD) return; - gtk_window_remove_accelerator_table (GTK_WINDOW (lc_shell), - channelsD->accel_table); + gtk_window_remove_accel_group (GTK_WINDOW (lc_shell), + channelsD->accel_group); } static void @@ -1662,7 +1662,7 @@ { /* select if this is the active channel */ if (channelsD->active_channel == (channel_widget->channel)) - channels_dialog_set_channel (channel_widget); + channels_dialog_set_channel (channel_widget); /* unselect if this is not the active channel */ else channels_dialog_unset_channel (channel_widget); @@ -1894,13 +1894,13 @@ if (gimage_get_ID (options->gimage_id)) { - + /* Set the new channel name */ if (GIMP_DRAWABLE(channel)->name) g_free (GIMP_DRAWABLE(channel)->name); GIMP_DRAWABLE(channel)->name = g_strdup (gtk_entry_get_text (GTK_ENTRY (options->name_entry))); gtk_label_set (GTK_LABEL (options->channel_widget->label), GIMP_DRAWABLE(channel)->name); - + if (channel->opacity != opacity) { channel->opacity = opacity; @@ -1912,7 +1912,7 @@ channel->col[i] = options->color_panel->color[i]; update = TRUE; } - + if (update) { drawable_update (GIMP_DRAWABLE(channel), 0, 0, GIMP_DRAWABLE(channel)->width, GIMP_DRAWABLE(channel)->height); @@ -1969,7 +1969,7 @@ options->channel_widget = channel_widget; options->gimage_id = channel_widget->gimage->ID; options->opacity = (double) channel_widget->channel->opacity / 2.55; - for (i = 0; i < 3; i++) + for (i = 0; i < 3; i++) channel_color[i] = channel_widget->channel->col[i]; options->color_panel = color_panel_new (channel_color, 48, 64); @@ -2038,5 +2038,3 @@ gtk_widget_show (vbox); gtk_widget_show (options->query_box); } - - diff -ruN gimp-1.0.2/app/colormaps.c gimp-1.0.3/app/colormaps.c --- gimp-1.0.2/app/colormaps.c Sun Apr 12 22:37:28 1998 +++ gimp-1.0.3/app/colormaps.c Sat Mar 13 17:40:55 1999 @@ -218,9 +218,13 @@ info = gtk_preview_get_info (); g_visual = info->visual; + /* if (((g_visual->type == GDK_VISUAL_PSEUDO_COLOR) || (g_visual->type == GDK_VISUAL_GRAYSCALE)) && info->reserved_pixels == NULL) { + */ /* XXXXXXXXXX fix me */ + if (((g_visual->type == GDK_VISUAL_PSEUDO_COLOR) || + (g_visual->type == GDK_VISUAL_GRAYSCALE))) { g_print("GIMP cannot get enough colormaps to boot.\n"); g_print("Try exiting other color intensive applications.\n"); g_print("Also try enabling the (install-colormap) option in gimprc.\n"); @@ -237,6 +241,7 @@ } g_cmap = info->cmap; +#if 0 color_pixel_vals = info->color_pixels; gray_pixel_vals = info->gray_pixels; reserved_pixels = info->reserved_pixels; @@ -251,6 +256,7 @@ g_lookup_red = info->lookup_red; g_lookup_green = info->lookup_green; g_lookup_blue = info->lookup_blue; - +#endif + set_app_colors (); } diff -ruN gimp-1.0.2/app/colormaps.h gimp-1.0.3/app/colormaps.h --- gimp-1.0.2/app/colormaps.h Sun Apr 12 22:37:29 1998 +++ gimp-1.0.3/app/colormaps.h Sat Mar 13 17:40:56 1999 @@ -23,8 +23,10 @@ /* This is a macro for arranging the red, green, and blue components into * a value acceptable to the target X server */ +#if 0 #define COLOR_COMPOSE(r,g,b) (lookup_red [r] | lookup_green [g] | lookup_blue [b]) - +#endif +#define COLOR_COMPOSE(r,g,b) (r | g | b) extern GdkVisual *g_visual; extern GdkColormap *g_cmap; diff -ruN gimp-1.0.2/app/errors.c gimp-1.0.3/app/errors.c --- gimp-1.0.2/app/errors.c Fri Jun 19 12:22:32 1998 +++ gimp-1.0.3/app/errors.c Thu Mar 11 18:16:33 1999 @@ -52,7 +52,7 @@ printf ("\n"); va_end (args); - g_debug (prog_name); + g_on_error_query (prog_name); app_exit (1); } @@ -68,6 +68,6 @@ va_end (args); if (use_debug_handler) - g_debug (prog_name); + g_on_error_query (prog_name); gdk_exit (1); } diff -ruN gimp-1.0.2/app/fileops.c gimp-1.0.3/app/fileops.c --- gimp-1.0.2/app/fileops.c Sun Jul 26 23:11:14 1998 +++ gimp-1.0.3/app/fileops.c Fri Mar 26 22:15:34 1999 @@ -24,6 +24,7 @@ #include #include #include +#include #include "appenv.h" #include "actionarea.h" diff -ruN gimp-1.0.2/app/gdisplay.c gimp-1.0.3/app/gdisplay.c --- gimp-1.0.2/app/gdisplay.c Tue Apr 14 23:01:25 1998 +++ gimp-1.0.3/app/gdisplay.c Fri Mar 26 22:15:35 1999 @@ -202,7 +202,7 @@ /* free the selection structure */ selection_free (gdisp->select); - + if (gdisp->scroll_gc) gdk_gc_destroy (gdisp->scroll_gc); @@ -768,7 +768,7 @@ dy = (y2 - i < GXIMAGE_HEIGHT) ? y2 - i : GXIMAGE_HEIGHT; render_image (gdisp, j - gdisp->disp_xoffset, i - gdisp->disp_yoffset, dx, dy); gximage_put (gdisp->canvas->window, - j, i, dx, dy); + j, i, dx, dy, gdisp->offset_x, gdisp->offset_y); } } @@ -1114,7 +1114,7 @@ GtkWidget *event_widget; GtkWidget *toplevel_widget; GdkEvent *event; - GDisplay *gdisp; + GDisplay *gdisp = NULL; /* If the popup shell is valid, then get the gdisplay associated with that shell */ event = gtk_get_current_event (); @@ -1125,7 +1125,9 @@ return NULL; toplevel_widget = gtk_widget_get_toplevel (event_widget); - gdisp = g_hash_table_lookup (display_ht, toplevel_widget); + + if (display_ht) + gdisp = g_hash_table_lookup (display_ht, toplevel_widget); if (gdisp) return gdisp; diff -ruN gimp-1.0.2/app/gimage.h gimp-1.0.3/app/gimage.h --- gimp-1.0.2/app/gimage.h Wed Jul 8 23:42:04 1998 +++ gimp-1.0.3/app/gimage.h Thu Mar 11 18:16:37 1999 @@ -151,6 +151,8 @@ /* Composite preview */ TempBuf *comp_preview; /* the composite preview */ int comp_preview_valid[3]; /* preview valid-1/channel */ + float xresolution; /* image x-res, in dpi */ + float yresolution; /* image y-res, in dpi */ }; diff -ruN gimp-1.0.2/app/gimprc.c gimp-1.0.3/app/gimprc.c --- gimp-1.0.2/app/gimprc.c Fri Oct 9 01:04:11 1998 +++ gimp-1.0.3/app/gimprc.c Mon Mar 15 09:26:15 1999 @@ -115,6 +115,9 @@ int show_tips = TRUE; int last_tip = -1; int show_tool_tips = TRUE; +float monitor_xres = 72.0; +float monitor_yres = 72.0; +int using_xserver_resolution = FALSE; static int get_next_token (void); static int peek_next_token (void); @@ -1337,7 +1340,7 @@ goto error; token = get_next_token (); - menus_add_path (menu_path, accelerator); + /* Sort of silly, we do nothing here - same as 1.1 */ return OK; diff -ruN gimp-1.0.2/app/gimprc.h gimp-1.0.3/app/gimprc.h --- gimp-1.0.2/app/gimprc.h Sun Apr 12 22:38:44 1998 +++ gimp-1.0.3/app/gimprc.h Thu Mar 11 18:16:39 1999 @@ -63,6 +63,9 @@ extern int show_tips; extern int last_tip; extern int show_tool_tips; +extern float monitor_xres; +extern float monitor_yres; +extern int using_xserver_resolution; /* function prototypes */ char * gimp_directory (void); diff -ruN gimp-1.0.2/app/global_edit.c gimp-1.0.3/app/global_edit.c --- gimp-1.0.2/app/global_edit.c Tue Apr 14 01:19:17 1998 +++ gimp-1.0.3/app/global_edit.c Sun Mar 14 20:30:06 1999 @@ -618,7 +618,7 @@ pn_dlg->list = gtk_list_new (); gtk_list_set_selection_mode (GTK_LIST (pn_dlg->list), GTK_SELECTION_BROWSE); - gtk_container_add (GTK_CONTAINER (listbox), pn_dlg->list); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox), pn_dlg->list); set_list_of_named_buffers (pn_dlg->list); gtk_widget_show (pn_dlg->list); diff -ruN gimp-1.0.2/app/gradient.c gimp-1.0.3/app/gradient.c --- gimp-1.0.2/app/gradient.c Thu May 28 02:03:18 1998 +++ gimp-1.0.3/app/gradient.c Mon Mar 15 09:26:16 1999 @@ -320,7 +320,7 @@ GtkWidget *control_coloring_popup; /* Coloring type menu */ GtkWidget *control_sel_ops_popup; /* Selection ops menu */ - GtkAcceleratorTable *accelerator_table; + GtkAccelGroup *accel_group; /* Blending and coloring menus */ @@ -852,7 +852,7 @@ g_editor->list = gtk_list_new(); gtk_list_set_selection_mode(GTK_LIST(g_editor->list), GTK_SELECTION_BROWSE); - gtk_container_add(GTK_CONTAINER(listbox), g_editor->list); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(listbox), g_editor->list); gtk_container_set_focus_vadjustment(GTK_CONTAINER(g_editor->list), gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(listbox))); GTK_WIDGET_UNSET_FLAGS(GTK_SCROLLED_WINDOW(listbox)->vscrollbar, GTK_CAN_FOCUS); @@ -1015,7 +1015,7 @@ g_editor->control_coloring_popup = NULL; g_editor->control_sel_ops_popup = NULL; - g_editor->accelerator_table = NULL; + g_editor->accel_group = NULL; for (i = 0; i < (sizeof(g_editor->control_blending_items) / sizeof(g_editor->control_blending_items[0])); @@ -2871,16 +2871,15 @@ GtkWidget *menu; GtkWidget *menuitem; GtkWidget *label; - GtkAcceleratorTable *acc_table; + GtkAccelGroup *accel_group; menu = gtk_menu_new(); - acc_table = gtk_accelerator_table_new(); + accel_group = gtk_accel_group_new(); - g_editor->accelerator_table = acc_table; + g_editor->accel_group = accel_group; - gtk_menu_set_accelerator_table(GTK_MENU(menu), acc_table); - gtk_window_add_accelerator_table(GTK_WINDOW(g_editor->shell), acc_table); - gtk_window_add_accelerator_table(GTK_WINDOW(g_editor->shell), acc_table); + gtk_menu_set_accel_group (GTK_MENU(menu), accel_group); + gtk_window_add_accel_group (GTK_WINDOW (g_editor->shell), accel_group); /* Left endpoint */ @@ -2891,7 +2890,11 @@ NULL); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); - gtk_widget_install_accelerator(menuitem, acc_table, "activate", 'L', 0); + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + 'L', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); menuitem = gtk_menu_item_new_with_label("Load from"); g_editor->control_left_load_popup = cpopup_create_load_menu(g_editor->left_load_color_boxes, @@ -2929,7 +2932,11 @@ NULL); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); - gtk_widget_install_accelerator(menuitem, acc_table, "activate", 'R', 0); + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + 'R', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); menuitem = gtk_menu_item_new_with_label("Load from"); g_editor->control_right_load_popup = cpopup_create_load_menu(g_editor->right_load_color_boxes, @@ -2988,7 +2995,11 @@ NULL); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); - gtk_widget_install_accelerator(menuitem, acc_table, "activate", 'S', 0); + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + 'S', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); /* Split uniformly */ @@ -2998,7 +3009,11 @@ NULL); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); - gtk_widget_install_accelerator(menuitem, acc_table, "activate", 'U', 0); + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + 'U', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); /* Delete */ @@ -3009,7 +3024,11 @@ gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); g_editor->control_delete_menu_item = menuitem; - gtk_widget_install_accelerator(menuitem, acc_table, "activate", 'D', 0); + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + 'D', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); /* Recenter */ @@ -3019,7 +3038,11 @@ NULL); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); - gtk_widget_install_accelerator(menuitem, acc_table, "activate", 'C', 0); + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + 'C', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); /* Redistribute */ @@ -3029,7 +3052,11 @@ NULL); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); - gtk_widget_install_accelerator(menuitem, acc_table, "activate", 'C', GDK_CONTROL_MASK); + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + 'C', GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); /* Selection ops */ @@ -3376,17 +3403,18 @@ cpopup_create_menu_item_with_label(char *str, GtkWidget **label) { GtkWidget *menuitem; - GtkWidget *wlabel; + GtkWidget *accel_label; menuitem = gtk_menu_item_new(); - wlabel = gtk_label_new(str); - gtk_misc_set_alignment(GTK_MISC(wlabel), 0.0, 0.5); - gtk_container_add(GTK_CONTAINER(menuitem), wlabel); - gtk_widget_show(wlabel); + accel_label = gtk_accel_label_new(str); + gtk_misc_set_alignment(GTK_MISC(accel_label), 0.0, 0.5); + gtk_container_add(GTK_CONTAINER(menuitem), accel_label); + gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), menuitem); + gtk_widget_show(accel_label); if (label) - *label = wlabel; + *label = accel_label; return menuitem; } /* cpopup_create_menu_item_with_label */ @@ -3476,13 +3504,13 @@ { GtkWidget *menu; GtkWidget *menuitem; - GtkAcceleratorTable *acc_table; + GtkAccelGroup *accel_group; int i; menu = gtk_menu_new(); - acc_table = g_editor->accelerator_table; + accel_group = g_editor->accel_group; - gtk_menu_set_accelerator_table(GTK_MENU(menu), acc_table); + gtk_menu_set_accel_group (GTK_MENU (menu), accel_group); /* Create items */ @@ -3502,23 +3530,32 @@ gtk_widget_show(menuitem); switch (i) { - case 0: - gtk_widget_install_accelerator(menuitem, acc_table, "activate", - accel_key_0, accel_mods_0); - break; - - case 1: - gtk_widget_install_accelerator(menuitem, acc_table, "activate", - accel_key_1, accel_mods_1); - break; - - case 2: - gtk_widget_install_accelerator(menuitem, acc_table, "activate", - accel_key_2, accel_mods_2); - break; - - default: - break; + case 0: + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + accel_key_0, accel_mods_0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); + break; + + case 1: + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + accel_key_1, accel_mods_1, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); + break; + + case 2: + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + accel_key_2, accel_mods_2, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); + break; + + default: + break; } /* switch */ } /* for */ @@ -3886,12 +3923,12 @@ { GtkWidget *menu; GtkWidget *menuitem; - GtkAcceleratorTable *acc_table; + GtkAccelGroup *accel_group; menu = gtk_menu_new(); - acc_table = g_editor->accelerator_table; + accel_group = g_editor->accel_group; - gtk_menu_set_accelerator_table(GTK_MENU(menu), acc_table); + gtk_menu_set_accel_group (GTK_MENU (menu), accel_group); /* Flip */ @@ -3901,7 +3938,11 @@ NULL); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); - gtk_widget_install_accelerator(menuitem, acc_table, "activate", 'F', 0); + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + 'F', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); /* Replicate */ @@ -3911,7 +3952,11 @@ NULL); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); - gtk_widget_install_accelerator(menuitem, acc_table, "activate", 'M', 0); + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + 'M', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); /* Blend colors / opacity */ @@ -3926,7 +3971,11 @@ gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); g_editor->control_blend_colors_menu_item = menuitem; - gtk_widget_install_accelerator(menuitem, acc_table, "activate", 'B', 0); + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + 'B', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); menuitem = gtk_menu_item_new_with_label("Blend endpoints' opacity"); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", @@ -3934,7 +3983,11 @@ NULL); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); - gtk_widget_install_accelerator(menuitem, acc_table, "activate", 'B', GDK_CONTROL_MASK); + gtk_widget_add_accelerator(menuitem, + "activate", + accel_group, + 'B', GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); g_editor->control_blend_opacity_menu_item = menuitem; return menu; diff -ruN gimp-1.0.2/app/gximage.c gimp-1.0.3/app/gximage.c --- gimp-1.0.2/app/gximage.c Sun Apr 12 22:38:49 1998 +++ gimp-1.0.3/app/gximage.c Sat Mar 13 18:30:30 1999 @@ -31,7 +31,7 @@ GdkVisual *visual; /* visual appropriate to our depth */ GdkGC *gc; /* graphics context */ - GdkImage *image; /* private data */ + guchar *data; }; @@ -52,7 +52,7 @@ gximage->visual = visual; gximage->gc = NULL; - gximage->image = gdk_image_new (GDK_IMAGE_FASTEST, visual, width, height); + gximage->data = g_malloc (width * height * 3); return gximage; } @@ -60,7 +60,7 @@ static void delete_gximage (GXImage *gximage) { - gdk_image_destroy (gximage->image); + g_free (gximage->data); if (gximage->gc) gdk_gc_destroy (gximage->gc); g_free (gximage); @@ -86,39 +86,48 @@ guchar* gximage_get_data () { - return gximage->image->mem; + return gximage->data; } int gximage_get_bpp () { - return gximage->image->bpp; + return 3; } int gximage_get_bpl () { - return gximage->image->bpl; + return 3 * GXIMAGE_WIDTH; } int gximage_get_byte_order () { - return gximage->image->byte_order; + return GDK_MSB_FIRST; } void -gximage_put (GdkWindow *win, int x, int y, int w, int h) +gximage_put (GdkWindow *win, int x, int y, int w, int h, int xdith, int ydith) { - /* create the GC if it doesn't yet exist */ + /* create the GC if it doesn't yet exist */ if (!gximage->gc) { gximage->gc = gdk_gc_new (win); gdk_gc_set_exposures (gximage->gc, TRUE); } - gdk_draw_image (win, gximage->gc, gximage->image, 0, 0, x, y, w, h); - - /* sync the draw image to make sure it has been displayed before continuing */ - gdk_flush (); + gdk_draw_rgb_image_dithalign (win, + gximage->gc, + x, + y, + w, + h, + /* todo: make configurable */ + GDK_RGB_DITHER_MAX, + gximage->data, + GXIMAGE_WIDTH * 3, + xdith, ydith); } + + diff -ruN gimp-1.0.2/app/gximage.h gimp-1.0.3/app/gximage.h --- gimp-1.0.2/app/gximage.h Sun Apr 12 22:38:51 1998 +++ gimp-1.0.3/app/gximage.h Sat Mar 13 18:30:31 1999 @@ -24,7 +24,8 @@ void gximage_init (void); void gximage_free (void); -void gximage_put (GdkWindow *, int, int, int, int); +void gximage_put (GdkWindow *win, int x, int y, int w, int h, + int xdith, int ydith); guchar* gximage_get_data (void); int gximage_get_bpp (void); int gximage_get_bpl (void); diff -ruN gimp-1.0.2/app/image_render.c gimp-1.0.3/app/image_render.c --- gimp-1.0.2/app/image_render.c Sat May 30 00:32:09 1998 +++ gimp-1.0.3/app/image_render.c Mon Mar 15 09:52:33 1999 @@ -173,30 +173,12 @@ /* Render Image functions */ -static void render_image_indexed_1 (RenderInfo *info); -static void render_image_indexed_2 (RenderInfo *info); -static void render_image_indexed_3 (RenderInfo *info); -static void render_image_indexed_4 (RenderInfo *info); -static void render_image_indexed_a_1 (RenderInfo *info); -static void render_image_indexed_a_2 (RenderInfo *info); -static void render_image_indexed_a_3 (RenderInfo *info); -static void render_image_indexed_a_4 (RenderInfo *info); -static void render_image_gray_1 (RenderInfo *info); -static void render_image_gray_2 (RenderInfo *info); -static void render_image_gray_3 (RenderInfo *info); -static void render_image_gray_4 (RenderInfo *info); -static void render_image_gray_a_1 (RenderInfo *info); -static void render_image_gray_a_2 (RenderInfo *info); -static void render_image_gray_a_3 (RenderInfo *info); -static void render_image_gray_a_4 (RenderInfo *info); -static void render_image_rgb_1 (RenderInfo *info); -static void render_image_rgb_2 (RenderInfo *info); -static void render_image_rgb_3 (RenderInfo *info); -static void render_image_rgb_4 (RenderInfo *info); -static void render_image_rgb_a_1 (RenderInfo *info); -static void render_image_rgb_a_2 (RenderInfo *info); -static void render_image_rgb_a_3 (RenderInfo *info); -static void render_image_rgb_a_4 (RenderInfo *info); +static void render_image_rgb (RenderInfo *info); +static void render_image_rgb_a (RenderInfo *info); +static void render_image_gray (RenderInfo *info); +static void render_image_gray_a (RenderInfo *info); +static void render_image_indexed (RenderInfo *info); +static void render_image_indexed_a (RenderInfo *info); static void render_image_init_info (RenderInfo *info, GDisplay *gdisp, @@ -213,44 +195,14 @@ static guchar* render_image_tile_fault (RenderInfo *info); -static RenderFunc render_funcs[6][4] = +static RenderFunc render_funcs[6] = { - { - render_image_rgb_1, - render_image_rgb_2, - render_image_rgb_3, - render_image_rgb_4, - }, - { - render_image_rgb_a_1, - render_image_rgb_a_2, - render_image_rgb_a_3, - render_image_rgb_a_4, - }, - { - render_image_gray_1, - render_image_gray_2, - render_image_gray_3, - render_image_gray_4, - }, - { - render_image_gray_a_1, - render_image_gray_a_2, - render_image_gray_a_3, - render_image_gray_a_4, - }, - { - render_image_indexed_1, - render_image_indexed_2, - render_image_indexed_3, - render_image_indexed_4, - }, - { - render_image_indexed_a_1, - render_image_indexed_a_2, - render_image_indexed_a_3, - render_image_indexed_a_4, - }, + render_image_rgb, + render_image_rgb_a, + render_image_gray, + render_image_gray_a, + render_image_indexed, + render_image_indexed_a, }; @@ -287,1438 +239,55 @@ return; } - (* render_funcs[image_type][info.dest_bpp-1]) (&info); + (* render_funcs[image_type]) (&info); } -/*************************/ -/* 8 Bit functions */ -/*************************/ - -static void -render_image_indexed_1 (RenderInfo *info) -{ - GtkDitherInfo ra, ga, ba; - GtkDitherInfo *dither_red; - GtkDitherInfo *dither_green; - GtkDitherInfo *dither_blue; - gulong *pixels; - guchar **dither_matrix; - guchar *matrix; - guchar *src; - guchar *dest; - guchar *cmap; - int val; - int y, ye; - int x, xe; - - dither_red = red_ordered_dither; - dither_green = green_ordered_dither; - dither_blue = blue_ordered_dither; - pixels = color_pixel_vals; - cmap = gimage_cmap (info->gdisp->gimage); - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - src = info->src; - dest = info->dest; - dither_matrix = ordered_dither_matrix[y & 0x7]; - - g_return_if_fail (src != NULL); - - for (x = info->x; x < xe; x++) - { - val = *src++ * 3; - ra = dither_red[cmap[val+0]]; - ga = dither_green[cmap[val+1]]; - ba = dither_blue[cmap[val+2]]; - - matrix = dither_matrix[x & 0x7]; - *dest++ = pixels[(ra.c[matrix[ra.s[1]]] + - ga.c[matrix[ga.s[1]]] + - ba.c[matrix[ba.s[1]]])]; - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - } -} - -static void -render_image_indexed_2 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - guchar *cmap; - gulong val; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - cmap = gimage_cmap (info->gdisp->gimage); - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - val = src[INDEXED_PIX] * 3; - val = COLOR_COMPOSE (cmap[val+0], cmap[val+1], cmap[val+2]); - src += 1; - - dest[0] = val; - dest[1] = val >> 8; - dest += 2; - } - else - for (x = info->x; x < xe; x++) - { - val = src[INDEXED_PIX] * 3; - val = COLOR_COMPOSE (cmap[val+0], cmap[val+1], cmap[val+2]); - src += 1; - - dest[0] = val >> 8; - dest[1] = val; - dest += 2; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - -static void -render_image_indexed_3 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - guchar *cmap; - gulong val; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - cmap = gimage_cmap (info->gdisp->gimage); - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - val = src[INDEXED_PIX] * 3; - val = COLOR_COMPOSE (cmap[val+0], cmap[val+1], cmap[val+2]); - src += 1; - - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 3; - } - else - for (x = info->x; x < xe; x++) - { - val = src[INDEXED_PIX] * 3; - val = COLOR_COMPOSE (cmap[val+0], cmap[val+1], cmap[val+2]); - src += 1; - - dest[0] = val >> 16; - dest[1] = val >> 8; - dest[2] = val; - dest += 3; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - -static void -render_image_indexed_4 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - guchar *cmap; - gulong val; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - cmap = gimage_cmap (info->gdisp->gimage); - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - val = src[INDEXED_PIX] * 3; - val = COLOR_COMPOSE (cmap[val+0], cmap[val+1], cmap[val+2]); - src += 1; - - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 4; - } - else - for (x = info->x; x < xe; x++) - { - val = src[INDEXED_PIX] * 3; - val = COLOR_COMPOSE (cmap[val+0], cmap[val+1], cmap[val+2]); - src += 1; - - dest[1] = val >> 16; - dest[2] = val >> 8; - dest[3] = val; - dest += 4; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - - -static void -render_image_indexed_a_1 (RenderInfo *info) -{ - GtkDitherInfo ra, ga, ba; - GtkDitherInfo *dither_red; - GtkDitherInfo *dither_green; - GtkDitherInfo *dither_blue; - gulong *pixels; - guchar **dither_matrix; - guchar *matrix; - guchar *src; - guchar *dest; - guchar *cmap; - guint *alpha; - guint a; - int dark_light; - int val; - int y, ye; - int x, xe; - - dither_red = red_ordered_dither; - dither_green = green_ordered_dither; - dither_blue = blue_ordered_dither; - pixels = color_pixel_vals; - cmap = gimage_cmap (info->gdisp->gimage); - alpha = info->alpha; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - src = info->src; - dest = info->dest; - dither_matrix = ordered_dither_matrix[y & 0x7]; - - dark_light = (y >> check_shift) + (info->x >> check_shift); - - g_return_if_fail (src != NULL); - - for (x = info->x; x < xe; x++) - { - val = src[INDEXED_PIX] * 3; - a = alpha[src[ALPHA_I_PIX]]; - src += 2; - - if (dark_light & 0x1) - { - ra = dither_red[blend_dark_check[(a | cmap[val+0])]]; - ga = dither_green[blend_dark_check[(a | cmap[val+1])]]; - ba = dither_blue[blend_dark_check[(a | cmap[val+2])]]; - } - else - { - ra = dither_red[blend_light_check[(a | cmap[val+0])]]; - ga = dither_green[blend_light_check[(a | cmap[val+1])]]; - ba = dither_blue[blend_light_check[(a | cmap[val+2])]]; - } - - matrix = dither_matrix[x & 0x7]; - *dest++ = pixels[(ra.c[matrix[ra.s[1]]] + - ga.c[matrix[ga.s[1]]] + - ba.c[matrix[ba.s[1]]])]; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - } -} - -static void -render_image_indexed_a_2 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - guint *alpha; - guchar *cmap; - gulong r, g, b; - gulong val; - guint a; - int dark_light; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - cmap = gimage_cmap (info->gdisp->gimage); - alpha = info->alpha; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest) && (y & check_mod)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - dark_light = (y >> check_shift) + (info->x >> check_shift); - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_I_PIX]]; - val = src[INDEXED_PIX] * 3; - src += 2; - - if (dark_light & 0x1) - { - r = blend_dark_check[(a | cmap[val+0])]; - g = blend_dark_check[(a | cmap[val+1])]; - b = blend_dark_check[(a | cmap[val+2])]; - } - else - { - r = blend_light_check[(a | cmap[val+0])]; - g = blend_light_check[(a | cmap[val+1])]; - b = blend_light_check[(a | cmap[val+2])]; - } - - val = COLOR_COMPOSE (r, g, b); - - dest[0] = val; - dest[1] = val >> 8; - dest += 2; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - else - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_I_PIX]]; - val = src[INDEXED_PIX] * 3; - src += 2; - - if (dark_light & 0x1) - { - r = blend_dark_check[(a | cmap[val+0])]; - g = blend_dark_check[(a | cmap[val+1])]; - b = blend_dark_check[(a | cmap[val+2])]; - } - else - { - r = blend_light_check[(a | cmap[val+0])]; - g = blend_light_check[(a | cmap[val+1])]; - b = blend_light_check[(a | cmap[val+2])]; - } - - val = COLOR_COMPOSE (r, g, b); - - dest[0] = val >> 8; - dest[1] = val; - dest += 2; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - -static void -render_image_indexed_a_3 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - guint *alpha; - guchar *cmap; - gulong r, g, b; - gulong val; - guint a; - int dark_light; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - cmap = gimage_cmap (info->gdisp->gimage); - alpha = info->alpha; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest) && (y & check_mod)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - dark_light = (y >> check_shift) + (info->x >> check_shift); - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_I_PIX]]; - val = src[INDEXED_PIX] * 3; - src += 2; - - if (dark_light & 0x1) - { - r = blend_dark_check[(a | cmap[val+0])]; - g = blend_dark_check[(a | cmap[val+1])]; - b = blend_dark_check[(a | cmap[val+2])]; - } - else - { - r = blend_light_check[(a | cmap[val+0])]; - g = blend_light_check[(a | cmap[val+1])]; - b = blend_light_check[(a | cmap[val+2])]; - } - - val = COLOR_COMPOSE (r, g, b); - - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 3; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - else - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_I_PIX]]; - val = src[INDEXED_PIX] * 3; - src += 2; - - if (dark_light & 0x1) - { - r = blend_dark_check[(a | cmap[val+0])]; - g = blend_dark_check[(a | cmap[val+1])]; - b = blend_dark_check[(a | cmap[val+2])]; - } - else - { - r = blend_light_check[(a | cmap[val+0])]; - g = blend_light_check[(a | cmap[val+1])]; - b = blend_light_check[(a | cmap[val+2])]; - } - - val = COLOR_COMPOSE (r, g, b); - - dest[0] = val >> 16; - dest[1] = val >> 8; - dest[2] = val; - dest += 3; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - -static void -render_image_indexed_a_4 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - guint *alpha; - guchar *cmap; - gulong r, g, b; - gulong val; - guint a; - int dark_light; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - cmap = gimage_cmap (info->gdisp->gimage); - alpha = info->alpha; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest) && (y & check_mod)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - dark_light = (y >> check_shift) + (info->x >> check_shift); - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_I_PIX]]; - val = src[INDEXED_PIX] * 3; - src += 2; - - if (dark_light & 0x1) - { - r = blend_dark_check[(a | cmap[val+0])]; - g = blend_dark_check[(a | cmap[val+1])]; - b = blend_dark_check[(a | cmap[val+2])]; - } - else - { - r = blend_light_check[(a | cmap[val+0])]; - g = blend_light_check[(a | cmap[val+1])]; - b = blend_light_check[(a | cmap[val+2])]; - } - - val = COLOR_COMPOSE (r, g, b); - - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 4; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - else - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_I_PIX]]; - val = src[INDEXED_PIX] * 3; - src += 2; - - if (dark_light & 0x1) - { - r = blend_dark_check[(a | cmap[val+0])]; - g = blend_dark_check[(a | cmap[val+1])]; - b = blend_dark_check[(a | cmap[val+2])]; - } - else - { - r = blend_light_check[(a | cmap[val+0])]; - g = blend_light_check[(a | cmap[val+1])]; - b = blend_light_check[(a | cmap[val+2])]; - } - - val = COLOR_COMPOSE (r, g, b); - - dest[1] = val >> 16; - dest[2] = val >> 8; - dest[3] = val; - dest += 4; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - - -static void -render_image_gray_1 (RenderInfo *info) -{ - GtkDitherInfo gray; - GtkDitherInfo *dither_gray; - guchar **dither_matrix; - guchar *matrix; - guchar *src; - guchar *dest; - int y, ye; - int x, xe; - - dither_gray = gray_ordered_dither; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - src = info->src; - dest = info->dest; - dither_matrix = ordered_dither_matrix[y & 0x7]; - - g_return_if_fail (src != NULL); - - for (x = info->x; x < xe; x++) - { - gray = dither_gray[*src++]; - matrix = dither_matrix[x & 0x7]; - *dest++ = gray.c[matrix[gray.s[1]]]; - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - } -} - -static void -render_image_gray_2 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - gulong val; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[GRAY_PIX], src[GRAY_PIX], src[GRAY_PIX]); - src += 1; - - dest[0] = val; - dest[1] = val >> 8; - dest += 2; - } - else - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[GRAY_PIX], src[GRAY_PIX], src[GRAY_PIX]); - src += 1; - - dest[0] = val >> 8; - dest[1] = val; - dest += 2; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - -static void -render_image_gray_3 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - gulong val; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[GRAY_PIX], src[GRAY_PIX], src[GRAY_PIX]); - src += 1; - - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 3; - } - else - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[GRAY_PIX], src[GRAY_PIX], src[GRAY_PIX]); - src += 1; - - dest[0] = val >> 16; - dest[1] = val >> 8; - dest[2] = val; - dest += 3; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - -static void -render_image_gray_4 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - gulong val; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[GRAY_PIX], src[GRAY_PIX], src[GRAY_PIX]); - src += 1; - - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 4; - } - else - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[GRAY_PIX], src[GRAY_PIX], src[GRAY_PIX]); - src += 1; - - dest[1] = val >> 16; - dest[2] = val >> 8; - dest[3] = val; - dest += 4; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - - -static void -render_image_gray_a_1 (RenderInfo *info) -{ - GtkDitherInfo gray; - GtkDitherInfo *dither_gray; - guchar **dither_matrix; - guchar *matrix; - guchar *src; - guchar *dest; - guint *alpha; - guint a; - int dark_light; - int y, ye; - int x, xe; - - dither_gray = gray_ordered_dither; - alpha = info->alpha; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - src = info->src; - dest = info->dest; - dither_matrix = ordered_dither_matrix[y & 0x7]; - - dark_light = (y >> check_shift) + (info->x >> check_shift); - - g_return_if_fail (src != NULL); - - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_G_PIX]]; - if (dark_light & 0x1) - gray = dither_gray[blend_dark_check[(a | src[GRAY_PIX])]]; - else - gray = dither_gray[blend_light_check[(a | src[GRAY_PIX])]]; - src += 2; - - matrix = dither_matrix[x & 0x7]; - *dest++ = gray.c[matrix[gray.s[1]]]; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - } -} - -static void -render_image_gray_a_2 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - guint *alpha; - gulong val; - guint a; - int dark_light; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - alpha = info->alpha; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest) && (y & check_mod)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - dark_light = (y >> check_shift) + (info->x >> check_shift); - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_G_PIX]]; - if (dark_light & 0x1) - val = blend_dark_check[(a | src[GRAY_PIX])]; - else - val = blend_light_check[(a | src[GRAY_PIX])]; - val = COLOR_COMPOSE (val, val, val); - src += 2; - - dest[0] = val; - dest[1] = val >> 8; - dest += 2; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - else - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_G_PIX]]; - if (dark_light & 0x1) - val = blend_dark_check[(a | src[GRAY_PIX])]; - else - val = blend_light_check[(a | src[GRAY_PIX])]; - val = COLOR_COMPOSE (val, val, val); - src += 2; - - dest[0] = val >> 8; - dest[1] = val; - dest += 2; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - -static void -render_image_gray_a_3 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - guint *alpha; - gulong val; - guint a; - int dark_light; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - alpha = info->alpha; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest) && (y & check_mod)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - dark_light = (y >> check_shift) + (info->x >> check_shift); - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_G_PIX]]; - if (dark_light & 0x1) - val = blend_dark_check[(a | src[GRAY_PIX])]; - else - val = blend_light_check[(a | src[GRAY_PIX])]; - val = COLOR_COMPOSE (val, val, val); - src += 2; - - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 3; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - else - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_G_PIX]]; - if (dark_light & 0x1) - val = blend_dark_check[(a | src[GRAY_PIX])]; - else - val = blend_light_check[(a | src[GRAY_PIX])]; - val = COLOR_COMPOSE (val, val, val); - src += 2; - - dest[0] = val >> 16; - dest[1] = val >> 8; - dest[2] = val; - dest += 3; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - -static void -render_image_gray_a_4 (RenderInfo *info) -{ - gulong *lookup_red; - gulong *lookup_green; - gulong *lookup_blue; - guchar *src; - guchar *dest; - guint *alpha; - gulong val; - guint a; - int dark_light; - int byte_order; - int y, ye; - int x, xe; - int initial; - - lookup_red = g_lookup_red; - lookup_green = g_lookup_green; - lookup_blue = g_lookup_blue; - alpha = info->alpha; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - initial = TRUE; - byte_order = info->byte_order; - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - if (!initial && (y % info->scaledest) && (y & check_mod)) - memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); - else - { - src = info->src; - dest = info->dest; - - dark_light = (y >> check_shift) + (info->x >> check_shift); - - g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_G_PIX]]; - if (dark_light & 0x1) - val = blend_dark_check[(a | src[GRAY_PIX])]; - else - val = blend_light_check[(a | src[GRAY_PIX])]; - val = COLOR_COMPOSE (val, val, val); - src += 2; - - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 4; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - else - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_G_PIX]]; - if (dark_light & 0x1) - val = blend_dark_check[(a | src[GRAY_PIX])]; - else - val = blend_light_check[(a | src[GRAY_PIX])]; - val = COLOR_COMPOSE (val, val, val); - src += 2; - - dest[1] = val >> 16; - dest[2] = val >> 8; - dest[3] = val; - dest += 4; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - - -static void -render_image_rgb_1 (RenderInfo *info) -{ - GtkDitherInfo ra, ga, ba; - GtkDitherInfo *dither_red; - GtkDitherInfo *dither_green; - GtkDitherInfo *dither_blue; - gulong *pixels; - guchar **dither_matrix; - guchar *matrix; - guchar *src; - guchar *dest; - int y, ye; - int x, xe; - dither_red = red_ordered_dither; - dither_green = green_ordered_dither; - dither_blue = blue_ordered_dither; - pixels = color_pixel_vals; - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - src = info->src; - dest = info->dest; - dither_matrix = ordered_dither_matrix[y & 0x7]; - - g_return_if_fail (src != NULL); - - for (x = info->x; x < xe; x++) - { - ra = dither_red[src[RED_PIX]]; - ga = dither_green[src[GREEN_PIX]]; - ba = dither_blue[src[BLUE_PIX]]; - src += 3; - - matrix = dither_matrix[x & 0x7]; - *dest++ = pixels[(ra.c[matrix[ra.s[1]]] + - ga.c[matrix[ga.s[1]]] + - ba.c[matrix[ba.s[1]]])]; - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - } -} +/*************************/ +/* 8 Bit functions */ +/*************************/ static void -render_image_rgb_2 (RenderInfo *info) +render_image_indexed (RenderInfo *info) { gulong *lookup_red; gulong *lookup_green; gulong *lookup_blue; guchar *src; guchar *dest; + guchar *cmap; gulong val; int byte_order; int y, ye; int x, xe; int initial; + float error; + float step; lookup_red = g_lookup_red; lookup_green = g_lookup_green; lookup_blue = g_lookup_blue; + cmap = gimage_cmap (info->gdisp->gimage); y = info->y; ye = info->y + info->h; xe = info->x + info->w; + step = info->scalesrc; + + error = y * step; + error -= ((int)error) - step; + initial = TRUE; byte_order = info->byte_order; info->src = render_image_tile_fault (info); for (; y < ye; y++) { - if (!initial && (y % info->scaledest)) + if (!initial && (error < 1.0)) memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); else { @@ -1727,115 +296,129 @@ g_return_if_fail (src != NULL); - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[RED_PIX], src[GREEN_PIX], src[BLUE_PIX]); - src += 3; - - dest[0] = val; - dest[1] = val >> 8; - dest += 2; - } - else - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[RED_PIX], src[GREEN_PIX], src[BLUE_PIX]); - src += 3; + for (x = info->x; x < xe; x++) + { + val = src[INDEXED_PIX] * 3; + src += 1; - dest[0] = val >> 8; - dest[1] = val; - dest += 2; - } + dest[0] = cmap[val+0]; + dest[1] = cmap[val+1]; + dest[2] = cmap[val+2]; + dest += 3; + } } info->dest += info->dest_bpl; + initial = FALSE; + if (((y + 1) % info->scaledest) == 0) { info->src_y += info->scalesrc; info->src = render_image_tile_fault (info); } - initial = FALSE; + error += step; } } static void -render_image_rgb_3 (RenderInfo *info) +render_image_indexed_a (RenderInfo *info) { gulong *lookup_red; gulong *lookup_green; gulong *lookup_blue; guchar *src; guchar *dest; + guint *alpha; + guchar *cmap; + gulong r, g, b; gulong val; + guint a; + int dark_light; int byte_order; int y, ye; int x, xe; int initial; + float error; + float step; lookup_red = g_lookup_red; lookup_green = g_lookup_green; lookup_blue = g_lookup_blue; + cmap = gimage_cmap (info->gdisp->gimage); + alpha = info->alpha; y = info->y; ye = info->y + info->h; xe = info->x + info->w; + step = info->scalesrc; + + error = y * step; + error -= ((int)error) - step; + initial = TRUE; byte_order = info->byte_order; info->src = render_image_tile_fault (info); for (; y < ye; y++) { - if (!initial && (y % info->scaledest)) + if (!initial && (error < 1.0) && (y & check_mod)) memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); else { src = info->src; dest = info->dest; + dark_light = (y >> check_shift) + (info->x >> check_shift); + g_return_if_fail (src != NULL); - - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[RED_PIX], src[GREEN_PIX], src[BLUE_PIX]); - src += 3; - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 3; - } - else - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[RED_PIX], src[GREEN_PIX], src[BLUE_PIX]); - src += 3; + for (x = info->x; x < xe; x++) + { + a = alpha[src[ALPHA_I_PIX]]; + val = src[INDEXED_PIX] * 3; + src += 2; + + if (dark_light & 0x1) + { + r = blend_dark_check[(a | cmap[val+0])]; + g = blend_dark_check[(a | cmap[val+1])]; + b = blend_dark_check[(a | cmap[val+2])]; + } + else + { + r = blend_light_check[(a | cmap[val+0])]; + g = blend_light_check[(a | cmap[val+1])]; + b = blend_light_check[(a | cmap[val+2])]; + } - dest[0] = val >> 16; - dest[1] = val >> 8; - dest[2] = val; + dest[0] = r; + dest[1] = g; + dest[2] = b; dest += 3; + + if (((x + 1) & check_mod) == 0) + dark_light += 1; } } info->dest += info->dest_bpl; + initial = FALSE; + if (((y + 1) % info->scaledest) == 0) { info->src_y += info->scalesrc; info->src = render_image_tile_fault (info); } - - initial = FALSE; + error += step; } } static void -render_image_rgb_4 (RenderInfo *info) +render_image_gray (RenderInfo *info) { gulong *lookup_red; gulong *lookup_green; @@ -1847,6 +430,8 @@ int y, ye; int x, xe; int initial; + float error; + float step; lookup_red = g_lookup_red; lookup_green = g_lookup_green; @@ -1856,13 +441,18 @@ ye = info->y + info->h; xe = info->x + info->w; + step = info->scalesrc; + + error = y * step; + error -= ((int)error) - step; + initial = TRUE; byte_order = info->byte_order; info->src = render_image_tile_fault (info); for (; y < ye; y++) { - if ((y % info->scaledest) && !initial) + if (!initial && (error < 1.0)) memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); else { @@ -1871,111 +461,21 @@ g_return_if_fail (src != NULL); - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[RED_PIX], src[GREEN_PIX], src[BLUE_PIX]); - src += 3; - - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 4; - } - else - for (x = info->x; x < xe; x++) - { - val = COLOR_COMPOSE (src[RED_PIX], src[GREEN_PIX], src[BLUE_PIX]); - src += 3; - - dest[1] = val >> 16; - dest[2] = val >> 8; - dest[3] = val; - dest += 4; - } - } - - info->dest += info->dest_bpl; - - if (((y + 1) % info->scaledest) == 0) - { - info->src_y += info->scalesrc; - info->src = render_image_tile_fault (info); - } - - initial = FALSE; - } -} - - -static void -render_image_rgb_a_1 (RenderInfo *info) -{ - GtkDitherInfo ra, ga, ba; - GtkDitherInfo *dither_red; - GtkDitherInfo *dither_green; - GtkDitherInfo *dither_blue; - gulong *pixels; - guchar **dither_matrix; - guchar *matrix; - guchar *src; - guchar *dest; - guint *alpha; - guint a; - int dark_light; - int y, ye; - int x, xe; - - dither_red = red_ordered_dither; - dither_green = green_ordered_dither; - dither_blue = blue_ordered_dither; - pixels = color_pixel_vals; - alpha = info->alpha; - - y = info->y; - ye = info->y + info->h; - xe = info->x + info->w; - - info->src = render_image_tile_fault (info); - - for (; y < ye; y++) - { - src = info->src; - dest = info->dest; - dither_matrix = ordered_dither_matrix[y & 0x7]; - - dark_light = (y >> check_shift) + (info->x >> check_shift); - - g_return_if_fail (src != NULL); - - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_PIX]]; - if (dark_light & 0x1) - { - ra = dither_red[blend_dark_check[(a | src[RED_PIX])]]; - ga = dither_green[blend_dark_check[(a | src[GREEN_PIX])]]; - ba = dither_blue[blend_dark_check[(a | src[BLUE_PIX])]]; - } - else + for (x = info->x; x < xe; x++) { - ra = dither_red[blend_light_check[(a | src[RED_PIX])]]; - ga = dither_green[blend_light_check[(a | src[GREEN_PIX])]]; - ba = dither_blue[blend_light_check[(a | src[BLUE_PIX])]]; - } - src += 4; + val = src[GRAY_PIX]; + src += 1; - matrix = dither_matrix[x & 0x7]; - *dest++ = pixels[(ra.c[matrix[ra.s[1]]] + - ga.c[matrix[ga.s[1]]] + - ba.c[matrix[ba.s[1]]])]; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; + dest[0] = val; + dest[1] = val; + dest[2] = val; + dest += 3; + } } info->dest += info->dest_bpl; + initial = FALSE; if (((y + 1) % info->scaledest) == 0) { info->src_y += info->scalesrc; @@ -1985,7 +485,7 @@ } static void -render_image_rgb_a_2 (RenderInfo *info) +render_image_gray_a (RenderInfo *info) { gulong *lookup_red; gulong *lookup_green; @@ -1993,7 +493,6 @@ guchar *src; guchar *dest; guint *alpha; - gulong r, g, b; gulong val; guint a; int dark_light; @@ -2001,6 +500,8 @@ int y, ye; int x, xe; int initial; + float error; + float step; lookup_red = g_lookup_red; lookup_green = g_lookup_green; @@ -2011,13 +512,18 @@ ye = info->y + info->h; xe = info->x + info->w; + step = info->scalesrc; + + error = y * step; + error -= ((int)error) - step; + initial = TRUE; byte_order = info->byte_order; info->src = render_image_tile_fault (info); for (; y < ye; y++) { - if (!initial && (y % info->scaledest) && (y & check_mod)) + if (!initial && (error < 1.0) && (y & check_mod)) memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); else { @@ -2026,200 +532,112 @@ dark_light = (y >> check_shift) + (info->x >> check_shift); - - /* this catches the case when ye is too large, and we loop through - * regions where render_image_tile_fault returns NULL. I don't - * think this is a long term solution, but better to warn than to - * die. - * - * --Larry - */ g_return_if_fail (src != NULL); - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_PIX]]; - if (dark_light & 0x1) - { - r = blend_dark_check[(a | src[RED_PIX])]; - g = blend_dark_check[(a | src[GREEN_PIX])]; - b = blend_dark_check[(a | src[BLUE_PIX])]; - } - else - { - r = blend_light_check[(a | src[RED_PIX])]; - g = blend_light_check[(a | src[GREEN_PIX])]; - b = blend_light_check[(a | src[BLUE_PIX])]; - } - - val = COLOR_COMPOSE (r, g, b); - src += 4; - - dest[0] = val; - dest[1] = val >> 8; - dest += 2; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - else - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_PIX]]; - if (dark_light & 0x1) - { - r = blend_dark_check[(a | src[RED_PIX])]; - g = blend_dark_check[(a | src[GREEN_PIX])]; - b = blend_dark_check[(a | src[BLUE_PIX])]; - } - else - { - r = blend_light_check[(a | src[RED_PIX])]; - g = blend_light_check[(a | src[GREEN_PIX])]; - b = blend_light_check[(a | src[BLUE_PIX])]; - } - - val = COLOR_COMPOSE (r, g, b); - src += 4; - - dest[0] = val >> 8; - dest[1] = val; - dest += 2; + for (x = info->x; x < xe; x++) + { + a = alpha[src[ALPHA_G_PIX]]; + if (dark_light & 0x1) + val = blend_dark_check[(a | src[GRAY_PIX])]; + else + val = blend_light_check[(a | src[GRAY_PIX])]; + src += 2; + + dest[0] = val; + dest[1] = val; + dest[2] = val; + dest += 3; - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } + if (((x + 1) & check_mod) == 0) + dark_light += 1; + } } info->dest += info->dest_bpl; + initial = FALSE; + if (((y + 1) % info->scaledest) == 0) { info->src_y += info->scalesrc; info->src = render_image_tile_fault (info); } - initial = FALSE; + error += step; } } static void -render_image_rgb_a_3 (RenderInfo *info) +render_image_rgb (RenderInfo *info) { gulong *lookup_red; gulong *lookup_green; gulong *lookup_blue; guchar *src; guchar *dest; - guint *alpha; - gulong r, g, b; - gulong val; - guint a; - int dark_light; int byte_order; int y, ye; int x, xe; int initial; + float error; + float step; lookup_red = g_lookup_red; lookup_green = g_lookup_green; lookup_blue = g_lookup_blue; - alpha = info->alpha; y = info->y; ye = info->y + info->h; xe = info->x + info->w; + step = info->scalesrc; + + error = y * step; + error -= (int)error - step; + initial = TRUE; byte_order = info->byte_order; info->src = render_image_tile_fault (info); for (; y < ye; y++) { - if (!initial && (y % info->scaledest) && (y & check_mod)) + if (!initial && (error < 1.0)) memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); else { src = info->src; dest = info->dest; - dark_light = (y >> check_shift) + (info->x >> check_shift); - g_return_if_fail (src != NULL); - if (byte_order == GDK_LSB_FIRST) - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_PIX]]; - if (dark_light & 0x1) - { - r = blend_dark_check[(a | src[RED_PIX])]; - g = blend_dark_check[(a | src[GREEN_PIX])]; - b = blend_dark_check[(a | src[BLUE_PIX])]; - } - else - { - r = blend_light_check[(a | src[RED_PIX])]; - g = blend_light_check[(a | src[GREEN_PIX])]; - b = blend_light_check[(a | src[BLUE_PIX])]; - } - - val = COLOR_COMPOSE (r, g, b); - src += 4; - - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 3; - - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } - else - for (x = info->x; x < xe; x++) - { - a = alpha[src[ALPHA_PIX]]; - if (dark_light & 0x1) - { - r = blend_dark_check[(a | src[RED_PIX])]; - g = blend_dark_check[(a | src[GREEN_PIX])]; - b = blend_dark_check[(a | src[BLUE_PIX])]; - } - else - { - r = blend_light_check[(a | src[RED_PIX])]; - g = blend_light_check[(a | src[GREEN_PIX])]; - b = blend_light_check[(a | src[BLUE_PIX])]; - } - - val = COLOR_COMPOSE (r, g, b); - src += 4; - - dest[0] = val >> 16; - dest[1] = val >> 8; - dest[2] = val; - dest += 3; + /* replace this with memcpy, or better yet, avoid it altogether? */ + for (x = info->x; x < xe; x++) + { + dest[0] = src[0]; + dest[1] = src[1]; + dest[2] = src[2]; - if (((x + 1) & check_mod) == 0) - dark_light += 1; - } + src += 3; + dest += 3; + } } info->dest += info->dest_bpl; + initial = FALSE; + if (((y + 1) % info->scaledest) == 0) { info->src_y += info->scalesrc; info->src = render_image_tile_fault (info); } - - initial = FALSE; } } + + static void -render_image_rgb_a_4 (RenderInfo *info) +render_image_rgb_a (RenderInfo *info) { gulong *lookup_red; gulong *lookup_green; @@ -2228,13 +646,14 @@ guchar *dest; guint *alpha; gulong r, g, b; - gulong val; guint a; int dark_light; int byte_order; int y, ye; int x, xe; int initial; + float error; + float step; lookup_red = g_lookup_red; lookup_green = g_lookup_green; @@ -2245,13 +664,18 @@ ye = info->y + info->h; xe = info->x + info->w; + step = info->scalesrc; + + error = y * step; + error -= ((int)error) - step; + initial = TRUE; byte_order = info->byte_order; info->src = render_image_tile_fault (info); for (; y < ye; y++) { - if (!initial && (y % info->scaledest) && (y & check_mod)) + if (!initial && (error < 1.0) && (y & check_mod)) memcpy (info->dest, info->dest - info->dest_bpl, info->dest_width); else { @@ -2279,13 +703,12 @@ b = blend_light_check[(a | src[BLUE_PIX])]; } - val = COLOR_COMPOSE (r, g, b); src += 4; - dest[0] = val; - dest[1] = val >> 8; - dest[2] = val >> 16; - dest += 4; + dest[0] = r; + dest[1] = g; + dest[2] = b; + dest += 3; if (((x + 1) & check_mod) == 0) dark_light += 1; @@ -2307,13 +730,12 @@ b = blend_light_check[(a | src[BLUE_PIX])]; } - val = COLOR_COMPOSE (r, g, b); src += 4; - dest[1] = val >> 16; - dest[2] = val >> 8; - dest[3] = val; - dest += 4; + dest[0] = r; + dest[1] = g; + dest[2] = b; + dest += 3; if (((x + 1) & check_mod) == 0) dark_light += 1; @@ -2322,17 +744,18 @@ info->dest += info->dest_bpl; + initial = FALSE; + if (((y + 1) % info->scaledest) == 0) { info->src_y += info->scalesrc; info->src = render_image_tile_fault (info); } - initial = FALSE; + error += step; } } - static void render_image_init_info (RenderInfo *info, GDisplay *gdisp, @@ -2408,7 +831,7 @@ if (!scale) scale = g_new (guchar, GXIMAGE_WIDTH + 1); - step = scalesrc * bpp; + step = scalesrc; for (i = 0; i <= width; i++) scale[i] = ((i + start + 1) % scaledest) ? 0 : step; diff -ruN gimp-1.0.2/app/indexed_palette.c gimp-1.0.3/app/indexed_palette.c --- gimp-1.0.2/app/indexed_palette.c Sun Apr 12 22:39:03 1998 +++ gimp-1.0.3/app/indexed_palette.c Thu Mar 11 18:16:45 1999 @@ -119,7 +119,7 @@ GtkWidget *menu_bar; GtkWidget *menu_bar_item; GtkWidget *hbox; - GtkAcceleratorTable *table; + GtkAccelGroup *accel_group; int default_index; if (!indexedP) @@ -127,14 +127,14 @@ indexedP = g_malloc (sizeof (IndexedPalette)); indexedP->gimage_id = -1; - table = gtk_accelerator_table_new (); + accel_group = gtk_accel_group_new (); /* The shell and main vbox */ indexedP->shell = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (indexedP->shell), "indexed_color_palette", "Gimp"); - gtk_window_set_policy (GTK_WINDOW (indexedP->shell), FALSE, FALSE, FALSE); + gtk_window_set_policy (GTK_WINDOW (indexedP->shell), FALSE, FALSE, FALSE); gtk_window_set_title (GTK_WINDOW (indexedP->shell), "Indexed Color Palette"); - gtk_window_add_accelerator_table (GTK_WINDOW (indexedP->shell), table); + gtk_window_add_accel_group (GTK_WINDOW (indexedP->shell), accel_group); gtk_signal_connect (GTK_OBJECT (indexedP->shell), "delete_event", GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete), NULL); @@ -161,7 +161,7 @@ gtk_widget_show (label); /* The indexed palette commands pulldown menu */ - ops_menu = build_menu (indexed_color_ops, table); + ops_menu = build_menu (indexed_color_ops, accel_group); menu_bar = gtk_menu_bar_new (); gtk_box_pack_start (GTK_BOX (util_box), menu_bar, FALSE, FALSE, 2); @@ -374,7 +374,7 @@ gimage->cmap[indexedP->col_index * 3 + 0] = r; gimage->cmap[indexedP->col_index * 3 + 1] = g; gimage->cmap[indexedP->col_index * 3 + 2] = b; - + gdisplays_update_full (gimage->ID); indexed_palette_draw (); /* Fallthrough */ @@ -410,12 +410,12 @@ r = gimage->cmap[indexedP->col_index * 3 + 0]; g = gimage->cmap[indexedP->col_index * 3 + 1]; b = gimage->cmap[indexedP->col_index * 3 + 2]; - if (active_color == FOREGROUND) + if (active_color == FOREGROUND) palette_set_foreground (r, g, b); else if (active_color == BACKGROUND) - palette_set_background (r, g, b); + palette_set_background (r, g, b); } - + if (bevent->button == 3) { indexedP->col_index = 16 * ((int)bevent->y / CELL_HEIGHT) + ((int)bevent->x / CELL_WIDTH); @@ -486,7 +486,7 @@ if (gimage_base_type (gimage) == INDEXED) { id = -1; - + /* make sure the default index gets set to _something_, if possible */ if (*default_index == -1) { diff -ruN gimp-1.0.2/app/info_window.c gimp-1.0.3/app/info_window.c --- gimp-1.0.2/app/info_window.c Sun Apr 12 22:39:07 1998 +++ gimp-1.0.3/app/info_window.c Thu Mar 11 18:16:46 1999 @@ -57,6 +57,8 @@ get_shades (GDisplay *gdisp, char *buf) { + sprintf(buf, "Using GdkRgb - we'll get back to you"); +#if 0 GtkPreviewInfo *info; info = gtk_preview_get_info (); @@ -91,6 +93,7 @@ sprintf (buf, "%d", gdisp->gimage->num_cols); break; } +#endif } static void diff -ruN gimp-1.0.2/app/interface.c gimp-1.0.3/app/interface.c --- gimp-1.0.2/app/interface.c Tue Oct 6 23:35:27 1998 +++ gimp-1.0.3/app/interface.c Fri Mar 26 22:15:36 1999 @@ -499,7 +499,7 @@ GtkWidget *main_vbox; GtkWidget *vbox; GtkWidget *menubar; - GtkAcceleratorTable *table; + GtkAccelGroup *table; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_wmclass (GTK_WINDOW (window), "toolbox", "Gimp"); @@ -535,7 +535,7 @@ gtk_widget_show (menubar); /* Install the accelerator table in the main window */ - gtk_window_add_accelerator_table (GTK_WINDOW (window), table); + gtk_window_add_accel_group (GTK_WINDOW (window), table); vbox = gtk_vbox_new (FALSE, 1); gtk_box_pack_start (GTK_BOX (main_vbox), vbox, TRUE, TRUE, 0); @@ -560,7 +560,7 @@ for (i = 21; i < NUM_TOOLS; i++) { gtk_object_sink (GTK_OBJECT (tool_widgets[i])); - } + } gtk_object_destroy (GTK_OBJECT (tool_tips)); gtk_object_unref (GTK_OBJECT (tool_tips)); } @@ -581,7 +581,7 @@ int type) { static GtkWidget *image_popup_menu = NULL; - static GtkAcceleratorTable *image_accelerator_table = NULL; + static GtkAccelGroup *image_accel_group = NULL; GDisplay *gdisp; GtkWidget *table; int n_width, n_height; @@ -705,13 +705,13 @@ GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); if (! image_popup_menu) - menus_get_image_menu (&image_popup_menu, &image_accelerator_table); + menus_get_image_menu (&image_popup_menu, &image_accel_group); /* the popup menu */ gdisp->popup = image_popup_menu; /* the accelerator table for images */ - gtk_window_add_accelerator_table (GTK_WINDOW (gdisp->shell), image_accelerator_table); + gtk_window_add_accel_group (GTK_WINDOW (gdisp->shell), image_accel_group); gtk_widget_show (gdisp->hsb); gtk_widget_show (gdisp->vsb); @@ -996,18 +996,25 @@ tool_label_area->allocation.width, tool_label_area->allocation.height); + /* gtk_container_disable_resize (GTK_CONTAINER (progress_area->parent)); + */ gtk_widget_hide (tool_label_area); gtk_widget_show (progress_area); + /* gtk_container_enable_resize (GTK_CONTAINER (progress_area->parent)); + */ } } void progress_update (float percentage) { + if (!(percentage >= 0.0 && percentage <= 1.0)) + return; + gtk_progress_bar_update (GTK_PROGRESS_BAR (progress_area), percentage); if (GTK_WIDGET_VISIBLE (progress_area)) @@ -1021,7 +1028,8 @@ if (GTK_WIDGET_VISIBLE (progress_area)) { - val = GTK_PROGRESS_BAR (progress_area)->percentage + 0.01; + val = gtk_progress_get_current_percentage(&(GTK_PROGRESS_BAR(progress_area)->progress))+ + 0.01; if (val > 1.0) val = 0.0; @@ -1034,12 +1042,16 @@ { if (GTK_WIDGET_VISIBLE (progress_area)) { - gtk_container_disable_resize (GTK_CONTAINER (progress_area->parent)); + /* + tk_container_disable_resize (GTK_CONTAINER (progress_area->parent)); + */ gtk_widget_hide (progress_area); gtk_widget_show (tool_label_area); + /* gtk_container_enable_resize (GTK_CONTAINER (progress_area->parent)); + */ gdk_flush (); diff -ruN gimp-1.0.2/app/layers_dialog.c gimp-1.0.3/app/layers_dialog.c --- gimp-1.0.2/app/layers_dialog.c Wed Jul 8 23:42:09 1998 +++ gimp-1.0.3/app/layers_dialog.c Mon Mar 15 08:31:45 1999 @@ -87,7 +87,7 @@ GtkWidget *mode_box; GtkWidget *opacity_box; GtkWidget *ops_menu; - GtkAcceleratorTable *accel_table; + GtkAccelGroup *accel_group; GtkAdjustment *opacity_data; GdkGC *red_gc; /* for non-applied layer masks */ GdkGC *green_gc; /* for visible layer masks */ @@ -298,12 +298,12 @@ if (lc_shell == NULL) { lc_shell = gtk_dialog_new (); - + gtk_window_set_title (GTK_WINDOW (lc_shell), "Layers & Channels"); gtk_window_set_wmclass (GTK_WINDOW (lc_shell), "layers_and_channels", "Gimp"); gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (lc_shell)->vbox), 2); gtk_signal_connect (GTK_OBJECT (lc_shell), - "delete_event", + "delete_event", GTK_SIGNAL_FUNC (lc_dialog_close_callback), NULL); gtk_signal_connect (GTK_OBJECT (lc_shell), @@ -369,21 +369,22 @@ gtk_widget_show (GTK_DIALOG(lc_shell)->action_area); - gtk_widget_show (lc_shell); - /* Make sure the channels page is realized */ gtk_notebook_set_page (GTK_NOTEBOOK (notebook), 1); gtk_notebook_set_page (GTK_NOTEBOOK (notebook), 0); layers_dialog_update (gimage_id); channels_dialog_update (gimage_id); + + gtk_widget_show (lc_shell); + gdisplays_flush (); } else { if (!GTK_WIDGET_VISIBLE (lc_shell)) gtk_widget_show (lc_shell); - else + else gdk_window_raise (lc_shell->window); layers_dialog_update (gimage_id); @@ -450,7 +451,7 @@ int flag; gimage_id = -1; - + flag = 0; if (lc_shell) { @@ -618,7 +619,7 @@ GtkWidget *menu; GtkWidget *slider; GtkWidget *listbox; - + if (!layersD) { @@ -629,7 +630,7 @@ layersD->active_channel = NULL; layersD->floating_sel = NULL; layersD->layer_widgets = NULL; - layersD->accel_table = gtk_accelerator_table_new (); + layersD->accel_group = gtk_accel_group_new (); layersD->green_gc = NULL; layersD->red_gc = NULL; @@ -644,7 +645,7 @@ gtk_container_border_width (GTK_CONTAINER (vbox), 2); /* The layers commands pulldown menu */ - layersD->ops_menu = build_menu (layers_ops, layersD->accel_table); + layersD->ops_menu = build_menu (layers_ops, layersD->accel_group); /* The Mode option menu, and the preserve transparency */ layersD->mode_box = util_box = gtk_hbox_new (FALSE, 1); @@ -695,7 +696,7 @@ gtk_box_pack_start (GTK_BOX (vbox), listbox, TRUE, TRUE, 2); layersD->layer_list = gtk_list_new (); - gtk_container_add (GTK_CONTAINER (listbox), layersD->layer_list); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox), layersD->layer_list); gtk_list_set_selection_mode (GTK_LIST (layersD->layer_list), GTK_SELECTION_BROWSE); gtk_signal_connect (GTK_OBJECT (layersD->layer_list), "event", (GtkSignalFunc) layer_list_events, @@ -703,7 +704,7 @@ gtk_container_set_focus_vadjustment (GTK_CONTAINER (layersD->layer_list), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (listbox))); GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (listbox)->vscrollbar, GTK_CAN_FOCUS); - + gtk_widget_show (layersD->layer_list); gtk_widget_show (listbox); @@ -1528,8 +1529,8 @@ if (!layersD) return; - gtk_window_add_accelerator_table (GTK_WINDOW (lc_shell), - layersD->accel_table); + gtk_window_add_accel_group (GTK_WINDOW (lc_shell), + layersD->accel_group); } static void @@ -1539,8 +1540,8 @@ if (!layersD) return; - gtk_window_remove_accelerator_table (GTK_WINDOW (lc_shell), - layersD->accel_table); + gtk_window_remove_accel_group (GTK_WINDOW (lc_shell), + layersD->accel_group); } static void @@ -1563,7 +1564,7 @@ if ((layer = gimage_floating_sel (gimage))) { floating_sel_to_layer (layer); - + gdisplays_flush (); } else @@ -1849,7 +1850,7 @@ lc_dialog_close_callback (GtkWidget *w, gpointer client_data) { - if (layersD) + if (layersD) layersD->gimage_id = -1; gtk_widget_hide (lc_shell); @@ -2017,7 +2018,7 @@ gtk_widget_show (hbox); gtk_widget_show (vbox); gtk_widget_show (list_item); - + gtk_widget_ref (layer_widget->list_item); return layer_widget; @@ -2105,7 +2106,7 @@ button_down = 1; click_widget = widget; gtk_grab_add (click_widget); - + if (widget == layer_widget->eye_widget) { old_state = GIMP_DRAWABLE(layer_widget->layer)->visible; @@ -2240,7 +2241,7 @@ case GDK_BUTTON_PRESS: /* Control-button press disables the application of the mask */ bevent = (GdkEventButton *) event; - + if (bevent->button == 3) { gtk_menu_popup (GTK_MENU (layersD->ops_menu), NULL, NULL, NULL, NULL, 3, bevent->time); return TRUE; @@ -2927,22 +2928,22 @@ layer = layer_new (gimage->ID, options->xsize, options->ysize, gimage_base_type_with_alpha (gimage), layer_name, OPAQUE_OPACITY, NORMAL_MODE); - if (layer) + if (layer) { drawable_fill (GIMP_DRAWABLE(layer), fill_type); gimage_add_layer (gimage, layer, -1); - + /* Endx the group undo */ undo_push_group_end (gimage); - + gdisplays_flush (); - } - else + } + else { g_message ("new_layer_query_ok_callback: could not allocate new layer"); } } - + gtk_widget_destroy (options->query_box); g_free (options); } @@ -3179,7 +3180,7 @@ { floating_sel_to_layer (layer); } - + g_free (GIMP_DRAWABLE(layer)->name); } GIMP_DRAWABLE(layer)->name = g_strdup (gtk_entry_get_text (GTK_ENTRY (options->name_entry))); @@ -3187,8 +3188,8 @@ gdisplays_flush (); - gtk_widget_destroy (options->query_box); - + gtk_widget_destroy (options->query_box); + g_free (options); } @@ -3838,7 +3839,7 @@ gpointer client_data) { layer_merge_query_cancel_callback (w, client_data); - + return TRUE; } diff -ruN gimp-1.0.2/app/main.c gimp-1.0.3/app/main.c --- gimp-1.0.2/app/main.c Wed Sep 9 19:07:08 1998 +++ gimp-1.0.3/app/main.c Fri Mar 26 22:15:37 1999 @@ -61,7 +61,7 @@ static char **gimp_argv; /* - * argv processing: + * argv processing: * Arguments are either switches, their associated * values, or image files. As switches and their * associated values are processed, those slots in @@ -99,9 +99,6 @@ gtk_set_locale (); setlocale(LC_NUMERIC, "C"); /* must use dot, not comma, as decimal separator */ gtk_init (&argc, &argv); - gtk_accelerator_table_set_mod_mask (NULL, GDK_SHIFT_MASK | - GDK_CONTROL_MASK | - GDK_MOD1_MASK); #ifdef HAVE_PUTENV display_name = gdk_get_display (); @@ -236,7 +233,7 @@ if (show_version || show_help) exit (0); - g_set_message_handler (&message_func); + g_set_message_handler ((GPrintFunc) message_func); /* Handle some signals */ signal (SIGHUP, on_signal); @@ -262,7 +259,7 @@ /* Main application loop */ if (!app_exit_finish_done ()) gtk_main (); - + return 0; } diff -ruN gimp-1.0.2/app/menus.c gimp-1.0.3/app/menus.c --- gimp-1.0.2/app/menus.c Sat May 30 00:32:14 1998 +++ gimp-1.0.3/app/menus.c Mon Mar 15 09:26:20 1999 @@ -32,320 +32,294 @@ #include "gdisplay.h" static void menus_init (void); -static void menus_foreach (gpointer key, - gpointer value, - gpointer user_data); -static gint menus_install_accel (GtkWidget *widget, - gchar *signal_name, - gchar key, - gchar modifiers, - gchar *path); -static void menus_remove_accel (GtkWidget *widget, - gchar *signal_name, - gchar *path); - -static GtkMenuEntry menu_items[] = -{ - { "/File/New", "N", file_new_cmd_callback, NULL }, - { "/File/Open", "O", file_open_cmd_callback, NULL }, - { "/File/About...", NULL, about_dialog_cmd_callback, NULL }, - { "/File/Preferences...", NULL, file_pref_cmd_callback, NULL }, - { "/File/Tip of the day", NULL, tips_dialog_cmd_callback, NULL }, - { "/File/", NULL, NULL, NULL }, - { "/File/Dialogs/Brushes...", "B", dialogs_brushes_cmd_callback, NULL }, - { "/File/Dialogs/Patterns...", "P", dialogs_patterns_cmd_callback, NULL }, - { "/File/Dialogs/Palette...", "P", dialogs_palette_cmd_callback, NULL }, - { "/File/Dialogs/Gradient Editor...", "G", dialogs_gradient_editor_cmd_callback, NULL }, - { "/File/Dialogs/Tool Options...", "T", dialogs_tools_options_cmd_callback, NULL }, - - { "/File/",NULL,NULL,NULL}, - - { "/File/Quit", "Q", file_quit_cmd_callback, NULL }, - - { "/File/New", "N", file_new_cmd_callback, (gpointer) 1 }, - { "/File/Open", "O", file_open_cmd_callback, NULL }, - { "/File/Save", "S", file_save_cmd_callback, NULL }, - { "/File/Save as", NULL, file_save_as_cmd_callback, NULL }, - { "/File/Preferences...", NULL, file_pref_cmd_callback, NULL }, - { "/File/", NULL, NULL, NULL }, - - - { "/File/Close", "W", file_close_cmd_callback, NULL }, - { "/File/Quit", "Q", file_quit_cmd_callback, NULL }, - { "/File/", NULL, NULL, NULL }, - - { "/Edit/Cut", "X", edit_cut_cmd_callback, NULL }, - { "/Edit/Copy", "C", edit_copy_cmd_callback, NULL }, - { "/Edit/Paste", "V", edit_paste_cmd_callback, NULL }, - { "/Edit/Paste Into", NULL, edit_paste_into_cmd_callback, NULL }, - { "/Edit/Clear", "K", edit_clear_cmd_callback, NULL }, - { "/Edit/Fill", ".", edit_fill_cmd_callback, NULL }, - { "/Edit/Stroke", NULL, edit_stroke_cmd_callback, NULL }, - { "/Edit/Undo", "Z", edit_undo_cmd_callback, NULL }, - { "/Edit/Redo", "R", edit_redo_cmd_callback, NULL }, - { "/Edit/", NULL, NULL, NULL }, - { "/Edit/Cut Named", "X", edit_named_cut_cmd_callback, NULL }, - { "/Edit/Copy Named", "C", edit_named_copy_cmd_callback, NULL }, - { "/Edit/Paste Named", "V", edit_named_paste_cmd_callback, NULL }, - { "/Edit/", NULL, NULL, NULL }, - - { "/Select/Toggle", "T", select_toggle_cmd_callback, NULL }, - { "/Select/Invert", "I", select_invert_cmd_callback, NULL }, - { "/Select/All", "A", select_all_cmd_callback, NULL }, - { "/Select/None", "A", select_none_cmd_callback, NULL }, - { "/Select/Float", "L", select_float_cmd_callback, NULL }, - { "/Select/Sharpen", "H", select_sharpen_cmd_callback, NULL }, - { "/Select/Border", "B", select_border_cmd_callback, NULL }, - { "/Select/Feather", "F", select_feather_cmd_callback, NULL }, - { "/Select/Grow", NULL, select_grow_cmd_callback, NULL }, - { "/Select/Shrink", NULL, select_shrink_cmd_callback, NULL }, - { "/Select/Save To Channel", NULL, select_save_cmd_callback, NULL }, - { "/Select/By Color...", NULL, select_by_color_cmd_callback, NULL }, - - { "/View/Zoom In", "=", view_zoomin_cmd_callback, NULL }, - { "/View/Zoom Out", "-", view_zoomout_cmd_callback, NULL }, - { "/View/Zoom/16:1", NULL, view_zoom_16_1_callback, NULL }, - { "/View/Zoom/8:1", NULL, view_zoom_8_1_callback, NULL }, - { "/View/Zoom/4:1", NULL, view_zoom_4_1_callback, NULL }, - { "/View/Zoom/2:1", NULL, view_zoom_2_1_callback, NULL }, - { "/View/Zoom/1:1", "1", view_zoom_1_1_callback, NULL }, - { "/View/Zoom/1:2", NULL, view_zoom_1_2_callback, NULL }, - { "/View/Zoom/1:4", NULL, view_zoom_1_4_callback, NULL }, - { "/View/Zoom/1:8", NULL, view_zoom_1_8_callback, NULL }, - { "/View/Zoom/1:16", NULL, view_zoom_1_16_callback, NULL }, - { "/View/Window Info...", "I", view_window_info_cmd_callback, NULL }, - { "/View/Toggle Rulers", "R", view_toggle_rulers_cmd_callback, NULL }, - { "/View/Toggle Guides", "T", view_toggle_guides_cmd_callback, NULL }, - { "/View/Snap To Guides", NULL, view_snap_to_guides_cmd_callback, NULL }, - { "/View/", NULL, NULL, NULL }, - { "/View/New View", NULL, view_new_view_cmd_callback, NULL }, - { "/View/Shrink Wrap", "E", view_shrink_wrap_cmd_callback, NULL }, - - { "/Image/Colors/Equalize", NULL, image_equalize_cmd_callback, NULL }, - { "/Image/Colors/Invert", NULL, image_invert_cmd_callback, NULL }, - { "/Image/Colors/Posterize", NULL, image_posterize_cmd_callback, NULL }, - { "/Image/Colors/Threshold", NULL, image_threshold_cmd_callback, NULL }, - { "/Image/Colors/", NULL, NULL, NULL }, - { "/Image/Colors/Color Balance", NULL, image_color_balance_cmd_callback, NULL }, - { "/Image/Colors/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL }, - { "/Image/Colors/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL }, - { "/Image/Colors/Curves", NULL, image_curves_cmd_callback, NULL }, - { "/Image/Colors/Levels", NULL, image_levels_cmd_callback, NULL }, - { "/Image/Colors/", NULL, NULL, NULL }, - { "/Image/Colors/Desaturate", NULL, image_desaturate_cmd_callback, NULL }, - { "/Image/Channel Ops/Duplicate", "D", channel_ops_duplicate_cmd_callback, NULL }, - { "/Image/Channel Ops/Offset", "O", channel_ops_offset_cmd_callback, NULL }, - { "/Image/Alpha/Add Alpha Channel", NULL, layers_add_alpha_channel_cmd_callback, NULL }, - - { "/Image/", NULL, NULL, NULL }, - { "/Image/RGB", NULL, image_convert_rgb_cmd_callback, NULL }, - { "/Image/Grayscale", NULL, image_convert_grayscale_cmd_callback, NULL }, - { "/Image/Indexed", NULL, image_convert_indexed_cmd_callback, NULL }, - { "/Image/", NULL, NULL, NULL }, - { "/Image/Resize", NULL, image_resize_cmd_callback, NULL }, - { "/Image/Scale", NULL, image_scale_cmd_callback, NULL }, - { "/Image/", NULL, NULL, NULL }, - { "/Image/Histogram", NULL, image_histogram_cmd_callback, NULL }, - { "/Image/", NULL, NULL, NULL }, - - { "/Layers/Layers & Channels...", "L", dialogs_lc_cmd_callback, NULL }, - { "/Layers/Raise Layer", "F", layers_raise_cmd_callback, NULL }, - { "/Layers/Lower Layer", "B", layers_lower_cmd_callback, NULL }, - { "/Layers/Anchor Layer", "H", layers_anchor_cmd_callback, NULL }, - { "/Layers/Merge Visible Layers", "M", layers_merge_cmd_callback, NULL }, - { "/Layers/Flatten Image", NULL, layers_flatten_cmd_callback, NULL }, - { "/Layers/Alpha To Selection", NULL, layers_alpha_select_cmd_callback, NULL }, - { "/Layers/Mask To Selection", NULL, layers_mask_select_cmd_callback, NULL }, - { "/Layers/Add Alpha Channel", NULL, layers_add_alpha_channel_cmd_callback, NULL }, - - { "/Tools/Rect Select", "R", tools_select_cmd_callback, (gpointer) RECT_SELECT }, - { "/Tools/Ellipse Select", "E", tools_select_cmd_callback, (gpointer) ELLIPSE_SELECT }, - { "/Tools/Free Select", "F", tools_select_cmd_callback, (gpointer) FREE_SELECT }, - { "/Tools/Fuzzy Select", "Z", tools_select_cmd_callback, (gpointer) FUZZY_SELECT }, - { "/Tools/Bezier Select", "B", tools_select_cmd_callback, (gpointer) BEZIER_SELECT }, - { "/Tools/Intelligent Scissors", "I", tools_select_cmd_callback, (gpointer) ISCISSORS }, - { "/Tools/Move", "M", tools_select_cmd_callback, (gpointer) MOVE }, - { "/Tools/Magnify", "M", tools_select_cmd_callback, (gpointer) MAGNIFY }, - { "/Tools/Crop", "C", tools_select_cmd_callback, (gpointer) CROP }, - { "/Tools/Transform", "T", tools_select_cmd_callback, (gpointer) ROTATE }, - { "/Tools/Flip", "F", tools_select_cmd_callback, (gpointer) FLIP_HORZ }, - { "/Tools/Text", "T", tools_select_cmd_callback, (gpointer) TEXT }, - { "/Tools/Color Picker", "O", tools_select_cmd_callback, (gpointer) COLOR_PICKER }, - { "/Tools/Bucket Fill", "B", tools_select_cmd_callback, (gpointer) BUCKET_FILL }, - { "/Tools/Blend", "L", tools_select_cmd_callback, (gpointer) BLEND }, - { "/Tools/Paintbrush", "P", tools_select_cmd_callback, (gpointer) PAINTBRUSH }, - { "/Tools/Pencil", "P", tools_select_cmd_callback, (gpointer) PENCIL }, - { "/Tools/Eraser", "E", tools_select_cmd_callback, (gpointer) ERASER }, - { "/Tools/Airbrush", "A", tools_select_cmd_callback, (gpointer) AIRBRUSH }, - { "/Tools/Clone", "C", tools_select_cmd_callback, (gpointer) CLONE }, - { "/Tools/Convolve", "V", tools_select_cmd_callback, (gpointer) CONVOLVE }, - { "/Tools/Default Colors", "D", tools_default_colors_cmd_callback, NULL}, - { "/Tools/Swap Colors", "X", tools_swap_colors_cmd_callback, NULL}, - { "/Tools/", NULL, NULL, NULL }, - { "/Tools/Toolbox", NULL, toolbox_raise_callback, NULL }, - - { "/Filters/", NULL, NULL, NULL }, - { "/Filters/Repeat last", "F", filters_repeat_cmd_callback, (gpointer) 0x0 }, - { "/Filters/Re-show last", "F", filters_repeat_cmd_callback, (gpointer) - 0x1 }, - { "/Filters/", NULL, NULL, NULL }, - - { "/Script-Fu/", NULL, NULL, NULL }, - - { "/Dialogs/Brushes...", "B", dialogs_brushes_cmd_callback, NULL }, - { "/Dialogs/Patterns...", "P", dialogs_patterns_cmd_callback, NULL }, - { "/Dialogs/Palette...", "P", dialogs_palette_cmd_callback, NULL }, - { "/Dialogs/Gradient Editor...", "G", dialogs_gradient_editor_cmd_callback, NULL }, - { "/Dialogs/Layers & Channels...", "L", dialogs_lc_cmd_callback, NULL }, - { "/Dialogs/Indexed Palette...", NULL, dialogs_indexed_palette_cmd_callback, NULL }, - { "/Dialogs/Tool Options...", NULL, dialogs_tools_options_cmd_callback, NULL }, - { "/Automatic", NULL, file_load_by_extension_callback, NULL }, - { "/", NULL, NULL, NULL }, +static GtkItemFactoryEntry toolbox_entries[] = +{ + { "/File/New", "N", file_new_cmd_callback, 0 }, + { "/File/Open", "O", file_open_cmd_callback, 0 }, + { "/File/About...", NULL, about_dialog_cmd_callback, 0 }, + { "/File/Preferences...", NULL, file_pref_cmd_callback, 0 }, + { "/File/Tip of the day", NULL, tips_dialog_cmd_callback, 0 }, + { "/File/---", NULL, NULL, 0, "" }, + { "/File/Dialogs/Brushes...", "B", dialogs_brushes_cmd_callback, 0 }, + { "/File/Dialogs/Patterns...", "P", dialogs_patterns_cmd_callback, 0 }, + { "/File/Dialogs/Palette...", "P", dialogs_palette_cmd_callback, 0 }, + { "/File/Dialogs/Gradient Editor...", "G", dialogs_gradient_editor_cmd_callback, 0 }, + { "/File/Dialogs/Tool Options...", "T", dialogs_tools_options_cmd_callback, 0 }, + { "/File/---", NULL, NULL, 0, "" }, + { "/File/Quit", "Q", file_quit_cmd_callback, 0 }, +}; +static guint n_toolbox_entries = sizeof (toolbox_entries) / sizeof (toolbox_entries[0]); +static GtkItemFactory *toolbox_factory = NULL; + +static GtkItemFactoryEntry image_entries[] = +{ + { "/File/New", "N", file_new_cmd_callback, 1 }, + { "/File/Open", "O", file_open_cmd_callback, 0 }, + { "/File/Save", "S", file_save_cmd_callback, 0 }, + { "/File/Save as", NULL, file_save_as_cmd_callback, 0 }, + { "/File/Preferences...", NULL, file_pref_cmd_callback, 0 }, + { "/File/---", NULL, NULL, 0, "" }, + + + { "/File/Close", "W", file_close_cmd_callback, 0 }, + { "/File/Quit", "Q", file_quit_cmd_callback, 0 }, + { "/File/---", NULL, NULL, 0, "" }, + + { "/Edit/Cut", "X", edit_cut_cmd_callback, 0 }, + { "/Edit/Copy", "C", edit_copy_cmd_callback, 0 }, + { "/Edit/Paste", "V", edit_paste_cmd_callback, 0 }, + { "/Edit/Paste Into", NULL, edit_paste_into_cmd_callback, 0 }, + { "/Edit/Clear", "K", edit_clear_cmd_callback, 0 }, + { "/Edit/Fill", ".", edit_fill_cmd_callback, 0 }, + { "/Edit/Stroke", NULL, edit_stroke_cmd_callback, 0 }, + { "/Edit/Undo", "Z", edit_undo_cmd_callback, 0 }, + { "/Edit/Redo", "R", edit_redo_cmd_callback, 0 }, + { "/Edit/---", NULL, NULL, 0, "" }, + { "/Edit/Cut Named", "X", edit_named_cut_cmd_callback, 0 }, + { "/Edit/Copy Named", "C", edit_named_copy_cmd_callback, 0 }, + { "/Edit/Paste Named", "V", edit_named_paste_cmd_callback, 0 }, + { "/Edit/---", NULL, NULL, 0, "" }, + + { "/Select/Toggle", "T", select_toggle_cmd_callback, 0 }, + { "/Select/Invert", "I", select_invert_cmd_callback, 0 }, + { "/Select/All", "A", select_all_cmd_callback, 0 }, + { "/Select/None", "A", select_none_cmd_callback, 0 }, + { "/Select/Float", "L", select_float_cmd_callback, 0 }, + { "/Select/Sharpen", "H", select_sharpen_cmd_callback, 0 }, + { "/Select/Border", "B", select_border_cmd_callback, 0 }, + { "/Select/Feather", "F", select_feather_cmd_callback, 0 }, + { "/Select/Grow", NULL, select_grow_cmd_callback, 0 }, + { "/Select/Shrink", NULL, select_shrink_cmd_callback, 0 }, + { "/Select/Save To Channel", NULL, select_save_cmd_callback, 0 }, + { "/Select/By Color...", NULL, select_by_color_cmd_callback, 0 }, + + { "/View/Zoom In", "equal", view_zoomin_cmd_callback, 0 }, + { "/View/Zoom Out", "minus", view_zoomout_cmd_callback, 0 }, + { "/View/Zoom/16:1", NULL, view_zoom_16_1_callback, 0 }, + { "/View/Zoom/8:1", NULL, view_zoom_8_1_callback, 0 }, + { "/View/Zoom/4:1", NULL, view_zoom_4_1_callback, 0 }, + { "/View/Zoom/2:1", NULL, view_zoom_2_1_callback, 0 }, + { "/View/Zoom/1:1", "1", view_zoom_1_1_callback, 0 }, + { "/View/Zoom/1:2", NULL, view_zoom_1_2_callback, 0 }, + { "/View/Zoom/1:4", NULL, view_zoom_1_4_callback, 0 }, + { "/View/Zoom/1:8", NULL, view_zoom_1_8_callback, 0 }, + { "/View/Zoom/1:16", NULL, view_zoom_1_16_callback, 0 }, + { "/View/Window Info...", "I", view_window_info_cmd_callback, 0 }, + { "/View/Toggle Rulers", "R", view_toggle_rulers_cmd_callback, 0, "" }, + { "/View/Toggle Guides", "T", view_toggle_guides_cmd_callback, 0, "" }, + { "/View/Snap To Guides", NULL, view_snap_to_guides_cmd_callback, 0, "" }, + { "/View/---", NULL, NULL, 0, "" }, + { "/View/New View", NULL, view_new_view_cmd_callback, 0 }, + { "/View/Shrink Wrap", "E", view_shrink_wrap_cmd_callback, 0 }, + + { "/Image/Colors/Equalize", NULL, image_equalize_cmd_callback, 0 }, + { "/Image/Colors/Invert", NULL, image_invert_cmd_callback, 0 }, + { "/Image/Colors/Posterize", NULL, image_posterize_cmd_callback, 0 }, + { "/Image/Colors/Threshold", NULL, image_threshold_cmd_callback, 0 }, + { "/Image/Colors/---", NULL, NULL, 0, "" }, + { "/Image/Colors/Color Balance", NULL, image_color_balance_cmd_callback, 0 }, + { "/Image/Colors/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, 0 }, + { "/Image/Colors/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, 0 }, + { "/Image/Colors/Curves", NULL, image_curves_cmd_callback, 0 }, + { "/Image/Colors/Levels", NULL, image_levels_cmd_callback, 0 }, + { "/Image/Colors/---", NULL, NULL, 0, "" }, + { "/Image/Colors/Desaturate", NULL, image_desaturate_cmd_callback, 0 }, + { "/Image/Channel Ops/Duplicate", "D", channel_ops_duplicate_cmd_callback, 0 }, + { "/Image/Channel Ops/Offset", "O", channel_ops_offset_cmd_callback, 0 }, + { "/Image/Alpha/Add Alpha Channel", NULL, layers_add_alpha_channel_cmd_callback, 0 }, + + { "/Image/---", NULL, NULL, 0, "" }, + { "/Image/RGB", NULL, image_convert_rgb_cmd_callback, 0 }, + { "/Image/Grayscale", NULL, image_convert_grayscale_cmd_callback, 0 }, + { "/Image/Indexed", NULL, image_convert_indexed_cmd_callback, 0 }, + { "/Image/---", NULL, NULL, 0, "" }, + { "/Image/Resize", NULL, image_resize_cmd_callback, 0 }, + { "/Image/Scale", NULL, image_scale_cmd_callback, 0 }, + { "/Image/---", NULL, NULL, 0, "" }, + { "/Image/Histogram", NULL, image_histogram_cmd_callback, 0 }, + { "/Image/---", NULL, NULL, 0, "" }, + + { "/Layers/Layers & Channels...", "L", dialogs_lc_cmd_callback, 0 }, + { "/Layers/Raise Layer", "F", layers_raise_cmd_callback, 0 }, + { "/Layers/Lower Layer", "B", layers_lower_cmd_callback, 0 }, + { "/Layers/Anchor Layer", "H", layers_anchor_cmd_callback, 0 }, + { "/Layers/Merge Visible Layers", "M", layers_merge_cmd_callback, 0 }, + { "/Layers/Flatten Image", NULL, layers_flatten_cmd_callback, 0 }, + { "/Layers/Alpha To Selection", NULL, layers_alpha_select_cmd_callback, 0 }, + { "/Layers/Mask To Selection", NULL, layers_mask_select_cmd_callback, 0 }, + { "/Layers/Add Alpha Channel", NULL, layers_add_alpha_channel_cmd_callback, 0 }, + + { "/Tools/Rect Select", "R", tools_select_cmd_callback, RECT_SELECT }, + { "/Tools/Ellipse Select", "E", tools_select_cmd_callback, ELLIPSE_SELECT }, + { "/Tools/Free Select", "F", tools_select_cmd_callback, FREE_SELECT }, + { "/Tools/Fuzzy Select", "Z", tools_select_cmd_callback, FUZZY_SELECT }, + { "/Tools/Bezier Select", "B", tools_select_cmd_callback, BEZIER_SELECT }, + { "/Tools/Intelligent Scissors", "I", tools_select_cmd_callback, ISCISSORS }, + { "/Tools/Move", "M", tools_select_cmd_callback, MOVE }, + { "/Tools/Magnify", "M", tools_select_cmd_callback, MAGNIFY }, + { "/Tools/Crop", "C", tools_select_cmd_callback, CROP }, + { "/Tools/Transform", "T", tools_select_cmd_callback, ROTATE }, + { "/Tools/Flip", "F", tools_select_cmd_callback, FLIP_HORZ }, + { "/Tools/Text", "T", tools_select_cmd_callback, TEXT }, + { "/Tools/Color Picker", "O", tools_select_cmd_callback, COLOR_PICKER }, + { "/Tools/Bucket Fill", "B", tools_select_cmd_callback, BUCKET_FILL }, + { "/Tools/Blend", "L", tools_select_cmd_callback, BLEND }, + { "/Tools/Paintbrush", "P", tools_select_cmd_callback, PAINTBRUSH }, + { "/Tools/Pencil", "P", tools_select_cmd_callback, PENCIL }, + { "/Tools/Eraser", "E", tools_select_cmd_callback, ERASER }, + { "/Tools/Airbrush", "A", tools_select_cmd_callback, AIRBRUSH }, + { "/Tools/Clone", "C", tools_select_cmd_callback, CLONE }, + { "/Tools/Convolve", "V", tools_select_cmd_callback, CONVOLVE }, + { "/Tools/Default Colors", "D", tools_default_colors_cmd_callback, 0 }, + { "/Tools/Swap Colors", "X", tools_swap_colors_cmd_callback, 0 }, + { "/Tools/---", NULL, NULL, 0, "" }, + { "/Tools/Toolbox", NULL, toolbox_raise_callback, 0 }, + + { "/Filters/", NULL, NULL, 0 }, + { "/Filters/Repeat last", "F", filters_repeat_cmd_callback, 0x0 }, + { "/Filters/Re-show last", "F", filters_repeat_cmd_callback, 0x1 }, + { "/Filters/---", NULL, NULL, 0, "" }, + + { "/Script-Fu/", NULL, NULL, 0 }, + + { "/Dialogs/Brushes...", "B", dialogs_brushes_cmd_callback, 0 }, + { "/Dialogs/Patterns...", "P", dialogs_patterns_cmd_callback, 0 }, + { "/Dialogs/Palette...", "P", dialogs_palette_cmd_callback, 0 }, + { "/Dialogs/Gradient Editor...", "G", dialogs_gradient_editor_cmd_callback, 0 }, + { "/Dialogs/Layers & Channels...", "L", dialogs_lc_cmd_callback, 0 }, + { "/Dialogs/Indexed Palette...", NULL, dialogs_indexed_palette_cmd_callback, 0 }, + { "/Dialogs/Tool Options...", NULL, dialogs_tools_options_cmd_callback, 0 }, +}; +static guint n_image_entries = sizeof (image_entries) / sizeof (image_entries[0]); +static GtkItemFactory *image_factory = NULL; - { "/By extension", NULL, file_save_by_extension_callback, NULL }, - { "/", NULL, NULL, NULL }, +static GtkItemFactoryEntry load_entries[] = +{ + { "/Automatic", NULL, file_load_by_extension_callback, 0 }, + { "/---", NULL, NULL, 0, "" }, + }; +static guint n_load_entries = sizeof (load_entries) / sizeof (load_entries[0]); +static GtkItemFactory *load_factory = NULL; + +static GtkItemFactoryEntry save_entries[] = +{ + { "/By extension", NULL, file_save_by_extension_callback, 0 }, + { "/---", NULL, NULL, 0, "" }, }; -static int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]); +static guint n_save_entries = sizeof (save_entries) / sizeof (save_entries[0]); +static GtkItemFactory *save_factory = NULL; static int initialize = TRUE; -static GtkMenuFactory *factory = NULL; -static GtkMenuFactory *subfactories[4]; -static GHashTable *entry_ht = NULL; void menus_get_toolbox_menubar (GtkWidget **menubar, - GtkAcceleratorTable **table) + GtkAccelGroup **accel_group) { if (initialize) menus_init (); if (menubar) - *menubar = subfactories[0]->widget; - if (table) - *table = subfactories[0]->table; + *menubar = toolbox_factory->widget; + if (accel_group) + *accel_group = toolbox_factory->accel_group; } void menus_get_image_menu (GtkWidget **menu, - GtkAcceleratorTable **table) + GtkAccelGroup **accel_group) { if (initialize) menus_init (); if (menu) - *menu = subfactories[1]->widget; - if (table) - *table = subfactories[1]->table; + *menu = image_factory->widget; + if (accel_group) + *accel_group = image_factory->accel_group; } void menus_get_load_menu (GtkWidget **menu, - GtkAcceleratorTable **table) + GtkAccelGroup **accel_group) { if (initialize) menus_init (); if (menu) - *menu = subfactories[2]->widget; - if (table) - *table = subfactories[2]->table; + *menu = load_factory->widget; + if (accel_group) + *accel_group = load_factory->accel_group; } void menus_get_save_menu (GtkWidget **menu, - GtkAcceleratorTable **table) + GtkAccelGroup **accel_group) { if (initialize) menus_init (); if (menu) - *menu = subfactories[3]->widget; - if (table) - *table = subfactories[3]->table; + *menu = save_factory->widget; + if (accel_group) + *accel_group = save_factory->accel_group; } void menus_create (GtkMenuEntry *entries, int nmenu_entries) { - char *accelerator; - int i; - if (initialize) menus_init (); - if (entry_ht) - for (i = 0; i < nmenu_entries; i++) - { - accelerator = g_hash_table_lookup (entry_ht, entries[i].path); - if (accelerator) - { - if (accelerator[0] == '\0') - entries[i].accelerator = NULL; - else - entries[i].accelerator = accelerator; - } - } - - gtk_menu_factory_add_entries (factory, entries, nmenu_entries); - - for (i = 0; i < nmenu_entries; i++) - if (entries[i].widget && GTK_BIN (entries[i].widget)->child) - { - gtk_signal_connect (GTK_OBJECT (entries[i].widget), "install_accelerator", - (GtkSignalFunc) menus_install_accel, - entries[i].path); - gtk_signal_connect (GTK_OBJECT (entries[i].widget), "remove_accelerator", - (GtkSignalFunc) menus_remove_accel, - entries[i].path); - } + gtk_item_factory_create_menu_entries (nmenu_entries, entries); } void menus_set_sensitive (char *path, int sensitive) { - GtkMenuPath *menu_path; + GtkItemFactory *ifactory; + GtkWidget *widget = NULL; if (initialize) menus_init (); - menu_path = gtk_menu_factory_find (factory, path); - if (menu_path) - gtk_widget_set_sensitive (menu_path->widget, sensitive); - else - g_message ("Unable to set sensitivity for menu which doesn't exist: %s", path); + ifactory = gtk_item_factory_from_path (path); + + if (ifactory) + { + widget = gtk_item_factory_get_widget (ifactory, path); + + gtk_widget_set_sensitive (widget, sensitive); + } + if (!ifactory || !widget) + printf ("Unable to set sensitivity for menu which doesn't exist:\n%s", path); } void menus_set_state (char *path, int state) { - GtkMenuPath *menu_path; + GtkItemFactory *ifactory; + GtkWidget *widget = NULL; if (initialize) menus_init (); - menu_path = gtk_menu_factory_find (factory, path); - if (menu_path) - { - if (GTK_IS_CHECK_MENU_ITEM (menu_path->widget)) - gtk_check_menu_item_set_state (GTK_CHECK_MENU_ITEM (menu_path->widget), state); - } - else - g_message ("Unable to set state for menu which doesn't exist: %s", path); -} + ifactory = gtk_item_factory_from_path (path); -void -menus_add_path (char *path, - char *accelerator) -{ - if (!entry_ht) - entry_ht = g_hash_table_new (g_str_hash, g_str_equal); + if (ifactory) + { + widget = gtk_item_factory_get_widget (ifactory, path); - g_hash_table_insert (entry_ht, path, accelerator); + if (widget && GTK_IS_CHECK_MENU_ITEM (widget)) + gtk_check_menu_item_set_state (GTK_CHECK_MENU_ITEM (widget), state); + else + widget = NULL; + } + if (!ifactory || !widget) + printf ("Unable to set state for menu which doesn't exist:\n%s", path); } void @@ -354,138 +328,61 @@ if (initialize) menus_init (); - gtk_menu_factory_remove_paths (factory, &path, 1); + gtk_item_factories_path_delete (NULL, path); } void menus_quit () { - FILE *fp; - char filename[512]; - char *gimp_dir; + gchar *filename; - if (entry_ht) - { - gimp_dir = gimp_directory (); - if ('\000' != gimp_dir[0]) - { - sprintf (filename, "%s/menurc", gimp_dir); - - fp = fopen (filename, "w"); - if (fp) - { - g_hash_table_foreach (entry_ht, menus_foreach, fp); - fclose (fp); - } - } - } + filename = g_strconcat (gimp_directory (), "/menurc", NULL); + gtk_item_factory_dump_rc (filename, NULL, TRUE); + g_free (filename); if (!initialize) { - gtk_menu_factory_destroy (factory); + gtk_object_unref (GTK_OBJECT (toolbox_factory)); + gtk_object_unref (GTK_OBJECT (image_factory)); + gtk_object_unref (GTK_OBJECT (load_factory)); + gtk_object_unref (GTK_OBJECT (save_factory)); } - } static void menus_init () { - char filename[512]; - if (initialize) { - initialize = FALSE; - - factory = gtk_menu_factory_new (GTK_MENU_FACTORY_MENU_BAR); - - subfactories[0] = gtk_menu_factory_new (GTK_MENU_FACTORY_MENU_BAR); - gtk_menu_factory_add_subfactory (factory, subfactories[0], ""); - - subfactories[1] = gtk_menu_factory_new (GTK_MENU_FACTORY_MENU); - gtk_menu_factory_add_subfactory (factory, subfactories[1], ""); - - subfactories[2] = gtk_menu_factory_new (GTK_MENU_FACTORY_MENU); - gtk_menu_factory_add_subfactory (factory, subfactories[2], ""); - - subfactories[3] = gtk_menu_factory_new (GTK_MENU_FACTORY_MENU); - gtk_menu_factory_add_subfactory (factory, subfactories[3], ""); - - sprintf (filename, "%s/menurc", gimp_directory ()); - parse_gimprc_file (filename); - - menus_create (menu_items, nmenu_items); - } -} - -static void -menus_foreach (gpointer key, - gpointer value, - gpointer user_data) -{ - char accel[64]; - int i, j; - - for (i = j = 0; ((char*) value)[i] != '\0'; i++, j++) - { - if (((char *) value)[i] == '"' || ((char *) value)[i] == '\\') - accel[j++] = '\\'; - accel[j] = ((char *) value)[i]; - } - - accel[j] = '\0'; - - fprintf ((FILE*) user_data, "(menu-path \"%s\" \"%s\")\n", (char*) key, accel); -} - -static gint -menus_install_accel (GtkWidget *widget, - gchar *signal_name, - gchar key, - gchar modifiers, - gchar *path) -{ - char accel[64]; - char *t1, t2[2]; - - accel[0] = '\0'; - if (modifiers & GDK_CONTROL_MASK) - strcat (accel, ""); - if (modifiers & GDK_SHIFT_MASK) - strcat (accel, ""); - if (modifiers & GDK_MOD1_MASK) - strcat (accel, ""); - - t2[0] = key; - t2[1] = '\0'; - strcat (accel, t2); - - if (entry_ht) - { - t1 = g_hash_table_lookup (entry_ht, path); - g_free (t1); - } - else - entry_ht = g_hash_table_new (g_str_hash, g_str_equal); - - g_hash_table_insert (entry_ht, path, g_strdup (accel)); - - return TRUE; -} + gchar *filename; -static void -menus_remove_accel (GtkWidget *widget, - gchar *signal_name, - gchar *path) -{ - char *t; - - if (entry_ht) - { - t = g_hash_table_lookup (entry_ht, path); - g_free (t); + initialize = FALSE; - g_hash_table_insert (entry_ht, path, g_strdup ("")); + toolbox_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "", NULL); + gtk_item_factory_create_items_ac (toolbox_factory, + n_toolbox_entries, + toolbox_entries, + NULL, 2); + image_factory = gtk_item_factory_new (GTK_TYPE_MENU, "", NULL); + gtk_item_factory_create_items_ac (image_factory, + n_image_entries, + image_entries, + NULL, 2); + load_factory = gtk_item_factory_new (GTK_TYPE_MENU, "", NULL); + gtk_item_factory_create_items_ac (load_factory, + n_load_entries, + load_entries, + NULL, 2); + save_factory = gtk_item_factory_new (GTK_TYPE_MENU, "", NULL); + gtk_item_factory_create_items_ac (save_factory, + n_save_entries, + save_entries, + NULL, 2); + + filename = g_strconcat (gimp_directory (), "/menurc", NULL); + gtk_item_factory_parse_rc (filename); + g_free (filename); } } diff -ruN gimp-1.0.2/app/menus.h gimp-1.0.3/app/menus.h --- gimp-1.0.2/app/menus.h Sun Apr 12 22:39:39 1998 +++ gimp-1.0.3/app/menus.h Mon Mar 15 09:26:21 1999 @@ -23,21 +23,19 @@ void menus_get_toolbox_menubar (GtkWidget **menubar, - GtkAcceleratorTable **table); + GtkAccelGroup **accel_group); void menus_get_image_menu (GtkWidget **menu, - GtkAcceleratorTable **table); + GtkAccelGroup **accel_group); void menus_get_load_menu (GtkWidget **menu, - GtkAcceleratorTable **table); + GtkAccelGroup **accel_group); void menus_get_save_menu (GtkWidget **menu, - GtkAcceleratorTable **table); + GtkAccelGroup **accel_group); void menus_create (GtkMenuEntry *entries, int nmenu_entries); void menus_set_sensitive (char *path, int sensitive); void menus_set_state (char *path, int state); -void menus_add_path (char *path, - char *accelerator); void menus_destroy (char *path); void menus_quit (void); diff -ruN gimp-1.0.2/app/patterns.c gimp-1.0.3/app/patterns.c --- gimp-1.0.2/app/patterns.c Thu May 28 02:03:31 1998 +++ gimp-1.0.3/app/patterns.c Fri Mar 26 22:15:38 1999 @@ -53,7 +53,7 @@ static void load_pattern (char *filename); static void free_pattern (GPatternP); static void pattern_free_one (gpointer, gpointer); -static gint pattern_compare_func (gpointer, gpointer); +static gint pattern_compare_func (gconstpointer, gconstpointer); /* function declarations */ @@ -92,7 +92,7 @@ } static gint -pattern_compare_func(gpointer first, gpointer second) +pattern_compare_func(gconstpointer first, gconstpointer second) { return strcmp (((GPatternP)first)->name, ((GPatternP)second)->name); } diff -ruN gimp-1.0.2/app/plug_in.c gimp-1.0.3/app/plug_in.c --- gimp-1.0.2/app/plug_in.c Thu Aug 27 13:37:13 1998 +++ gimp-1.0.3/app/plug_in.c Fri Mar 26 22:15:39 1999 @@ -445,7 +445,7 @@ { GSList *tmp; PlugIn *plug_in; - + #ifdef HAVE_SHM_H #ifndef IPC_RMID_DEFERRED_RELEASE if (shm_ID != -1) @@ -458,7 +458,7 @@ shmdt ((char*) shm_addr); #endif #endif - + tmp = open_plug_ins; while (tmp) { @@ -1048,7 +1048,7 @@ Argument* plug_in_run (ProcRecord *proc_rec, Argument *args, - int synchronous, + int synchronous, int destroy_values) { GPConfig config; @@ -1112,12 +1112,12 @@ if (plug_in->recurse) { gtk_main (); - + return_vals = plug_in_get_current_return_vals (proc_rec); } } } - + done: if (return_vals && destroy_values) { @@ -1220,7 +1220,7 @@ memset (&msg, 0, sizeof (WireMessage)); if (!wire_read_msg (current_readfd, &msg)) plug_in_close (current_plug_in, TRUE); - else + else { plug_in_handle_message (&msg); wire_destroy (&msg); @@ -1615,22 +1615,22 @@ * Sanity check for array arguments */ - for (i = 1; i < proc_install->nparams; i++) + for (i = 1; i < proc_install->nparams; i++) { if ((proc_install->params[i].type == PDB_INT32ARRAY || proc_install->params[i].type == PDB_INT8ARRAY || proc_install->params[i].type == PDB_FLOATARRAY || proc_install->params[i].type == PDB_STRINGARRAY) && - proc_install->params[i-1].type != PDB_INT32) + proc_install->params[i-1].type != PDB_INT32) { g_message ("plug_in \"%s\" attempted to install procedure \"%s\" " "which fails to comply with the array parameter " - "passing standard. Argument %d is noncompliant.", + "passing standard. Argument %d is noncompliant.", current_plug_in->args[0], proc_install->name, i); return; } } - + /* * Initialization @@ -2071,7 +2071,7 @@ { if (!wire_read_msg (current_readfd, &msg)) plug_in_close (current_plug_in, TRUE); - else + else { plug_in_handle_message (&msg); wire_destroy (&msg); @@ -2416,7 +2416,7 @@ plug_in->recurse = TRUE; gtk_main (); - + return_vals = plug_in_get_current_return_vals (proc_rec); plug_in->recurse = old_recurse; plug_in->busy = FALSE; @@ -3026,6 +3026,9 @@ double percentage) { #ifdef SEPARATE_PROGRESS_BAR + if (!(percentage >= 0.0 && percentage <= 1.0)) + return; + if (!plug_in->progress) plug_in_progress_init (plug_in, NULL); @@ -3086,12 +3089,12 @@ message_handler_set_invoker (Argument *args) { int success = TRUE; - + if ((args[0].value.pdb_int >= MESSAGE_BOX) && (args[0].value.pdb_int <= CONSOLE)) message_handler = args[0].value.pdb_int; else success = FALSE; - + return procedural_db_return_args (&message_handler_set_proc, success); } diff -ruN gimp-1.0.2/app/procedural_db.c gimp-1.0.3/app/procedural_db.c --- gimp-1.0.2/app/procedural_db.c Tue Oct 13 17:00:31 1998 +++ gimp-1.0.3/app/procedural_db.c Fri Mar 26 22:15:41 1999 @@ -66,9 +66,7 @@ static Argument * procedural_db_query (Argument *); static void procedural_db_query_entry (gpointer, gpointer, gpointer); static int match_strings (regex_t *, char *); -static guint procedural_db_hash_func (gpointer key); -static gint procedural_db_compare_func (gpointer a, gpointer b); - +static guint procedural_db_hash_func (gconstpointer key); /* Local data */ static GHashTable *procedural_ht = NULL; @@ -485,7 +483,7 @@ app_init_update_status("Procedural Database", NULL, -1); if (!procedural_ht) procedural_ht = g_hash_table_new (procedural_db_hash_func, - procedural_db_compare_func); + g_str_equal); } void @@ -1128,7 +1126,7 @@ } static guint -procedural_db_hash_func (gpointer key) +procedural_db_hash_func (gconstpointer key) { gchar *string; guint result; @@ -1172,9 +1170,4 @@ return result; } -static gint -procedural_db_compare_func (gpointer a, - gpointer b) -{ - return (strcmp ((char *) a, (char *) b) == 0); -} + diff -ruN gimp-1.0.2/app/regex.c gimp-1.0.3/app/regex.c --- gimp-1.0.2/app/regex.c Thu May 28 02:03:35 1998 +++ gimp-1.0.3/app/regex.c Sat Jan 2 15:11:50 1999 @@ -1207,7 +1207,7 @@ #define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code) \ do { \ - char *destination; \ + /* char *destination; */ \ /* Must be int, so when we don't save any registers, the arithmetic \ of 0 + -1 isn't done as unsigned. */ \ /* Can't be int, since there is not a shred of a guarantee that int \ diff -ruN gimp-1.0.2/app/text_tool.c gimp-1.0.3/app/text_tool.c --- gimp-1.0.2/app/text_tool.c Mon Sep 21 01:50:41 1998 +++ gimp-1.0.3/app/text_tool.c Sun Mar 14 20:30:12 1999 @@ -443,7 +443,7 @@ gtk_widget_set_usize (list_box, FONT_LIST_WIDTH, FONT_LIST_HEIGHT); gtk_box_pack_start (GTK_BOX (top_hbox), list_box, TRUE, TRUE, 0); text_tool->font_list = gtk_list_new (); - gtk_container_add (GTK_CONTAINER (list_box), text_tool->font_list); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (list_box), text_tool->font_list); gtk_list_set_selection_mode (GTK_LIST (text_tool->font_list), GTK_SELECTION_BROWSE); gtk_container_set_focus_vadjustment (GTK_CONTAINER (text_tool->font_list), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (list_box))); diff -ruN gimp-1.0.2/app/tile_swap.c gimp-1.0.3/app/tile_swap.c --- gimp-1.0.2/app/tile_swap.c Sat Jul 4 17:07:02 1998 +++ gimp-1.0.3/app/tile_swap.c Sun Nov 8 18:26:31 1998 @@ -265,6 +265,8 @@ return; } } while ((* swap_file->swap_func) (swap_file->fd, tile, command, swap_file->user_data)); + + write_err_msg = read_err_msg = seek_err_msg = TRUE; } static void @@ -386,7 +388,6 @@ /* Do not delete the swap from the file */ /* tile_swap_default_delete (def_swap_file, fd, tile); */ - read_err_msg = seek_err_msg = TRUE; } static void @@ -440,8 +441,6 @@ g_free (tile->data); tile->data = NULL; - - write_err_msg = seek_err_msg = TRUE; } static void diff -ruN gimp-1.0.2/app/tools.c gimp-1.0.3/app/tools.c --- gimp-1.0.2/app/tools.c Mon Jun 15 01:15:42 1998 +++ gimp-1.0.3/app/tools.c Thu Mar 11 18:16:53 1999 @@ -119,8 +119,9 @@ static void active_tool_free (void) { + /* gtk_container_disable_resize (GTK_CONTAINER (options_shell)); - + */ if (!active_tool) return; @@ -360,7 +361,9 @@ if (tool_info[(int) active_tool->type].tool_options) gtk_widget_show (tool_info[(int) active_tool->type].tool_options); - gtk_container_enable_resize (GTK_CONTAINER (options_shell)); + /* + gtk_container_enable_resize (GTK_CONTAINER (options_shell)); + */ /* Set the paused count variable to 0 */ @@ -540,7 +543,9 @@ if (tool_info[(int) active_tool->type].tool_options) gtk_widget_show (tool_info[(int) active_tool->type].tool_options); + /* gtk_container_enable_resize (GTK_CONTAINER (options_shell)); + */ /* Set the paused count variable to 0 */ diff -ruN gimp-1.0.2/config.guess gimp-1.0.3/config.guess --- gimp-1.0.2/config.guess Thu Apr 30 14:33:20 1998 +++ gimp-1.0.3/config.guess Sun Mar 28 14:42:25 1999 @@ -1,6 +1,6 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ # Written by Per Bothner . # The master version of this file is at the FSF in /home/gd/gnu/lib. +# Please send patches to the Autoconf mailing list . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -46,7 +47,8 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15 +dummy=dummy-$$ +trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 # Note: order is significant - the case branches are not exclusive. @@ -59,7 +61,7 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <dummy.s + cat <$dummy.s .globl main .ent main main: @@ -76,9 +78,9 @@ ret \$31,(\$26),1 .end main EOF - ${CC-cc} dummy.s -o dummy 2>/dev/null + ${CC-cc} $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then - ./dummy + ./$dummy case "$?" in 7) UNAME_MACHINE="alpha" @@ -97,7 +99,7 @@ ;; esac fi - rm -f dummy.s dummy + rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` exit 0 ;; 21064:Windows_NT:50:3) @@ -112,6 +114,9 @@ amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit 0 ;; arc64:OpenBSD:*:*) echo mips64el-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -139,7 +144,7 @@ SR2?01:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*) + Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 @@ -147,9 +152,12 @@ echo pyramid-pyramid-bsd fi exit 0 ;; - NILE:*:*:dcosx) + NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -216,6 +224,9 @@ powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; + macppc:NetBSD:*:*) + echo powerpc-apple-netbsd${UNAME_RELEASE} + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit 0 ;; @@ -229,8 +240,12 @@ echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) - sed 's/^ //' << EOF >dummy.c - int main (argc, argv) int argc; char **argv; { + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); @@ -245,10 +260,10 @@ exit (-1); } EOF - ${CC-cc} dummy.c -o dummy \ - && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + ${CC-cc} $dummy.c -o $dummy \ + && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Night_Hawk:Power_UNIX:*:*) @@ -300,7 +315,7 @@ exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - sed 's/^ //' << EOF >dummy.c + sed 's/^ //' << EOF >$dummy.c #include main() @@ -311,8 +326,8 @@ exit(0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + ${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -321,7 +336,8 @@ fi exit 0 ;; *:AIX:*:4) - if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -354,18 +370,50 @@ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 exit 0 ;; - 9000/[3478]??:HP-UX:*:*) + 9000/[34678]??:HP-UX:*:*) case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;; - 9000/8?? ) HP_ARCH=hppa1.0 ;; + 9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 ) + sed 's/^ //' << EOF >$dummy.c + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (${CC-cc} $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + rm -f $dummy.c $dummy esac HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) - sed 's/^ //' << EOF >dummy.c + sed 's/^ //' << EOF >$dummy.c #include int main () @@ -390,8 +438,8 @@ exit (0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + ${CC-cc} $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -400,6 +448,12 @@ 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; + *9??*:MPE*:*:*) + echo hppa1.0-hp-mpeix + exit 0 ;; + *9??*:MPE*:*:*) + echo hppa1.0-hp-mpeix + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf exit 0 ;; @@ -448,6 +502,9 @@ CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} exit 0 ;; + CRAY*T3E:*:*:*) + echo t3e-cray-unicosmk${UNAME_RELEASE} + exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos exit 0 ;; @@ -465,10 +522,22 @@ hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - i?86:BSD/386:*:* | *:BSD/OS:*:*) + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; + i?86:BSD/386:*:* | i?86:BSD/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; *:FreeBSD:*:*) + if test -x /usr/bin/objformat; then + if test "elf" = "`/usr/bin/objformat`"; then + echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` + exit 0 + fi + fi echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; *:NetBSD:*:*) @@ -478,13 +547,13 @@ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) - echo i386-pc-cygwin32 + echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; i*:MINGW*:*) - echo i386-pc-mingw32 + echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin32 + echo powerpcle-unknown-cygwin exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -493,6 +562,13 @@ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; *:Linux:*:*) + # uname on the ARM produces all sorts of strangeness, and we need to + # filter it out. + case "$UNAME_MACHINE" in + armv*) UNAME_MACHINE=$UNAME_MACHINE ;; + arm* | sa110*) UNAME_MACHINE="arm" ;; + esac + # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` @@ -506,12 +582,13 @@ i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; + armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; esac if test "${UNAME_MACHINE}" = "alpha" ; then - sed 's/^ //' <dummy.s + sed 's/^ //' <$dummy.s .globl main .ent main main: @@ -529,9 +606,9 @@ .end main EOF LIBC="" - ${CC-cc} dummy.s -o dummy 2>/dev/null + ${CC-cc} $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then - ./dummy + ./$dummy case "$?" in 7) UNAME_MACHINE="alpha" @@ -548,22 +625,23 @@ 16) UNAME_MACHINE="alphaev6" ;; - esac + esac - objdump --private-headers dummy | \ + objdump --private-headers $dummy | \ grep ld.so.1 > /dev/null if test "$?" = 0 ; then LIBC="libc1" fi - fi - rm -f dummy.s dummy + fi + rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 elif test "${UNAME_MACHINE}" = "mips" ; then - cat >dummy.c <$dummy.c </dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy else # Either a pre-BFD a.out linker (linux-gnuoldld) # or one that does not give us useful --help. @@ -593,12 +671,13 @@ ;; esac # Determine whether the default compiler is a.out or elf - cat >dummy.c <$dummy.c < -main(argc, argv) - int argc; - char *argv[]; -{ +#ifdef __cplusplus + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #ifdef __ELF__ # ifdef __GLIBC__ # if __GLIBC__ >= 2 @@ -615,8 +694,8 @@ return 0; } EOF - ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + ${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy fi ;; # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions # are messed up and put the nodename in both sysname and nodename. @@ -652,6 +731,13 @@ echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; + i?86:UnixWare:*:*) + if /bin/uname -X 2>/dev/null >/dev/null ; then + (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + fi + echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION} + exit 0 ;; pc:*:*:*) # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. @@ -693,7 +779,7 @@ mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i?86:LynxOS:2.*:*) + i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; TSUNAMI:LynxOS:2.*:*) @@ -705,6 +791,9 @@ SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit 0 ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 exit 0 ;; @@ -735,19 +824,40 @@ news*:NEWS-OS:*:6*) echo mips-sony-newsos6 exit 0 ;; - R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*) + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi exit 0 ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit 0 ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit 0 ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit 0 ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit 0 ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit 0 ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -cat >dummy.c <$dummy.c < # include @@ -785,7 +895,10 @@ #endif int version; version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); exit (0); #endif @@ -845,8 +958,8 @@ } EOF -${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 -rm -f dummy.c dummy +${CC-cc} $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 +rm -f $dummy.c $dummy # Apollos put the system type in the environment. diff -ruN gimp-1.0.2/config.h.in gimp-1.0.3/config.h.in --- gimp-1.0.2/config.h.in Thu Aug 27 13:08:38 1998 +++ gimp-1.0.3/config.h.in Fri Mar 26 22:15:27 1999 @@ -82,3 +82,7 @@ /* Define if you have the header file. */ #undef HAVE_SYS_NDIR_H + +/* define if compiled symbols have a leading underscore */ +#undef WITH_SYMBOL_UNDERSCORE + diff -ruN gimp-1.0.2/config.sub gimp-1.0.3/config.sub --- gimp-1.0.2/config.sub Thu Apr 30 14:33:21 1998 +++ gimp-1.0.3/config.sub Sun Mar 28 14:42:27 1999 @@ -1,6 +1,6 @@ #! /bin/sh # Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc. # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -150,8 +150,9 @@ # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ - | arme[lb] | pyramid | mn10200 | mn10300 \ - | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \ + | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ + | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \ + | hppa2.0w \ | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \ | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \ | mips64 | mipsel | mips64el | mips64orion | mips64orionel \ @@ -162,7 +163,7 @@ # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[3456]86) + i[34567]86) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -171,18 +172,19 @@ exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \ + vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ - | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \ + | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \ + | hppa2.0w-* \ | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \ | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ | sparc64-* | mips64-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* \ | mipstx39-* | mipstx39el-* \ - | f301-*) + | f301-* | armv*-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -345,24 +347,32 @@ hppa-next) os=-nextstep3 ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + os=-mpeix + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + os=-mpeix + ;; i370-ibm* | ibm*) basic_machine=i370-ibm os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[3456]86v32) + i[34567]86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; - i[3456]86v4*) + i[34567]86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; - i[3456]86v) + i[34567]86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; - i[3456]86sol2) + i[34567]86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; @@ -412,6 +422,10 @@ basic_machine=i486-ncr os=-sysv4 ;; + netwinder) + basic_machine=armv4l-corel + os=-linux + ;; news | news700 | news800 | news900) basic_machine=m68k-sony os=-newsos @@ -469,25 +483,23 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5) - basic_machine=i586-intel + pentium | p5 | k5 | nexen) + basic_machine=i586-pc ;; - pentiumpro | p6) - basic_machine=i686-intel + pentiumpro | p6 | k6 | 6x86) + basic_machine=i686-pc ;; - pentium-* | p5-*) + pentiumii | pentium2) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | nexen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-*) + pentiumpro-* | p6-* | k6-* | 6x86-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - k5) - # We don't have specific support for AMD's K5 yet, so just call it a Pentium - basic_machine=i586-amd - ;; - nexen) - # We don't have specific support for Nexgen yet, so just call it a Pentium - basic_machine=i586-nexgen + pentiumii-* | pentium2-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -715,8 +727,9 @@ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv*) + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \ + | -openstep* | -mpeix* | -oskit*) # Remember, each alternative MUST END IN *, to match a version number. ;; -linux*) @@ -802,6 +815,9 @@ *-acorn) os=-riscix1.2 ;; + arm*-corel) + os=-linux + ;; arm*-semi) os=-aout ;; @@ -829,6 +845,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + *-be) + os=-beos + ;; *-ibm) os=-aix ;; @@ -917,6 +936,12 @@ vendor=ibm ;; -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -mpeix*) vendor=hp ;; -hiux*) diff -ruN gimp-1.0.2/configure gimp-1.0.3/configure --- gimp-1.0.2/configure Tue Oct 13 16:54:31 1998 +++ gimp-1.0.3/configure Mon Mar 29 12:52:47 1999 @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -12,16 +12,14 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --enable-shared build shared libraries [default=yes] - --enable-shared=PKGS only build shared libraries if the current package - appears as an element in the PKGS list" + --enable-shared[=PKGS] build shared libraries [default=yes]" ac_help="$ac_help - --enable-static build static libraries [default=yes] - --enable-static=PKGS only build shared libraries if the current package - appears as an element in the PKGS list" + --enable-static[=PKGS] build static libraries [default=yes]" ac_help="$ac_help --with-gnu-ld assume the C compiler uses GNU ld [default=no]" ac_help="$ac_help + --disable-libtool-lock force libtool not to do file locking" +ac_help="$ac_help --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer" ac_help="$ac_help @@ -86,6 +84,7 @@ # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 @@ -369,7 +368,7 @@ verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -539,9 +538,11 @@ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -558,7 +559,7 @@ GIMP_MAJOR_VERSION=1 GIMP_MINOR_VERSION=0 -GIMP_MICRO_VERSION=2 +GIMP_MICRO_VERSION=3 GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION @@ -588,28 +589,30 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:596: checking for a BSD compatible install" >&5 +echo "configure:598: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" @@ -639,13 +642,12 @@ # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:649: checking whether build environment is sane" >&5 +echo "configure:651: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -702,7 +704,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:706: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:708: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -741,7 +743,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:745: checking for working aclocal" >&5 +echo "configure:747: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -754,7 +756,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:758: checking for working autoconf" >&5 +echo "configure:760: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -767,7 +769,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:771: checking for working automake" >&5 +echo "configure:773: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -780,7 +782,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:784: checking for working autoheader" >&5 +echo "configure:786: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -793,7 +795,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:797: checking for working makeinfo" >&5 +echo "configure:799: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -859,43 +861,62 @@ # Make sure we can run config.sub. -if $ac_config_sub sun4 >/dev/null 2>&1; then : +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:868: checking host system type" >&5 +echo "configure:870: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) - if host_alias=`$ac_config_guess`; then : + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac -host=`$ac_config_sub $host_alias` +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:891: checking build system type" >&5 + +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac + +build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 + # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:891: checking for $ac_word" >&5 +echo "configure:911: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" @@ -916,15 +937,16 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:920: checking for $ac_word" >&5 +echo "configure:941: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -945,16 +967,17 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:949: checking for $ac_word" >&5 +echo "configure:971: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then @@ -989,25 +1012,61 @@ echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1022: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:997: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1054: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext < conftest.$ac_ext << EOF + +#line 1065 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1021,18 +1080,24 @@ ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1031: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1096: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1036: checking whether we are using GNU C" >&5 +echo "configure:1101: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1041,7 +1106,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1052,11 +1117,15 @@ if test $ac_cv_prog_gcc = yes; then GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1060: checking whether ${CC-cc} accepts -g" >&5 +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:1129: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1071,16 +1140,20 @@ fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-O2" + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi # Check whether --with-gnu-ld or --without-gnu-ld was given. @@ -1091,18 +1164,53 @@ with_gnu_ld=no fi - ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1100: checking for ld used by GCC" >&5 +echo "configure:1172: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in - # Accept absolute paths. - /* | A-Za-z:\\*) - test -z "$LD" && LD="$ac_prog" - ;; + # Accept absolute paths. + /* | [A-Za-z]:/*) + # Canonicalize the path of ld + re_direlt='/[^/][^/]*/\.\./' + sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%' + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + case "$host_os" in + cygwin*) + # Convert to a UNC path for cygwin + test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"` + ;; + *) + test -z "$LD" && LD="$ac_prog" + ;; + esac + ;; + ## + ## FIXME: The code fails later on if we try to use an $LD with + ## '\\' path separators. + ## + [A-Za-z]:[\\]*) + # Canonicalize the path of ld + re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)' + sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%' + sub_uncdir='s%\\%/%g' + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"` + done + case "$host_os" in + cygwin*) + # Convert to a UNC path for cygwin + test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"` + ;; + *) + test -z "$LD" && LD="$ac_prog" + ;; + esac + ;; "") # If it fails, then pretend we aren't using GCC. ac_prog=ld @@ -1114,10 +1222,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1118: checking for GNU ld" >&5 +echo "configure:1226: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1121: checking for non-GNU ld" >&5 +echo "configure:1229: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1153,7 +1261,7 @@ test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1157: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1265: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1169,15 +1277,14 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1173: checking for BSD-compatible nm" >&5 +echo "configure:1281: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - case "$NM" in -/* | A-Za-z:\\*) - ac_cv_path_NM="$NM" # Let the user override the test with a path. - ;; -*) + if test -n "$NM"; then + # Let the user override the test. + ac_cv_path_NM="$NM" +else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do test -z "$ac_dir" && ac_dir=. @@ -1197,16 +1304,219 @@ done IFS="$ac_save_ifs" test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm - ;; -esac +fi fi NM="$ac_cv_path_NM" echo "$ac_t""$NM" 1>&6 +# Check for command to grab the raw symbol name followed by C symbol from nm. +echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 +echo "configure:1317: checking command to parse $NM output" >&5 +if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # These are sane defaults that work on at least a few old systems. +# {They come from Ultrix. What could be older than Ultrix?!! ;)} + +# Character class describing NM global symbol codes. +ac_symcode='[BCDEGRSTU]' + +# Regexp to match symbols that can be accessed directly from C. +ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + +# Transform the above into a raw symbol and a C symbol. +ac_symxfrm='\1 \1' + +# Define system-specific variables. +case "$host_os" in +aix*) + ac_symcode='[BCDTU]' + ;; +sunos* | cygwin32* | mingw32*) + ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)' + ac_symxfrm='_\1 \1' + ;; +irix*) + # Cannot use undefined symbols on IRIX because inlined functions mess us up. + ac_symcode='[BCDEGRST]' + ;; +solaris*) + ac_symcode='[BDTU]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then + ac_symcode='[ABCDGISTUW]' +fi + +case "$host_os" in +cygwin32* | mingw32*) + # We do not want undefined symbols on cygwin32. The user must + # arrange to define them via -l arguments. + ac_symcode='[ABCDGISTW]' + ;; +esac + +# Write the raw and C identifiers. +ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'" + +# Check to see that the pipe works correctly. +ac_pipe_works=no +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + # Now try to grab the symbols. + ac_nlist=conftest.nm + if { (eval echo configure:1383: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then + + # Try sorting and uniquifying the output. + if sort "$ac_nlist" | uniq > "$ac_nlist"T; then + mv -f "$ac_nlist"T "$ac_nlist" + ac_wcout=`wc "$ac_nlist" 2>/dev/null` + ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'` + (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1 + else + rm -f "$ac_nlist"T + ac_count=-1 + fi + + # Make sure that we snagged all the symbols we need. + if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then + if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then + cat < conftest.c +#ifdef __cplusplus +extern "C" { +#endif + +EOF + # Now generate the symbol file. + sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c + + cat <> conftest.c +#if defined (__STDC__) && __STDC__ +# define __ptr_t void * +#else +# define __ptr_t char * +#endif + +/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */ +int dld_preloaded_symbol_count = $ac_count; + +/* The mapping between symbol names and symbols. */ +struct { + char *name; + __ptr_t address; +} +dld_preloaded_symbols[] = +{ +EOF + sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c + cat <<\EOF >> conftest.c + {0, (__ptr_t) 0} +}; + +#ifdef __cplusplus +} +#endif +EOF + # Now try linking the two files. + mv conftest.$ac_objext conftestm.$ac_objext + ac_save_LIBS="$LIBS" + ac_save_CFLAGS="$CFLAGS" + LIBS="conftestm.$ac_objext" + CFLAGS="$CFLAGS$no_builtin_flag" + if { (eval echo configure:1441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + ac_pipe_works=yes + else + echo "configure: failed program was:" >&5 + cat conftest.c >&5 + fi + LIBS="$ac_save_LIBS" + CFLAGS="$ac_save_CFLAGS" + else + echo "cannot find nm_test_func in $ac_nlist" >&5 + fi + else + echo "cannot find nm_test_var in $ac_nlist" >&5 + fi + else + echo "cannot run $ac_cv_sys_global_symbol_pipe" >&5 + fi +else + echo "$progname: failed program was:" >&5 + cat conftest.c >&5 +fi +rm -rf conftest* + +# Do not use the global_symbol_pipe unless it works. +test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe= + +fi + + +ac_result=yes +if test -z "$ac_cv_sys_global_symbol_pipe"; then + ac_result=no +fi +echo "$ac_t""$ac_result" 1>&6 + +echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6 +echo "configure:1477: checking for _ prefix in compiled symbols" >&5 +if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_cv_sys_symbol_underscore=no +cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + # Now try to grab the symbols. + ac_nlist=conftest.nm + if { (eval echo configure:1489: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then + # See whether the symbols have a leading underscore. + if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then + ac_cv_sys_symbol_underscore=yes + else + if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then + : + else + echo "configure: cannot find nm_test_func in $ac_nlist" >&5 + fi + fi + else + echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&5 + fi +else + echo "configure: failed program was:" >&5 + cat conftest.c >&5 +fi +rm -rf conftest* + +fi + +echo "$ac_t""$ac_cv_sys_symbol_underscore" 1>&6 +if test x$ac_cv_sys_symbol_underscore = xyes; then + cat >> confdefs.h <<\EOF +#define WITH_SYMBOL_UNDERSCORE 1 +EOF + +fi + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1210: checking whether ln -s works" >&5 +echo "configure:1520: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1226,6 +1536,12 @@ echo "$ac_t""no" 1>&6 fi +if test $host != $build; then + ac_tool_prefix=${host_alias}- +else + ac_tool_prefix= +fi + # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -1242,8 +1558,8 @@ case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1246 "configure"' > conftest.$ac_ext - if { (eval echo configure:1247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1562 "configure"' > conftest.$ac_ext + if { (eval echo configure:1563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1261,20 +1577,211 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" + echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 +echo "configure:1584: checking whether the C compiler needs -belf" >&5 +if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + lt_cv_cc_needs_belf=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + lt_cv_cc_needs_belf=no +fi +rm -f conftest* +fi + +echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi ;; + +*-*-cygwin32*) + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1619: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +DLLTOOL="$ac_cv_prog_DLLTOOL" +if test -n "$DLLTOOL"; then + echo "$ac_t""$DLLTOOL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_DLLTOOL"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1651: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_DLLTOOL="dlltool" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false" +fi +fi +DLLTOOL="$ac_cv_prog_DLLTOOL" +if test -n "$DLLTOOL"; then + echo "$ac_t""$DLLTOOL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + DLLTOOL="false" +fi +fi + +# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. +set dummy ${ac_tool_prefix}as; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1686: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AS="${ac_tool_prefix}as" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +AS="$ac_cv_prog_AS" +if test -n "$AS"; then + echo "$ac_t""$AS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_AS"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "as", so it can be a program name with args. +set dummy as; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1718: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AS="as" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false" +fi +fi +AS="$ac_cv_prog_AS" +if test -n "$AS"; then + echo "$ac_t""$AS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + AS="false" +fi +fi + + + ;; + esac +# enable the --disable-libtool-lock switch + +# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then + enableval="$enable_libtool_lock" + need_locks=$enableval +else + need_locks=yes +fi + + +if test x"$need_locks" = xno; then + libtool_flags="$libtool_flags --disable-lock" +fi + + # Actually configure libtool. ac_aux_dir is where install-sh is found. CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ +DLLTOOL="$DLLTOOL" AS="$AS" \ +${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +# Redirect the config.log output again, so that the ltconfig log is not +# clobbered by the next message. +exec 5>>./config.log + echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1278: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1785: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1284,36 +1791,41 @@ fi echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 - if test $USE_MAINTAINER_MODE = yes; then - MAINT= - else - MAINT='#M#' - fi + + +if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + MAINT=$MAINTAINER_MODE_TRUE # Make sure we can run config.sub. -if $ac_config_sub sun4 >/dev/null 2>&1; then : +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1303: checking host system type" >&5 +echo "configure:1815: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) - if host_alias=`$ac_config_guess`; then : + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac -host=`$ac_config_sub $host_alias` +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` @@ -1359,15 +1871,16 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1363: checking for $ac_word" >&5 +echo "configure:1875: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -1388,16 +1901,17 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1392: checking for $ac_word" >&5 +echo "configure:1905: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then @@ -1432,25 +1946,61 @@ echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1956: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1440: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1988: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext < conftest.$ac_ext << EOF + +#line 1999 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:1454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1464,18 +2014,24 @@ ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1474: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2030: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1479: checking whether we are using GNU C" >&5 +echo "configure:2035: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1484,7 +2040,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1495,11 +2051,15 @@ if test $ac_cv_prog_gcc = yes; then GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1503: checking whether ${CC-cc} accepts -g" >&5 +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:2063: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1514,23 +2074,27 @@ fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-O2" + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1534: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:2098: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1546,7 +2110,7 @@ do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext < #include @@ -1583,7 +2147,7 @@ ; return 0; } EOF -if { (eval echo configure:1587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -1613,28 +2177,30 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1621: checking for a BSD compatible install" >&5 +echo "configure:2186: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" @@ -1664,10 +2230,12 @@ # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1671: checking whether ln -s works" >&5 +echo "configure:2239: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1688,7 +2256,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1692: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2260: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1715,7 +2283,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1719: checking how to run the C preprocessor" >&5 +echo "configure:2287: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1730,14 +2298,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -1747,14 +2315,31 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -1767,6 +2352,8 @@ rm -f conftest* fi rm -f conftest* +fi +rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" @@ -1802,6 +2389,15 @@ fi + for module in . + do + case "$module" in + gthread) + gtk_config_args="$gtk_config_args gthread" + ;; + esac + done + if test x$gtk_config_exec_prefix != x ; then gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" if test x${GTK_CONFIG+set} != xset ; then @@ -1818,7 +2414,7 @@ # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1822: checking for $ac_word" >&5 +echo "configure:2418: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1826,9 +2422,13 @@ /*) ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" @@ -1847,9 +2447,9 @@ echo "$ac_t""no" 1>&6 fi - min_gtk_version=1.0.1 + min_gtk_version=1.2.0 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:1853: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:2453: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -1866,13 +2466,13 @@ ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" + LIBS="$GTK_LIBS $LIBS" rm -f conf.gtktest if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -1950,7 +2550,7 @@ } EOF -if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1984,7 +2584,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -1994,7 +2594,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:1998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -2038,9 +2638,9 @@ -if test "$gtk_config_major_version.$gtk_config_minor_version" != "1.0"; then - { echo "configure: error: The GIMP requires GTK 1.0.x. See the file 'INSTALL' for help." 1>&2; exit 1; } -fi +#if test "$gtk_config_major_version.$gtk_config_minor_version" != "1.0"; then +# AC_MSG_ERROR(The GIMP requires GTK 1.0.x. See the file 'INSTALL' for help.) +#fi if eval "test x$GCC = xyes"; then if echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null; then @@ -2065,19 +2665,19 @@ fi echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6 -echo "configure:2069: checking for extra flags to get ANSI library prototypes" >&5 +echo "configure:2669: checking for extra flags to get ANSI library prototypes" >&5 gimp_save_LIBS=$LIBS LIBS="$LIBS -lm" if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < int main (void) { return (log(1) != log(1.)); } EOF -if { (eval echo configure:2081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""none needed" 1>&6 else @@ -2090,12 +2690,12 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < int main (void) { return (log(1) != log(1.)); } EOF -if { (eval echo configure:2099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""-std1" 1>&6 else @@ -2116,16 +2716,16 @@ LIBS=$gimp_save_LIBS echo $ac_n "checking for extra flags for POSIX compliance""... $ac_c" 1>&6 -echo "configure:2120: checking for extra flags for POSIX compliance" >&5 +echo "configure:2720: checking for extra flags for POSIX compliance" >&5 cat > conftest.$ac_ext < int main() { DIR *dir; ; return 0; } EOF -if { (eval echo configure:2129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""none needed" 1>&6 else @@ -2135,14 +2735,14 @@ gimp_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -posix" cat > conftest.$ac_ext < int main() { DIR *dir; ; return 0; } EOF -if { (eval echo configure:2146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""-posix" 1>&6 else @@ -2167,7 +2767,7 @@ if test -z "$LIBXMU_LIB"; then echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6 -echo "configure:2171: checking for XmuClientWindow in -lXmu" >&5 +echo "configure:2771: checking for XmuClientWindow in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuClientWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2175,7 +2775,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu -lXt -lSM -lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2203,18 +2803,18 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xmu/WinUtil.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xmu/WinUtil.h""... $ac_c" 1>&6 -echo "configure:2207: checking for X11/Xmu/WinUtil.h" >&5 +echo "configure:2807: checking for X11/Xmu/WinUtil.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2238,7 +2838,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XmuUpdateMapHints in -lXmu""... $ac_c" 1>&6 -echo "configure:2242: checking for XmuUpdateMapHints in -lXmu" >&5 +echo "configure:2842: checking for XmuUpdateMapHints in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuUpdateMapHints | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2246,7 +2846,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu -lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2274,18 +2874,18 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xmu/WinUtil.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xmu/WinUtil.h""... $ac_c" 1>&6 -echo "configure:2278: checking for X11/Xmu/WinUtil.h" >&5 +echo "configure:2878: checking for X11/Xmu/WinUtil.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2317,7 +2917,7 @@ if test -z "$LIBAA_LIB"; then echo $ac_n "checking for aa_printf in -laa""... $ac_c" 1>&6 -echo "configure:2321: checking for aa_printf in -laa" >&5 +echo "configure:2921: checking for aa_printf in -laa" >&5 ac_lib_var=`echo aa'_'aa_printf | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2325,7 +2925,7 @@ ac_save_LIBS="$LIBS" LIBS="-laa $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2353,18 +2953,18 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "aalib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for aalib.h""... $ac_c" 1>&6 -echo "configure:2357: checking for aalib.h" >&5 +echo "configure:2957: checking for aalib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2394,7 +2994,7 @@ if test -z "$LIBTIFF_LIB"; then echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6 -echo "configure:2398: checking for TIFFReadScanline in -ltiff" >&5 +echo "configure:2998: checking for TIFFReadScanline in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2402,7 +3002,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2430,18 +3030,18 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:2434: checking for tiffio.h" >&5 +echo "configure:3034: checking for tiffio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2465,7 +3065,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6 -echo "configure:2469: checking for TIFFWriteScanline in -ltiff" >&5 +echo "configure:3069: checking for TIFFWriteScanline in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2473,7 +3073,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltiff -ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2501,18 +3101,18 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:2505: checking for tiffio.h" >&5 +echo "configure:3105: checking for tiffio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2536,7 +3136,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for TIFFFlushData in -ltiff34""... $ac_c" 1>&6 -echo "configure:2540: checking for TIFFFlushData in -ltiff34" >&5 +echo "configure:3140: checking for TIFFFlushData in -ltiff34" >&5 ac_lib_var=`echo tiff34'_'TIFFFlushData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2544,7 +3144,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2572,18 +3172,18 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:2576: checking for tiffio.h" >&5 +echo "configure:3176: checking for tiffio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2617,7 +3217,7 @@ if test -z "$LIBJPEG_LIB"; then echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:2621: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:3221: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2625,7 +3225,7 @@ ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2660,9 +3260,9 @@ if test "$jpeg_ok" = yes; then echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:2664: checking for jpeglib.h" >&5 +echo "configure:3264: checking for jpeglib.h" >&5 cat > conftest.$ac_ext < #undef PACKAGE @@ -2670,8 +3270,8 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* jpeg_ok=yes @@ -2694,7 +3294,7 @@ if test -z "$LIBPNG_LIB"; then echo $ac_n "checking for png_read_info in -lpng""... $ac_c" 1>&6 -echo "configure:2698: checking for png_read_info in -lpng" >&5 +echo "configure:3298: checking for png_read_info in -lpng" >&5 ac_lib_var=`echo png'_'png_read_info | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2702,7 +3302,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2730,18 +3330,18 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:2734: checking for png.h" >&5 +echo "configure:3334: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2769,16 +3369,16 @@ if test "$png_ok" = yes; then echo $ac_n "checking for png_structp in png.h""... $ac_c" 1>&6 -echo "configure:2773: checking for png_structp in png.h" >&5 +echo "configure:3373: checking for png_structp in png.h" >&5 cat > conftest.$ac_ext < int main() { png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct; ; return 0; } EOF -if { (eval echo configure:2782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* png_ok=yes else @@ -2801,7 +3401,7 @@ if test -z "$LIBMPEG_LIB"; then echo $ac_n "checking for GetMPEGFrame in -lmpeg""... $ac_c" 1>&6 -echo "configure:2805: checking for GetMPEGFrame in -lmpeg" >&5 +echo "configure:3405: checking for GetMPEGFrame in -lmpeg" >&5 ac_lib_var=`echo mpeg'_'GetMPEGFrame | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2809,7 +3409,7 @@ ac_save_LIBS="$LIBS" LIBS="-lmpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2837,18 +3437,18 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "mpeg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for mpeg.h""... $ac_c" 1>&6 -echo "configure:2841: checking for mpeg.h" >&5 +echo "configure:3441: checking for mpeg.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2885,7 +3485,7 @@ if test "x$with_xdelta" = "xyes"; then if test -z "$LIBXDELTA_LIB"; then echo $ac_n "checking for xd_checkin in -lxdelta""... $ac_c" 1>&6 -echo "configure:2889: checking for xd_checkin in -lxdelta" >&5 +echo "configure:3489: checking for xd_checkin in -lxdelta" >&5 ac_lib_var=`echo xdelta'_'xd_checkin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2893,7 +3493,7 @@ ac_save_LIBS="$LIBS" LIBS="-lxdelta -lglib -lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2923,7 +3523,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for xd_checkout in -lxdelta""... $ac_c" 1>&6 -echo "configure:2927: checking for xd_checkout in -lxdelta" >&5 +echo "configure:3527: checking for xd_checkout in -lxdelta" >&5 ac_lib_var=`echo xdelta'_'xd_checkout | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2931,7 +3531,7 @@ ac_save_LIBS="$LIBS" LIBS="-lxdelta -lglib -lgdbm -lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2968,16 +3568,16 @@ if test "$xdelta_ok" = yes; then echo $ac_n "checking for xdelta.h""... $ac_c" 1>&6 -echo "configure:2972: checking for xdelta.h" >&5 +echo "configure:3572: checking for xdelta.h" >&5 cat > conftest.$ac_ext < #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* xdelta_ok=yes @@ -3001,7 +3601,7 @@ if test -z "$LIBXPM_LIB"; then echo $ac_n "checking for XpmReadFileToXpmImage in -lXpm""... $ac_c" 1>&6 -echo "configure:3005: checking for XpmReadFileToXpmImage in -lXpm" >&5 +echo "configure:3605: checking for XpmReadFileToXpmImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmReadFileToXpmImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3009,7 +3609,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $X_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3037,18 +3637,18 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:3041: checking for X11/xpm.h" >&5 +echo "configure:3641: checking for X11/xpm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -3078,18 +3678,18 @@ ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:3082: checking for sys/ipc.h" >&5 +echo "configure:3682: checking for sys/ipc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -3115,18 +3715,18 @@ ac_safe=`echo "sys/shm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/shm.h""... $ac_c" 1>&6 -echo "configure:3119: checking for sys/shm.h" >&5 +echo "configure:3719: checking for sys/shm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -3152,12 +3752,12 @@ if test "$ac_cv_header_sys_shm_h" = "yes"; then echo $ac_n "checking whether shmctl IPC_RMID allowes subsequent attaches""... $ac_c" 1>&6 -echo "configure:3156: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5 +echo "configure:3756: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming no" 1>&6 else cat > conftest.$ac_ext < @@ -3183,7 +3783,7 @@ } EOF -if { (eval echo configure:3187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define IPC_RMID_DEFERRED_RELEASE 1 @@ -3206,12 +3806,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:3210: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3810: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -3219,7 +3819,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3244,7 +3844,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:3248: checking for opendir in -ldir" >&5 +echo "configure:3848: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3252,7 +3852,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3285,7 +3885,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3289: checking for opendir in -lx" >&5 +echo "configure:3889: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3293,7 +3893,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3327,12 +3927,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3331: checking for ANSI C header files" >&5 +echo "configure:3931: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3340,8 +3940,8 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes @@ -3357,7 +3957,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3375,7 +3975,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3396,7 +3996,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3407,7 +4007,7 @@ exit (0); } EOF -if { (eval echo configure:3411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3431,12 +4031,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3435: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:4035: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3452,7 +4052,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3473,12 +4073,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3477: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4077: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3487,7 +4087,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3510,18 +4110,18 @@ ac_safe=`echo "sys/time.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/time.h""... $ac_c" 1>&6 -echo "configure:3514: checking for sys/time.h" >&5 +echo "configure:4114: checking for sys/time.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:4124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -3546,18 +4146,18 @@ ac_safe=`echo "unistd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unistd.h""... $ac_c" 1>&6 -echo "configure:3550: checking for unistd.h" >&5 +echo "configure:4150: checking for unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:4160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -3582,12 +4182,12 @@ echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3586: checking for pid_t" >&5 +echo "configure:4186: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3596,7 +4196,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_pid_t=yes else @@ -3615,12 +4215,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3619: checking return type of signal handlers" >&5 +echo "configure:4219: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3637,7 +4237,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:3641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3656,12 +4256,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:3660: checking for vprintf" >&5 +echo "configure:4260: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3708,12 +4308,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3712: checking for _doprnt" >&5 +echo "configure:4312: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3764,19 +4364,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:3768: checking for working alloca.h" >&5 +echo "configure:4368: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -3797,25 +4397,30 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:3801: checking for alloca" >&5 +echo "configure:4401: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +# ifdef _MSC_VER +# include +# define alloca _alloca # else -# ifdef _AIX - #pragma alloca +# if HAVE_ALLOCA_H +# include # else -# ifndef alloca /* predefined by HP cc +Olibcalls */ +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); +# endif # endif # endif # endif @@ -3825,7 +4430,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:3829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -3850,19 +4455,19 @@ # that cause trouble. Some versions do not even contain alloca or # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.o + ALLOCA=alloca.${ac_objext} cat >> confdefs.h <<\EOF #define C_ALLOCA 1 EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:3861: checking whether alloca needs Cray hooks" >&5 +echo "configure:4466: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:3891: checking for $ac_func" >&5 +echo "configure:4496: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3942,7 +4547,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3946: checking stack direction for C alloca" >&5 +echo "configure:4551: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3950,7 +4555,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -3993,16 +4598,16 @@ echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6 -echo "configure:3997: checking fd_set and sys/select" >&5 +echo "configure:4602: checking fd_set and sys/select" >&5 cat > conftest.$ac_ext < int main() { fd_set readMask, writeMask; ; return 0; } EOF -if { (eval echo configure:4006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gimp_ok=yes else @@ -4014,7 +4619,7 @@ rm -f conftest* if test $gimp_ok = no; then cat > conftest.$ac_ext < EOF @@ -4042,12 +4647,12 @@ LIBUCB_LIB="" echo $ac_n "checking for random""... $ac_c" 1>&6 -echo "configure:4046: checking for random" >&5 +echo "configure:4651: checking for random" >&5 if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_random=yes" else @@ -4096,7 +4701,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for random in -lucb""... $ac_c" 1>&6 -echo "configure:4100: checking for random in -lucb" >&5 +echo "configure:4705: checking for random in -lucb" >&5 ac_lib_var=`echo ucb'_'random | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4104,7 +4709,7 @@ ac_save_LIBS="$LIBS" LIBS="-lucb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4143,12 +4748,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for lrand48""... $ac_c" 1>&6 -echo "configure:4147: checking for lrand48" >&5 +echo "configure:4752: checking for lrand48" >&5 if eval "test \"`echo '$''{'ac_cv_func_lrand48'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_lrand48=yes" else @@ -4209,12 +4814,12 @@ echo $ac_n "checking for difftime""... $ac_c" 1>&6 -echo "configure:4213: checking for difftime" >&5 +echo "configure:4818: checking for difftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_difftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_difftime=yes" else @@ -4262,12 +4867,12 @@ echo $ac_n "checking for putenv""... $ac_c" 1>&6 -echo "configure:4266: checking for putenv" >&5 +echo "configure:4871: checking for putenv" >&5 if eval "test \"`echo '$''{'ac_cv_func_putenv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_putenv=yes" else @@ -4314,9 +4919,9 @@ echo $ac_n "checking for inline definition in glibconfig.h""... $ac_c" 1>&6 -echo "configure:4318: checking for inline definition in glibconfig.h" >&5 +echo "configure:4923: checking for inline definition in glibconfig.h" >&5 cat > conftest.$ac_ext < #ifdef inline @@ -4337,21 +4942,21 @@ echo "$ac_t""$have_glib_inline" 1>&6 if test "$have_glib_inline" = "no"; then echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4341: checking for inline" >&5 +echo "configure:4946: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4376,7 +4981,7 @@ ;; esac -fi +fi CPPFLAGS="$gimp_save_CPPFLAGS" LDFLAGS="$gimp_save_LDFLAGS" @@ -4400,7 +5005,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4404: checking for $ac_word" >&5 +echo "configure:5009: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4408,9 +5013,13 @@ /*) ac_cv_path_EMACS="$EMACS" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_EMACS="$EMACS" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_EMACS="$ac_dir/$ac_word" @@ -4445,7 +5054,7 @@ # Extract the first word of ""sendmail"", so it can be a program name with args. set dummy "sendmail"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4449: checking for $ac_word" >&5 +echo "configure:5058: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4453,9 +5062,13 @@ /*) ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH:/usr/lib:/usr/sbin$ac_dummy; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH:/usr/lib:/usr/sbin" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_SENDMAIL="$ac_dir/$ac_word" @@ -4491,7 +5104,7 @@ # Extract the first word of ""lp"", so it can be a program name with args. set dummy "lp"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4495: checking for $ac_word" >&5 +echo "configure:5108: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LP_COMMAND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4499,9 +5112,13 @@ /*) ac_cv_path_LP_COMMAND="$LP_COMMAND" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_LP_COMMAND="$LP_COMMAND" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH:/usr/bin:/usr/sbin:/usr/ucb:/usr/bsd$ac_dummy; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH:/usr/bin:/usr/sbin:/usr/ucb:/usr/bsd" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_LP_COMMAND="$ac_dir/$ac_word" @@ -4537,7 +5154,7 @@ # Extract the first word of ""lpstat"", so it can be a program name with args. set dummy "lpstat"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4541: checking for $ac_word" >&5 +echo "configure:5158: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LPSTAT_COMMAND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4545,9 +5162,13 @@ /*) ac_cv_path_LPSTAT_COMMAND="$LPSTAT_COMMAND" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_LPSTAT_COMMAND="$LPSTAT_COMMAND" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH:/usr/bin:/usr/sbin:/usr/ucb:/usr/bsd$ac_dummy; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH:/usr/bin:/usr/sbin:/usr/ucb:/usr/bsd" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_LPSTAT_COMMAND="$ac_dir/$ac_word" @@ -4583,7 +5204,7 @@ # Extract the first word of ""lpr"", so it can be a program name with args. set dummy "lpr"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4587: checking for $ac_word" >&5 +echo "configure:5208: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LPR_COMMAND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4591,9 +5212,13 @@ /*) ac_cv_path_LPR_COMMAND="$LPR_COMMAND" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_LPR_COMMAND="$LPR_COMMAND" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH:/usr/bin:/usr/sbin:/usr/ucb:/usr/bsd$ac_dummy; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH:/usr/bin:/usr/sbin:/usr/ucb:/usr/bsd" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_LPR_COMMAND="$ac_dir/$ac_word" @@ -4629,7 +5254,7 @@ # Extract the first word of ""lpc"", so it can be a program name with args. set dummy "lpc"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4633: checking for $ac_word" >&5 +echo "configure:5258: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LPC_COMMAND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4637,9 +5262,13 @@ /*) ac_cv_path_LPC_COMMAND="$LPC_COMMAND" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_LPC_COMMAND="$LPC_COMMAND" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH:/usr/bin:/usr/sbin:/usr/ucb:/usr/bsd$ac_dummy; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH:/usr/bin:/usr/sbin:/usr/ucb:/usr/bsd" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_LPC_COMMAND="$ac_dir/$ac_word" @@ -4663,6 +5292,23 @@ LPC_DEF="-DLPC_COMMAND=\\\"$ac_cv_path_LPC_COMMAND\\\"" fi +GIMPDOCS= +if test -n "$DISTMAKE"; then + WEBBROWSER=webbrowser TIFF=tiff JPEG=jpeg PNG=png AA=aa MPEG=mpeg + XD=xd XPM=xpm GIMPDOCS=docs +fi + + + +if test x$enable_static = xyes; then + STATICLIBS_TRUE= + STATICLIBS_FALSE='#' +else + STATICLIBS_TRUE='#' + STATICLIBS_FALSE= +fi + + @@ -4722,7 +5368,7 @@ # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -4789,7 +5435,7 @@ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.12" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -4939,6 +5585,7 @@ plug-ins/zealouscrop/Makefile app/Makefile docs/Makefile +docs/white-paper/Makefile data/Makefile data/brushes/Makefile data/gradients/Makefile @@ -4952,9 +5599,11 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -4974,8 +5623,8 @@ s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_DATA@%$INSTALL_DATA%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +s%@INSTALL_DATA@%$INSTALL_DATA%g s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g s%@ACLOCAL@%$ACLOCAL%g @@ -4989,12 +5638,21 @@ s%@host_cpu@%$host_cpu%g s%@host_vendor@%$host_vendor%g s%@host_os@%$host_os%g +s%@build@%$build%g +s%@build_alias@%$build_alias%g +s%@build_cpu@%$build_cpu%g +s%@build_vendor@%$build_vendor%g +s%@build_os@%$build_os%g s%@RANLIB@%$RANLIB%g s%@CC@%$CC%g s%@LD@%$LD%g s%@NM@%$NM%g s%@LN_S@%$LN_S%g s%@LIBTOOL@%$LIBTOOL%g +s%@DLLTOOL@%$DLLTOOL%g +s%@AS@%$AS%g +s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g +s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g s%@CPP@%$CPP%g s%@GTK_CONFIG@%$GTK_CONFIG%g @@ -5009,6 +5667,8 @@ s%@LPSTAT_COMMAND@%$LPSTAT_COMMAND%g s%@LPR_COMMAND@%$LPR_COMMAND%g s%@LPC_COMMAND@%$LPC_COMMAND%g +s%@STATICLIBS_TRUE@%$STATICLIBS_TRUE%g +s%@STATICLIBS_FALSE@%$STATICLIBS_FALSE%g s%@GIMP_MAJOR_VERSION@%$GIMP_MAJOR_VERSION%g s%@GIMP_MINOR_VERSION@%$GIMP_MINOR_VERSION%g s%@GIMP_MICRO_VERSION@%$GIMP_MICRO_VERSION%g @@ -5042,6 +5702,7 @@ s%@LPR_DEF@%$LPR_DEF%g s%@LPC_DEF@%$LPC_DEF%g s%@MAILER@%$MAILER%g +s%@GIMPDOCS@%$GIMPDOCS%g CEOF EOF @@ -5222,6 +5883,7 @@ plug-ins/zealouscrop/Makefile app/Makefile docs/Makefile +docs/white-paper/Makefile data/Makefile data/brushes/Makefile data/gradients/Makefile diff -ruN gimp-1.0.2/configure.in gimp-1.0.3/configure.in --- gimp-1.0.2/configure.in Tue Oct 13 16:38:53 1998 +++ gimp-1.0.3/configure.in Mon Mar 29 12:34:52 1999 @@ -7,7 +7,7 @@ dnl $Format: "GIMP_MINOR_VERSION=$ReleaseMinorVersion$" $ GIMP_MINOR_VERSION=0 dnl $Format: "GIMP_MICRO_VERSION=$ReleaseMicroVersion$" $ -GIMP_MICRO_VERSION=2 +GIMP_MICRO_VERSION=3 GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION @@ -30,8 +30,7 @@ DEBUGFLAG="-g" fi) -AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]], - , enable_ansi=no) +AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]], , enable_ansi=no) dnl Possibly change default gimpdir from .gimp gimpdir=.gimp @@ -44,7 +43,7 @@ AC_DEFUN(AC_GIMP_CHECK, [ - AM_PATH_GTK(1.0.1,, + AM_PATH_GTK(1.2.0,, AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.)) X_LIBS=$GTK_LIBS X_CFLAGS=$GTK_CFLAGS @@ -66,9 +65,9 @@ AC_GIMP_CHECK -if test "$gtk_config_major_version.$gtk_config_minor_version" != "1.0"; then - AC_MSG_ERROR(The GIMP requires GTK 1.0.x. See the file 'INSTALL' for help.) -fi +#if test "$gtk_config_major_version.$gtk_config_minor_version" != "1.0"; then +# AC_MSG_ERROR(The GIMP requires GTK 1.0.x. See the file 'INSTALL' for help.) +#fi if eval "test x$GCC = xyes"; then if echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null; then @@ -355,7 +354,7 @@ AC_MSG_RESULT($have_glib_inline) if test "$have_glib_inline" = "no"; then AC_C_INLINE -fi +fi CPPFLAGS="$gimp_save_CPPFLAGS" LDFLAGS="$gimp_save_LDFLAGS" @@ -438,6 +437,14 @@ LPC_DEF="-DLPC_COMMAND=\\\"$ac_cv_path_LPC_COMMAND\\\"" fi +GIMPDOCS= +if test -n "$DISTMAKE"; then + WEBBROWSER=webbrowser TIFF=tiff JPEG=jpeg PNG=png AA=aa MPEG=mpeg + XD=xd XPM=xpm GIMPDOCS=docs +fi + +AM_CONDITIONAL(STATICLIBS, test x$enable_static = xyes) + AC_SUBST(GIMP_MAJOR_VERSION) AC_SUBST(GIMP_MINOR_VERSION) AC_SUBST(GIMP_MICRO_VERSION) @@ -472,6 +479,7 @@ AC_SUBST(LPR_DEF) AC_SUBST(LPC_DEF) AC_SUBST(MAILER) +AC_SUBST(GIMPDOCS) dnl Output the Makefiles @@ -615,6 +623,7 @@ plug-ins/zealouscrop/Makefile app/Makefile docs/Makefile +docs/white-paper/Makefile data/Makefile data/brushes/Makefile data/gradients/Makefile diff -ruN gimp-1.0.2/data/Makefile.in gimp-1.0.3/data/Makefile.in --- gimp-1.0.2/data/Makefile.in Wed Oct 14 20:32:05 1998 +++ gimp-1.0.3/data/Makefile.in Mon Mar 29 13:15:09 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -113,10 +116,10 @@ SUBDIRS = brushes gradients palettes patterns -brushdata= -gradientdata= -palettedata= -patterndata= +brushdata = +gradientdata = +palettedata = +patterndata = mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -126,11 +129,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: all-recursive all-am - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps data/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -151,41 +153,65 @@ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) tags); \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ done; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ @@ -210,84 +236,90 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ done +info-am: info: info-recursive +dvi-am: dvi: dvi-recursive -check: all-am - $(MAKE) check-recursive +check-am: all-am +check: check-recursive +installcheck-am: installcheck: installcheck-recursive -all-am: Makefile - +install-exec-am: install-exec: install-exec-recursive - @$(NORMAL_INSTALL) +install-data-am: install-data: install-data-recursive - @$(NORMAL_INSTALL) +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive - @: - +uninstall-am: uninstall: uninstall-recursive - +all-am: Makefile +all-redirect: all-recursive install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive +installdirs-am: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-tags mostlyclean-generic +mostlyclean: mostlyclean-recursive + clean-am: clean-tags clean-generic mostlyclean-am +clean: clean-recursive + distclean-am: distclean-tags distclean-generic clean-am + -rm -f libtool + +distclean: distclean-recursive maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ distclean-am - -mostlyclean: mostlyclean-recursive mostlyclean-am - -clean: clean-recursive clean-am - -distclean: distclean-recursive distclean-am - -rm -f config.status - -rm -f libtool - -maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-recursive + .PHONY: install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ uninstalldirs-recursive all-recursive check-recursive \ installcheck-recursive info-recursive dvi-recursive \ mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck all-am install-exec install-data install uninstall all \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/data/brushes/Makefile.am gimp-1.0.3/data/brushes/Makefile.am --- gimp-1.0.2/data/brushes/Makefile.am Sat Apr 11 01:11:20 1998 +++ gimp-1.0.3/data/brushes/Makefile.am Thu Jan 21 16:20:28 1999 @@ -7,7 +7,6 @@ brushdata_DATA = @brushdata@ -EXTRA_DATA = EXTRA_DIST = $(brushdata_DATA) .PHONY: files diff -ruN gimp-1.0.2/data/brushes/Makefile.in gimp-1.0.3/data/brushes/Makefile.in --- gimp-1.0.2/data/brushes/Makefile.in Wed Oct 14 20:32:09 1998 +++ gimp-1.0.3/data/brushes/Makefile.in Mon Mar 29 13:15:10 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -113,57 +116,17 @@ brushdatadir = $(gimpdatadir)/brushes -brushdata = -gradientdata = -palettedata = -patterndata = +brushdata = +gradientdata = +palettedata = +patterndata = brushdata_DATA = @brushdata@ -EXTRA_DATA = EXTRA_DIST = $(brushdata_DATA) -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 \ - 20x20squareBlur.gbr \ - 3circle.gbr \ - 3fcircle.gbr \ - 5circle.gbr \ - 5fcircle.gbr \ - 5x5square.gbr \ - 5x5squareBlur.gbr \ - 7circle.gbr \ - 7fcircle.gbr \ - 9circle.gbr \ - 9fcircle.gbr \ - DStar11.gbr \ - DStar17.gbr \ - DStar25.gbr \ - callig1.gbr \ - callig2.gbr \ - callig3.gbr \ - callig4.gbr \ - confetti.gbr \ - dunes.gbr \ - galaxy.gbr \ - galaxy_big.gbr \ - galaxy_small.gbr \ - pixel.gbr \ - thegimp.gbr \ - xcf.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 20x20squareBlur.gbr 3circle.gbr 3fcircle.gbr 5circle.gbr 5fcircle.gbr 5x5square.gbr 5x5squareBlur.gbr 7circle.gbr 7fcircle.gbr 9circle.gbr 9fcircle.gbr DStar11.gbr DStar17.gbr DStar25.gbr callig1.gbr callig2.gbr callig3.gbr callig4.gbr confetti.gbr dunes.gbr galaxy.gbr galaxy_big.gbr galaxy_small.gbr pixel.gbr thegimp.gbr xcf.gbr + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = @@ -175,11 +138,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: Makefile $(DATA) - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps data/brushes/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -216,61 +178,74 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-brushdataDATA - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-brushdataDATA - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-brushdataDATA +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-brushdataDATA +uninstall: uninstall-am +all-am: Makefile $(DATA) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(brushdatadir) + $(mkinstalldirs) $(DESTDIR)$(brushdatadir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-generic +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am -clean: clean-generic mostlyclean +clean-am: clean-generic mostlyclean-am -distclean: distclean-generic clean - -rm -f config.status +clean: clean-am + +distclean-am: distclean-generic clean-am -rm -f libtool -maintainer-clean: maintainer-clean-generic distclean +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: uninstall-brushdataDATA install-brushdataDATA tags distdir info \ -dvi installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean: maintainer-clean-am + +.PHONY: uninstall-brushdataDATA install-brushdataDATA tags distdir \ +info-am info dvi-am dvi check check-am installcheck-am installcheck \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/data/gradients/Makefile.am gimp-1.0.3/data/gradients/Makefile.am --- gimp-1.0.2/data/gradients/Makefile.am Tue May 12 15:21:05 1998 +++ gimp-1.0.3/data/gradients/Makefile.am Thu Jan 21 16:20:30 1999 @@ -7,7 +7,6 @@ gradientdata_DATA = @gradientdata@ -EXTRA_DATA = EXTRA_DIST = $(gradientdata_DATA) .PHONY: files diff -ruN gimp-1.0.2/data/gradients/Makefile.in gimp-1.0.3/data/gradients/Makefile.in --- gimp-1.0.2/data/gradients/Makefile.in Wed Oct 14 20:32:16 1998 +++ gimp-1.0.3/data/gradients/Makefile.in Mon Mar 29 13:15:11 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -113,95 +116,17 @@ gradientdatadir = $(gimpdatadir)/gradients -brushdata = -gradientdata = -palettedata = -patterndata = +brushdata = +gradientdata = +palettedata = +patterndata = gradientdata_DATA = @gradientdata@ -EXTRA_DATA = EXTRA_DIST = $(gradientdata_DATA) -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 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = @@ -213,11 +138,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: Makefile $(DATA) - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps data/gradients/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -254,61 +178,74 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-gradientdataDATA - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-gradientdataDATA - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-gradientdataDATA +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-gradientdataDATA +uninstall: uninstall-am +all-am: Makefile $(DATA) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(gradientdatadir) + $(mkinstalldirs) $(DESTDIR)$(gradientdatadir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-generic +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am -clean: clean-generic mostlyclean +clean-am: clean-generic mostlyclean-am -distclean: distclean-generic clean - -rm -f config.status +clean: clean-am + +distclean-am: distclean-generic clean-am -rm -f libtool -maintainer-clean: maintainer-clean-generic distclean +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: uninstall-gradientdataDATA install-gradientdataDATA tags distdir \ -info dvi installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +info-am info dvi-am dvi check check-am installcheck-am installcheck \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/data/palettes/Makefile.am gimp-1.0.3/data/palettes/Makefile.am --- gimp-1.0.2/data/palettes/Makefile.am Sat Feb 28 20:54:26 1998 +++ gimp-1.0.3/data/palettes/Makefile.am Thu Jan 21 16:20:31 1999 @@ -7,7 +7,6 @@ palettedata_DATA = @palettedata@ -EXTRA_DATA = EXTRA_DIST = $(palettedata_DATA) .PHONY: files diff -ruN gimp-1.0.2/data/palettes/Makefile.in gimp-1.0.3/data/palettes/Makefile.in --- gimp-1.0.2/data/palettes/Makefile.in Wed Oct 14 20:32:24 1998 +++ gimp-1.0.3/data/palettes/Makefile.in Mon Mar 29 13:15:12 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -113,53 +116,17 @@ palettedatadir = $(gimpdatadir)/palettes -brushdata = -gradientdata = -palettedata = -patterndata = +brushdata = +gradientdata = +palettedata = +patterndata = palettedata_DATA = @palettedata@ -EXTRA_DATA = EXTRA_DIST = $(palettedata_DATA) -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 \ - Reds_And_Purples \ - Royal \ - Topographic \ - Volcano \ - Warm_Colors \ - Web +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 Reds_And_Purples Royal Topographic Volcano Warm_Colors Web + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = @@ -171,11 +138,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: Makefile $(DATA) - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps data/palettes/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -212,61 +178,74 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-palettedataDATA - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-palettedataDATA - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-palettedataDATA +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-palettedataDATA +uninstall: uninstall-am +all-am: Makefile $(DATA) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(palettedatadir) + $(mkinstalldirs) $(DESTDIR)$(palettedatadir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-generic +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am -clean: clean-generic mostlyclean +clean-am: clean-generic mostlyclean-am -distclean: distclean-generic clean - -rm -f config.status +clean: clean-am + +distclean-am: distclean-generic clean-am -rm -f libtool -maintainer-clean: maintainer-clean-generic distclean +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: uninstall-palettedataDATA install-palettedataDATA tags distdir \ -info dvi installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +info-am info dvi-am dvi check check-am installcheck-am installcheck \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/data/patterns/Makefile.am gimp-1.0.3/data/patterns/Makefile.am --- gimp-1.0.2/data/patterns/Makefile.am Sat Feb 28 20:54:27 1998 +++ gimp-1.0.3/data/patterns/Makefile.am Thu Jan 21 16:20:32 1999 @@ -7,7 +7,6 @@ patterndata_DATA = @patterndata@ -EXTRA_DATA = EXTRA_DIST = $(patterndata_DATA) .PHONY: files diff -ruN gimp-1.0.2/data/patterns/Makefile.in gimp-1.0.3/data/patterns/Makefile.in --- gimp-1.0.2/data/patterns/Makefile.in Wed Oct 14 20:32:31 1998 +++ gimp-1.0.3/data/patterns/Makefile.in Mon Mar 29 13:15:13 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -113,73 +116,17 @@ patterndatadir = $(gimpdatadir)/patterns -brushdata = -gradientdata = -palettedata = -patterndata = +brushdata = +gradientdata = +palettedata = +patterndata = patterndata_DATA = @patterndata@ -EXTRA_DATA = EXTRA_DIST = $(patterndata_DATA) -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 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = @@ -191,11 +138,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: Makefile $(DATA) - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps data/patterns/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -232,61 +178,74 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-patterndataDATA - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-patterndataDATA - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-patterndataDATA +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-patterndataDATA +uninstall: uninstall-am +all-am: Makefile $(DATA) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(patterndatadir) + $(mkinstalldirs) $(DESTDIR)$(patterndatadir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-generic +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am -clean: clean-generic mostlyclean +clean-am: clean-generic mostlyclean-am -distclean: distclean-generic clean - -rm -f config.status +clean: clean-am + +distclean-am: distclean-generic clean-am -rm -f libtool -maintainer-clean: maintainer-clean-generic distclean +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: uninstall-patterndataDATA install-patterndataDATA tags distdir \ -info dvi installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +info-am info dvi-am dvi check check-am installcheck-am installcheck \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/docs/Makefile.am gimp-1.0.3/docs/Makefile.am --- gimp-1.0.2/docs/Makefile.am Mon Apr 13 15:18:58 1998 +++ gimp-1.0.3/docs/Makefile.am Sun Nov 8 18:26:33 1998 @@ -1,3 +1,5 @@ +SUBDIRS = white-paper + EXTRA_DIST = \ gimp.txt pdb_self_doc.el \ pdb_dump xcf.doc \ diff -ruN gimp-1.0.2/docs/Makefile.in gimp-1.0.3/docs/Makefile.in --- gimp-1.0.2/docs/Makefile.in Wed Oct 14 20:42:34 1998 +++ gimp-1.0.3/docs/Makefile.in Mon Mar 29 12:52:46 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -115,15 +118,10 @@ palettedata = @palettedata@ patterndata = @patterndata@ -EXTRA_DIST = \ - gimp.txt pdb_self_doc.el \ - pdb_dump xcf.doc \ - cheat_sheet.txt keybindings.txt \ - texinfo.tex script-fu.tex \ - architecture.eps logo.eps \ - net-fu.eps timeline.eps \ - pdb_dump.texi gimp_quick_reference.ps \ - gimp_quick_reference.tar.gz +SUBDIRS = white-paper + +EXTRA_DIST = gimp.txt pdb_self_doc.el pdb_dump xcf.doc cheat_sheet.txt keybindings.txt texinfo.tex script-fu.tex architecture.eps logo.eps net-fu.eps timeline.eps pdb_dump.texi gimp_quick_reference.ps gimp_quick_reference.tar.gz + BUILT_SOURCES = pdb_dump.texi @@ -133,7 +131,6 @@ CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = TEXI2DVI = texi2dvi -TEXINFO_TEX = $(srcdir)/texinfo.tex INFO_DEPS = pdb.info DVIS = pdb.dvi TEXINFOS = pdb.texi @@ -143,15 +140,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: Makefile $(INFO_DEPS) - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: .SUFFIXES: .dvi .info .ps .texi .texinfo .txi -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps docs/Makefile +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -168,7 +164,7 @@ && $(MAKEINFO) `echo $< | sed 's,.*/,,'` .texi.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ + TEXINPUTS=.:$$TEXINPUTS \ MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< .texi: @@ -187,7 +183,7 @@ && $(MAKEINFO) `echo $< | sed 's,.*/,,'` .texinfo.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ + TEXINPUTS=.:$$TEXINPUTS \ MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< .txi.info: @@ -196,7 +192,7 @@ && $(MAKEINFO) `echo $< | sed 's,.*/,,'` .txi.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ + TEXINPUTS=.:$$TEXINPUTS \ MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $< .txi: @@ -209,7 +205,8 @@ install-info-am: $(INFO_DEPS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(infodir) - @for file in $(INFO_DEPS); do \ + @list='$(INFO_DEPS)'; \ + for file in $$list; do \ d=$(srcdir); \ for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ if test -f $$d/$$ifile; then \ @@ -220,7 +217,8 @@ done @$(POST_INSTALL) @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - for file in $(INFO_DEPS); do \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ done; \ @@ -231,17 +229,20 @@ @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ ii=yes; \ else ii=; fi; \ - for file in $(INFO_DEPS); do \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ test -z "$ii" \ || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ done @$(NORMAL_UNINSTALL) - for file in $(INFO_DEPS); do \ + list='$(INFO_DEPS)'; \ + for file in $$list; do \ (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ done dist-info: $(INFO_DEPS) - for base in $(INFO_DEPS); do \ + list='$(INFO_DEPS)'; \ + for base in $$list; do \ d=$(srcdir); \ for file in `cd $$d && eval echo $$base*`; do \ test -f $(distdir)/$$file \ @@ -260,80 +261,203 @@ distclean-aminfo: maintainer-clean-aminfo: - for i in $(INFO_DEPS); do \ + cd $(srcdir) && for i in $(INFO_DEPS); do \ rm -f $$i; \ if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ rm -f $$i-[0-9]*; \ fi; \ done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. + +@SET_MAKE@ + +all-recursive install-data-recursive install-exec-recursive \ +installdirs-recursive install-recursive uninstall-recursive \ +check-recursive installcheck-recursive info-recursive dvi-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ + rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ + done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + tags: TAGS -TAGS: +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = docs distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done - $(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info -info: $(INFO_DEPS) -dvi: $(DVIS) -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-info-am - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-info - + for subdir in $(SUBDIRS); do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info +info-am: $(INFO_DEPS) +info: info-recursive +dvi-am: $(DVIS) +dvi: dvi-recursive +check-am: all-am +check: check-recursive +installcheck-am: +installcheck: installcheck-recursive +install-exec-am: +install-exec: install-exec-recursive + +install-data-am: install-info-am +install-data: install-data-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-recursive +uninstall-am: uninstall-info +uninstall: uninstall-recursive +all-am: Makefile $(INFO_DEPS) +all-redirect: all-recursive install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install -installdirs: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: installdirs-recursive +installdirs-am: $(mkinstalldirs) $(DESTDIR)$(infodir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-aminfo mostlyclean-generic +mostlyclean-am: mostlyclean-aminfo mostlyclean-tags mostlyclean-generic + +mostlyclean: mostlyclean-recursive -clean: clean-aminfo clean-generic mostlyclean +clean-am: clean-aminfo clean-tags clean-generic mostlyclean-am -distclean: distclean-aminfo distclean-generic clean - -rm -f config.status +clean: clean-recursive + +distclean-am: distclean-aminfo distclean-tags distclean-generic \ + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-aminfo maintainer-clean-generic \ - distclean +distclean: distclean-recursive + +maintainer-clean-am: maintainer-clean-aminfo maintainer-clean-tags \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-recursive + .PHONY: install-info-am uninstall-info mostlyclean-aminfo \ -distclean-aminfo clean-aminfo maintainer-clean-aminfo tags distdir info \ -dvi installcheck install-exec install-data install uninstall all \ +distclean-aminfo clean-aminfo maintainer-clean-aminfo \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/docs/white-paper/Makefile.am gimp-1.0.3/docs/white-paper/Makefile.am --- gimp-1.0.2/docs/white-paper/Makefile.am Wed Dec 31 16:00:00 1969 +++ gimp-1.0.3/docs/white-paper/Makefile.am Sun Nov 8 18:26:34 1998 @@ -0,0 +1 @@ +EXTRA_DIST = gimp-white-paper.tex diff -ruN gimp-1.0.2/docs/white-paper/Makefile.in gimp-1.0.3/docs/white-paper/Makefile.in --- gimp-1.0.2/docs/white-paper/Makefile.in Wed Dec 31 16:00:00 1969 +++ gimp-1.0.3/docs/white-paper/Makefile.in Mon Mar 29 12:52:46 1999 @@ -0,0 +1,229 @@ +# Makefile.in generated automatically by automake 1.4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ + +top_builddir = ../.. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AA = @AA@ +AS = @AS@ +CC = @CC@ +CPP = @CPP@ +DLLTOOL = @DLLTOOL@ +EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ +GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ +GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ +GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ +GIMP_VERSION = @GIMP_VERSION@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_CONFIG = @GTK_CONFIG@ +GTK_LIBS = @GTK_LIBS@ +JPEG = @JPEG@ +LD = @LD@ +LIBAA_LIB = @LIBAA_LIB@ +LIBJPEG_LIB = @LIBJPEG_LIB@ +LIBMPEG_LIB = @LIBMPEG_LIB@ +LIBPNG_LIB = @LIBPNG_LIB@ +LIBTIFF_LIB = @LIBTIFF_LIB@ +LIBTOOL = @LIBTOOL@ +LIBUCB_LIB = @LIBUCB_LIB@ +LIBXDELTA_LIB = @LIBXDELTA_LIB@ +LIBXMU_LIB = @LIBXMU_LIB@ +LIBXPM_LIB = @LIBXPM_LIB@ +LN_S = @LN_S@ +LPC_COMMAND = @LPC_COMMAND@ +LPC_DEF = @LPC_DEF@ +LPR_COMMAND = @LPR_COMMAND@ +LPR_DEF = @LPR_DEF@ +LPSTAT_COMMAND = @LPSTAT_COMMAND@ +LPSTAT_DEF = @LPSTAT_DEF@ +LP_COMMAND = @LP_COMMAND@ +LP_DEF = @LP_DEF@ +MAILER = @MAILER@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MPEG = @MPEG@ +NM = @NM@ +PACKAGE = @PACKAGE@ +PNG = @PNG@ +RANLIB = @RANLIB@ +SENDMAIL = @SENDMAIL@ +TIFF = @TIFF@ +VERSION = @VERSION@ +WEBBROWSER = @WEBBROWSER@ +XD = @XD@ +XPM = @XPM@ +X_CFLAGS = @X_CFLAGS@ +X_LIBS = @X_LIBS@ +brushdata = @brushdata@ +gimpdatadir = @gimpdatadir@ +gimpdir = @gimpdir@ +gimpplugindir = @gimpplugindir@ +gradientdata = @gradientdata@ +palettedata = @palettedata@ +patterndata = @patterndata@ + +EXTRA_DIST = gimp-white-paper.tex +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../../config.h +CONFIG_CLEAN_FILES = +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP_ENV = --best +all: all-redirect +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/white-paper/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +tags: TAGS +TAGS: + + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = docs/white-paper + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/white-paper/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-generic clean-am + -rm -f libtool + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: tags distdir info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -ruN gimp-1.0.2/gimptool.in gimp-1.0.3/gimptool.in --- gimp-1.0.2/gimptool.in Sun Sep 27 14:40:46 1998 +++ gimp-1.0.3/gimptool.in Sun Nov 8 18:26:29 1998 @@ -215,7 +215,7 @@ ;; --install-script) install_cmd="@INSTALL_DATA@" - install_dir="$HOME/.gimp/scripts" + install_dir="$HOME/@gimpdir@/scripts" ;; --install-admin-script) install_cmd="@INSTALL_DATA@" @@ -270,7 +270,8 @@ shift if test "x$1" != "x"; then if test -r "$1"; then - cmd="$cc $cflags $gimp_cflags -o $install_dir/`echo $1 | sed 's/\.[^\.]*$//'` $1 $ldflags $gimp_libs $libs" + dest=`echo $1 | sed -e 's#.*/\([^/].*\)$#\1#' -e 's/\.[^.]*$//'` + cmd="$cc $cflags $gimp_cflags -o $install_dir/$dest $1 $ldflags $gimp_libs $libs" test $quiet = "yes" || echo $cmd test $donothing = "yes" || exec $cmd else diff -ruN gimp-1.0.2/libgimp/Makefile.am gimp-1.0.3/libgimp/Makefile.am --- gimp-1.0.2/libgimp/Makefile.am Sat Sep 26 22:36:22 1998 +++ gimp-1.0.3/libgimp/Makefile.am Sun Nov 8 18:26:36 1998 @@ -14,7 +14,9 @@ gimpwire.c \ gimpwire.h +if STATICLIBS libgimpi_a_DEPENDENCIES = libgimp.la +endif libgimp_la_SOURCES = gimp.c \ gimpchannel.c \ diff -ruN gimp-1.0.2/libgimp/Makefile.in gimp-1.0.3/libgimp/Makefile.in --- gimp-1.0.2/libgimp/Makefile.in Wed Oct 14 20:18:41 1998 +++ gimp-1.0.3/libgimp/Makefile.in Mon Mar 29 13:12:34 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -117,53 +120,34 @@ gimpincludedir = $(includedir)/libgimp -scriptdata = +scriptdata = EXTRA_DIST = gimpfeatures.h.in lib_LTLIBRARIES = libgimp.la libgimpui.la noinst_LIBRARIES = libgimpi.a -libgimpi_a_SOURCES = gimpprotocol.c \ - gimpprotocol.h \ - gimpwire.c \ - gimpwire.h - -libgimpi_a_DEPENDENCIES = libgimp.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 - -libgimpui_la_SOURCES = gimpmenu.c - -gimpinclude_HEADERS = gimp.h \ - gimpenums.h \ - gimpfeatures.h \ - gimpmenu.h \ - gimpui.h +libgimpi_a_SOURCES = gimpprotocol.c gimpprotocol.h gimpwire.c gimpwire.h + + +@STATICLIBS_TRUE@libgimpi_a_DEPENDENCIES = libgimp.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 + + +libgimpui_la_SOURCES = gimpmenu.c + +gimpinclude_HEADERS = gimp.h gimpenums.h gimpfeatures.h gimpmenu.h gimpui.h + libgimp_la_LDFLAGS = -version-info $(GIMP_MAJOR_VERSION):$(GIMP_MICRO_VERSION):0 libgimpui_la_LDFLAGS = -version-info $(GIMP_MAJOR_VERSION):$(GIMP_MICRO_VERSION):0 -CPPFLAGS = \ - -DGIMPDIR=\""$(gimpdir)"\" +CPPFLAGS = -DGIMPDIR=\""$(gimpdir)"\" + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = gimpfeatures.h @@ -185,9 +169,10 @@ libgimpui_la_LIBADD = libgimpui_la_OBJECTS = gimpmenu.lo CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ HEADERS = $(gimpinclude_HEADERS) DIST_COMMON = COPYING Makefile.am Makefile.in gimpfeatures.h.in @@ -196,15 +181,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(libgimpi_a_SOURCES) $(libgimp_la_SOURCES) $(libgimpui_la_SOURCES) OBJECTS = $(libgimpi_a_OBJECTS) $(libgimp_la_OBJECTS) $(libgimpui_la_OBJECTS) -all: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libgimp/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -212,7 +196,7 @@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status gimpfeatures.h: $(top_builddir)/config.status gimpfeatures.h.in - cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status mostlyclean-noinstLIBRARIES: @@ -280,8 +264,8 @@ $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ + echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done @@ -315,8 +299,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -344,91 +332,102 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -gimp.lo gimp.o: gimp.c ../config.h gimp.h gimpfeatures.h gimpenums.h \ +gimp.lo gimp.o : gimp.c ../config.h gimp.h gimpfeatures.h gimpenums.h \ gimpprotocol.h gimpwire.h -gimpchannel.lo gimpchannel.o: gimpchannel.c gimp.h gimpfeatures.h \ +gimpchannel.lo gimpchannel.o : gimpchannel.c gimp.h gimpfeatures.h \ gimpenums.h -gimpdisplay.lo gimpdisplay.o: gimpdisplay.c gimp.h gimpfeatures.h \ +gimpdisplay.lo gimpdisplay.o : gimpdisplay.c gimp.h gimpfeatures.h \ gimpenums.h -gimpdrawable.lo gimpdrawable.o: gimpdrawable.c gimp.h gimpfeatures.h \ +gimpdrawable.lo gimpdrawable.o : gimpdrawable.c gimp.h gimpfeatures.h \ gimpenums.h -gimpgradient.lo gimpgradient.o: gimpgradient.c gimp.h gimpfeatures.h \ +gimpgradient.lo gimpgradient.o : gimpgradient.c gimp.h gimpfeatures.h \ gimpenums.h -gimpimage.lo gimpimage.o: gimpimage.c gimp.h gimpfeatures.h gimpenums.h -gimplayer.lo gimplayer.o: gimplayer.c gimp.h gimpfeatures.h gimpenums.h -gimpmenu.lo gimpmenu.o: gimpmenu.c gimp.h gimpfeatures.h gimpenums.h \ +gimpimage.lo gimpimage.o : gimpimage.c gimp.h gimpfeatures.h gimpenums.h +gimplayer.lo gimplayer.o : gimplayer.c gimp.h gimpfeatures.h gimpenums.h +gimpmenu.lo gimpmenu.o : gimpmenu.c gimp.h gimpfeatures.h gimpenums.h \ gimpui.h gimpmenu.h -gimppalette.lo gimppalette.o: gimppalette.c gimp.h gimpfeatures.h \ +gimppalette.lo gimppalette.o : gimppalette.c gimp.h gimpfeatures.h \ gimpenums.h -gimppixelrgn.lo gimppixelrgn.o: gimppixelrgn.c gimp.h gimpfeatures.h \ +gimppixelrgn.lo gimppixelrgn.o : gimppixelrgn.c gimp.h gimpfeatures.h \ gimpenums.h -gimpprotocol.lo gimpprotocol.o: gimpprotocol.c gimpenums.h \ +gimpprotocol.lo gimpprotocol.o : gimpprotocol.c gimpenums.h \ gimpprotocol.h gimpwire.h -gimptile.lo gimptile.o: gimptile.c gimp.h gimpfeatures.h gimpenums.h \ +gimptile.lo gimptile.o : gimptile.c gimp.h gimpfeatures.h gimpenums.h \ gimpprotocol.h gimpwire.h -gimpwire.lo gimpwire.o: gimpwire.c gimpwire.h - -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: install-libLTLIBRARIES - @$(NORMAL_INSTALL) - -install-data: install-gimpincludeHEADERS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-libLTLIBRARIES uninstall-gimpincludeHEADERS +gimpwire.lo gimpwire.o : gimpwire.c gimpwire.h +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: install-libLTLIBRARIES +install-exec: install-exec-am + +install-data-am: install-gimpincludeHEADERS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-libLTLIBRARIES uninstall-gimpincludeHEADERS +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(libdir) $(DATADIR)$(gimpincludedir) + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(gimpincludedir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-noinstLIBRARIES mostlyclean-compile \ +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ mostlyclean-libtool mostlyclean-libLTLIBRARIES \ mostlyclean-tags mostlyclean-generic -clean: clean-noinstLIBRARIES clean-compile clean-libtool \ +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-libtool \ clean-libLTLIBRARIES clean-tags clean-generic \ - mostlyclean + mostlyclean-am -distclean: distclean-noinstLIBRARIES distclean-compile \ +clean: clean-am + +distclean-am: distclean-noinstLIBRARIES distclean-compile \ distclean-libtool distclean-libLTLIBRARIES \ - distclean-tags distclean-generic clean - -rm -f config.status + distclean-tags distclean-generic clean-am -rm -f libtool -maintainer-clean: maintainer-clean-noinstLIBRARIES \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-libLTLIBRARIES maintainer-clean-tags \ - maintainer-clean-generic distclean + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ @@ -438,10 +437,12 @@ maintainer-clean-libLTLIBRARIES uninstall-libLTLIBRARIES \ install-libLTLIBRARIES uninstall-gimpincludeHEADERS \ install-gimpincludeHEADERS tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info dvi installcheck \ -install-exec install-data install uninstall all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ +check-am installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean .PHONY: files diff -ruN gimp-1.0.2/libgimp/gimp.c gimp-1.0.3/libgimp/gimp.c --- gimp-1.0.2/libgimp/gimp.c Thu Aug 27 13:27:48 1998 +++ gimp-1.0.3/libgimp/gimp.c Fri Mar 26 22:15:43 1999 @@ -120,7 +120,7 @@ return 0; } - g_set_message_handler (&gimp_message_func); + g_set_message_handler ((GPrintFunc) gimp_message_func); temp_proc_ht = g_hash_table_new (&g_str_hash, &g_str_equal); @@ -128,7 +128,7 @@ return 0; } -void +void G_GNUC_NORETURN gimp_quit () { if (PLUG_IN_INFO.quit_proc) @@ -902,7 +902,7 @@ case SIGBUS: case SIGSEGV: case SIGFPE: - g_debug (progname); + g_on_error_query (progname); break; default: break; diff -ruN gimp-1.0.2/libgimp/gimpfeatures.h gimp-1.0.3/libgimp/gimpfeatures.h --- gimp-1.0.2/libgimp/gimpfeatures.h Tue Oct 13 16:55:57 1998 +++ gimp-1.0.3/libgimp/gimpfeatures.h Mon Mar 29 12:53:11 1999 @@ -27,8 +27,8 @@ #define GIMP_MAJOR_VERSION (1) #define GIMP_MINOR_VERSION (0) -#define GIMP_MICRO_VERSION (2) -#define GIMP_VERSION "1.0.2" +#define GIMP_MICRO_VERSION (3) +#define GIMP_VERSION "1.0.3" #ifdef __cplusplus } diff -ruN gimp-1.0.2/ltconfig gimp-1.0.3/ltconfig --- gimp-1.0.2/ltconfig Sun Sep 27 23:07:28 1998 +++ gimp-1.0.3/ltconfig Sun Mar 28 14:42:29 1999 @@ -1,7 +1,7 @@ #! /bin/sh # ltconfig - Create a system-specific libtool. -# Copyright (C) 1996-1998 Free Software Foundation, Inc. +# Copyright (C) 1996-1999 Free Software Foundation, Inc. # Gordon Matzigkeit , 1996 # # This file is free software; you can redistribute it and/or modify it @@ -25,21 +25,66 @@ # A lot of this script is taken from autoconf-2.10. +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} +echo=echo +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null`" = 'X\t'; then + # Yippee, $echo works! + : +else + # Restart under the correct shell. + exec "$SHELL" "$0" --no-reexec ${1+"$@"} +fi + +# Find the correct PATH separator. Usually this is `:', but +# DJGPP uses `;' like DOS. +if test "X${PATH_SEPARATOR+set}" != "Xset"; then + UNAME=${UNAME-`uname 2>/dev/null`} + case X$UNAME in + *-DOS) PATH_SEPARATOR=';' ;; + *) PATH_SEPARATOR=':' ;; + esac +fi + # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi -echo=echo -if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then : -else +if test "X${echo_test_string+set}" != "Xset"; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if (echo_test_string="`eval $cmd`") 2>/dev/null && + echo_test_string="`eval $cmd`" && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then + break + fi + done +fi + +if test "X`($echo '\t') 2>/dev/null`" != 'X\t' || + test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then # The Solaris, AIX, and Digital Unix default echo programs unquote # backslashes. This makes it impossible to quote backslashes using # echo "$something" | sed 's/\\/\\\\/g' # # So, first we look for a working echo in the user's PATH. - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH /usr/ucb; do - if test -f $dir/echo && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t'; then + if test -f $dir/echo && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then echo="$dir/echo" break fi @@ -48,25 +93,53 @@ if test "X$echo" = Xecho; then # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t'; then + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then # This shell has a builtin print -r that does the trick. echo='print -r' -# -# The following is from libtool-1.2a, won't work with this patched -# libtool-1.2 -# -# elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then -# # If we have ksh, try running ltconfig again with it. -# CONFIG_SHELL=/bin/ksh -# export CONFIG_SHELL -# exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"} + elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running ltconfig again with it. + ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}" + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"} else # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then : + echo='printf "%s\n"' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then + # Cool, printf works + : + elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' && + test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then + CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL" + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL $0 --fallback-echo" + elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' && + test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then + echo="$CONFIG_SHELL $0 --fallback-echo" else - # Oops. We lost completely, so just stick with echo. - echo=echo + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi fi fi fi @@ -80,13 +153,18 @@ # Same as above, but do not quote variable references. double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + # The name of this program. progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'` # Constants: PROGRAM=ltconfig PACKAGE=libtool -VERSION=1.2 +VERSION=1.2f +TIMESTAMP=" (1.385 1999/03/15 17:24:54)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' rm="rm -f" @@ -94,10 +172,13 @@ help="Try \`$progname --help' for more information." # Global variables: +default_ofile=libtool can_build_shared=yes enable_shared=yes # All known linkers require a `.a' archive for static linking. enable_static=yes +enable_fast_install=yes +enable_dlopen=unknown ltmain= silent= srcdir= @@ -105,9 +186,15 @@ ac_config_sub= host= nonopt= +ofile="$default_ofile" verify_host=yes with_gcc=no with_gnu_ld=no +need_locks=yes +ac_ext=c +objext=o +libext=a +cache_file= old_AR="$AR" old_CC="$CC" @@ -117,6 +204,8 @@ old_LN_S="$LN_S" old_NM="$NM" old_RANLIB="$RANLIB" +old_DLLTOOL="$DLLTOOL" +old_AS="$AS" # Parse the command line options. args= @@ -137,33 +226,49 @@ case "$option" in --help) cat <&2 echo "$help" 1>&2 @@ -205,8 +317,7 @@ exit 1 fi -if test -f "$ltmain"; then : -else +if test ! -f "$ltmain"; then echo "$progname: \`$ltmain' does not exist" 1>&2 echo "$help" 1>&2 exit 1 @@ -247,6 +358,11 @@ if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test -n "$cache_file" && test -r "$cache_file"; then + echo "loading cache $cache_file within ltconfig" + . $cache_file +fi + if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -260,8 +376,8 @@ fi if test -z "$srcdir"; then - # Assume the source directory is the same one as the path to ltmain.sh. - srcdir=`$echo "$ltmain" | $Xsed -e 's%/[^/]*$%%'` + # Assume the source directory is the same one as the path to LTMAIN. + srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'` test "$srcdir" = "$ltmain" && srcdir=. fi @@ -284,7 +400,7 @@ ac_config_sub=$ac_aux_dir/config.sub # Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then : + if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then : else echo "$progname: cannot run $ac_config_sub" 1>&2 echo "$help" 1>&2 @@ -296,14 +412,14 @@ host_alias=$host case "$host_alias" in "") - if host_alias=`$ac_config_guess`; then : + if host_alias=`$SHELL $ac_config_guess`; then : else echo "$progname: cannot guess host type; you must specify one" 1>&2 echo "$help" 1>&2 exit 1 fi ;; esac - host=`$ac_config_sub $host_alias` + host=`$SHELL $ac_config_sub $host_alias` echo "$ac_t$host" 1>&6 # Make sure the host verified. @@ -352,7 +468,7 @@ result=no echo $ac_n "checking for ranlib... $ac_c" 1>&6 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH; do test -z "$dir" && dir=. if test -f $dir/ranlib; then @@ -367,16 +483,20 @@ fi if test -n "$RANLIB"; then - old_archive_cmds="$old_archive_cmds;\$RANLIB \$oldlib" - old_postinstall_cmds="\$RANLIB \$oldlib;$old_postinstall_cmds" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" fi +# Set sane defaults for `DLLTOOL' and `AS', used on cygwin. +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$AS" && AS=as + # Check to see if we are using GCC. if test "$with_gcc" != yes || test -z "$CC"; then # If CC is not set, then try to find GCC or a usable CC. if test -z "$CC"; then echo $ac_n "checking for gcc... $ac_c" 1>&6 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for dir in $PATH; do IFS="$save_ifs" test -z "$dir" && dir=. @@ -397,7 +517,7 @@ # Not "gcc", so try "cc", rejecting "/usr/ucb/cc". if test -z "$CC"; then echo $ac_n "checking for cc... $ac_c" 1>&6 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" cc_rejected=no for dir in $PATH; do test -z "$dir" && dir=. @@ -441,7 +561,7 @@ # Now see if the compiler is really GCC. with_gcc=no echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6 - echo "$progname:444: checking whether we are using GNU C" >&5 + echo "$progname:564: checking whether we are using GNU C" >&5 $rm conftest.c cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then with_gcc=yes fi $rm conftest.c @@ -460,6 +580,28 @@ set dummy $CC compiler="$2" +echo $ac_n "checking for object suffix... $ac_c" 1>&6 +$rm conftest* +echo 'int i = 1;' > conftest.c +echo "$progname:586: checking for object suffix" >& 5 +if { (eval echo $progname:587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then + # Append any warnings to the config.log. + cat conftest.err 1>&5 + + for ac_file in conftest.*; do + case $ac_file in + *.c) ;; + *) objext=`echo $ac_file | sed -e s/conftest.//` ;; + esac + done +else + cat conftest.err 1>&5 + echo "$progname: failed program was:" >&5 + cat conftest.c >&5 +fi +$rm conftest* +echo "$ac_t$objext" 1>&6 + echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6 pic_flag= special_shlib_compile_flags= @@ -470,13 +612,21 @@ if test "$with_gcc" = yes; then wl='-Wl,' link_static_flag='-static' - no_builtin_flag=' -fno-builtin' case "$host_os" in - aix3* | aix4* | irix5* | irix6* | osf3* | osf4*) + beos* | irix5* | irix6* | osf3* | osf4*) # PIC is the default for these OSes. ;; - os2*) + aix*) + # Below there is a dirty hack to force normal static linking with -ldl + # The problem is because libdl dynamically linked with both libc and + # libC (AIX C++ library), which obviously doesn't included in libraries + # list by gcc. This cause undefined symbols with -static flags. + # This hack allows C programs to be linked with "-static -ldl", but + # we not sure about C++ programs. + link_static_flag="$link_static_flag ${wl}-lC" + ;; + cygwin* | mingw* | os2*) # We can build DLLs from non-PIC. ;; amigaos*) @@ -497,7 +647,7 @@ link_static_flag='-bnso -bI:/lib/syscalls.exp' ;; - hpux9* | hpux10*) + hpux9* | hpux10* | hpux11*) # Is there a better link_static_flag that works with the bundled CC? wl='-Wl,' link_static_flag="${wl}-a ${wl}archive" @@ -510,7 +660,7 @@ # PIC (with -KPIC) is the default. ;; - os2*) + cygwin* | mingw* | os2*) # We can build DLLs from non-PIC. ;; @@ -526,7 +676,7 @@ special_shlib_compile_flags='-belf' ;; - solaris2*) + solaris*) pic_flag='-KPIC' link_static_flag='-Bstatic' wl='-Wl,' @@ -538,7 +688,7 @@ wl='-Qoption ld ' ;; - sysv4.2uw2*) + sysv4.2uw2* | sysv4.3* | sysv5*) pic_flag='-KPIC' link_static_flag='-Bstatic' wl='-Wl,' @@ -564,33 +714,156 @@ echo "int some_variable = 0;" > conftest.c save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pic_flag -DPIC" - echo "$progname:567: checking if $compiler PIC flag $pic_flag works" >&5 - if { (eval echo $progname:568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then + echo "$progname:717: checking if $compiler PIC flag $pic_flag works" >&5 + if { (eval echo $progname:718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then # Append any warnings to the config.log. cat conftest.err 1>&5 + + case "$host_os" in + hpux9* | hpux10* | hpux11*) + # On HP-UX, both CC and GCC only warn that PIC is supported... then they + # create non-PIC objects. So, if there were any warnings, we assume that + # PIC is not supported. + if test -s conftest.err; then + echo "$ac_t"no 1>&6 + can_build_shared=no + pic_flag= + else + echo "$ac_t"yes 1>&6 + pic_flag=" $pic_flag" + fi + ;; + *) + echo "$ac_t"yes 1>&6 + pic_flag=" $pic_flag" + ;; + esac + else + # Append any errors to the config.log. + cat conftest.err 1>&5 + can_build_shared=no + pic_flag= + echo "$ac_t"no 1>&6 + fi + CFLAGS="$save_CFLAGS" + $rm conftest* +else + echo "$ac_t"none 1>&6 +fi + +# Check to see if options -o and -c are simultaneously supported by compiler +echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6 +$rm conftest* +echo "int some_variable = 0;" > conftest.c +save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -c -o conftest2.o" +echo "$progname:760: checking if $compiler supports -c -o file.o" >&5 +if { (eval echo $progname:761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest2.o; then - # On HP-UX, both CC and GCC only warn that PIC is supported... then they - # create non-PIC objects. So, if there were any warnings, we assume that - # PIC is not supported. + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings if test -s conftest.err; then echo "$ac_t"no 1>&6 - can_build_shared=no - pic_flag= + compiler_c_o=no else echo "$ac_t"yes 1>&6 - pic_flag=" $pic_flag" + compiler_c_o=yes fi +else + # Append any errors to the config.log. + cat conftest.err 1>&5 + compiler_c_o=no + echo "$ac_t"no 1>&6 +fi +CFLAGS="$save_CFLAGS" +$rm conftest* + +if test x"$compiler_c_o" = x"yes"; then + # Check to see if we can write to a .lo + echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6 + $rm conftest* + echo "int some_variable = 0;" > conftest.c + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -c -o conftest.lo" + echo "$progname:788: checking if $compiler supports -c -o file.lo" >&5 +if { (eval echo $progname:789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then + + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + echo "$ac_t"no 1>&6 + compiler_o_lo=no + else + echo "$ac_t"yes 1>&6 + compiler_o_lo=yes + fi else # Append any errors to the config.log. cat conftest.err 1>&5 - can_build_shared=no - pic_flag= + compiler_o_lo=no echo "$ac_t"no 1>&6 fi CFLAGS="$save_CFLAGS" $rm conftest* else - echo "$ac_t"none 1>&6 + compiler_o_lo=no +fi + +# Check to see if we can do hard links to lock some files if needed +hard_links="nottested" +if test "$compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6 + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + echo "$ac_t$hard_links" 1>&6 + $rm conftest* + if test "$hard_links" = no; then + echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2 + need_locks=warn + fi +else + need_locks=no +fi + +if test "$with_gcc" = yes; then + # Check to see if options -fno-rtti -fno-exceptions are supported by compiler + echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6 + $rm conftest* + echo "int some_variable = 0;" > conftest.c + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c" + echo "$progname:840: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + if { (eval echo $progname:841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then + + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + echo "$ac_t"no 1>&6 + compiler_rtti_exceptions=no + else + echo "$ac_t"yes 1>&6 + compiler_rtti_exceptions=yes + fi + else + # Append any errors to the config.log. + cat conftest.err 1>&5 + compiler_rtti_exceptions=no + echo "$ac_t"no 1>&6 + fi + CFLAGS="$save_CFLAGS" + $rm conftest* + + if test "$compiler_rtti_exceptions" = "yes"; then + no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions' + else + no_builtin_flag=' -fno-builtin' + fi + fi # Check for any special shared library compilation flags. @@ -608,8 +881,8 @@ echo 'main(){return(0);}' > conftest.c save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $link_static_flag" -echo "$progname:611: checking if $compiler static flag $link_static_flag works" >&5 -if { (eval echo $progname:612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +echo "$progname:884: checking if $compiler static flag $link_static_flag works" >&5 +if { (eval echo $progname:885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then echo "$ac_t$link_static_flag" 1>&6 else echo "$ac_t"none 1>&6 @@ -641,11 +914,17 @@ if test "$with_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 - echo "$progname:644: checking for ld used by GCC" >&5 + echo "$progname:917: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. - /* | [A-Za-z]:\\*) + /* | [A-Za-z]:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done test -z "$LD" && LD="$ac_prog" ;; "") @@ -659,14 +938,14 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld... $ac_c" 1>&6 - echo "$progname:662: checking for GNU ld" >&5 + echo "$progname:941: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 - echo "$progname:665: checking for non-GNU ld" >&5 + echo "$progname:944: checking for non-GNU ld" >&5 fi if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog"; then @@ -711,55 +990,146 @@ allow_undefined_flag= no_undefined_flag= +need_lib_prefix=unknown +need_version=unknown +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments archive_cmds= +archive_expsym_cmds= old_archive_from_new_cmds= export_dynamic_flag_spec= +whole_archive_flag_spec= +thread_safe_flag_spec= hardcode_libdir_flag_spec= hardcode_libdir_separator= hardcode_direct=no hardcode_minus_L=no hardcode_shlibpath_var=unsupported runpath_var= +always_export_symbols=no +export_symbols_cmds='$NM $libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols' +# include_expsyms should be a list of space-separated symbols to be *always* +# included in the symbol list +include_expsyms= +# exclude_expsyms can be an egrep regular expression of symbols to exclude +# it will be wrapped by ` (' and `)$', so one must not match beginning or +# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +# as well as any symbol that contains `d'. +exclude_expsyms= case "$host_os" in -amigaos* | sunos4*) - # On these operating systems, we should treat GNU ld like the system ld. - gnu_ld_acts_native=yes +cygwin* | mingw*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$with_gcc" != yes; then + with_gnu_ld=no + fi ;; -*) - gnu_ld_acts_native=no + +freebsd2* | sunos4*) + exclude_expsyms="_GLOBAL_OFFSET_TABLE_" ;; + esac ld_shlibs=yes -if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then +if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' # See if GNU ld supports shared libraries. - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - case "$host_os" in - linux-gnu*) - archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs $deplibs' - ;; - *) - archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs' - ;; - esac - runpath_var=LD_RUN_PATH - ld_shlibs=yes - else + case "$host_os" in + aix3* | aix4*) + # On AIX, the GNU linker is very broken ld_shlibs=no - fi + cat <&2 + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. + +EOF + ;; + + amigaos*) + archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + + sunos4*) + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts' + wlarc= + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + beos*) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; + + cygwin* | mingw*) + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + allow_undefined_flag=unsupported + always_export_symbols=yes + + # Extract the symbol export list from an `--export-all' def file, + # then regenerate the def file from the symbol export list, so that + # the compiled dll only exports the symbol export list. + export_symbols_cmds='rm -f $objdir/$soname-ltdll.c~ + sed -e "/^# \/\* ltdll.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~ + (cd $objdir && $CC -c $soname-ltdll.c)~ + $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs~ + sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols' + + archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~ + _lt_hint=1; + for symbol in `cat $export_symbols`; do + echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def; + _lt_hint=`expr 1 + \$_lt_hint`; + done~ + $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ + $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ + $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~ + $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~ + $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts' + + old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' + ;; + + *) + if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac if test "$ld_shlibs" = yes; then + runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' export_dynamic_flag_spec='${wl}--export-dynamic' + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi else # PORTME fill in a description of your system's linker (not GNU ld) case "$host_os" in aix3*) allow_undefined_flag=unsupported - archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' > $lib.exp;$LD -o $objdir/$soname$libobjs -bE:$lib.exp -T512 -H512 -bM:SRE;$AR cru $lib $objdir/$soname' + always_export_symbols=yes + archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname' # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes @@ -771,57 +1141,99 @@ ;; aix4*) - allow_undefined_flag=unsupported - archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' > $lib.exp;$CC -o $objdir/$soname$libobjs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry;$AR cru $lib $objdir/$soname' - hardcode_direct=yes + allow_undefined_flag= + if test "$with_gcc" = yes; then + if strings `${CC} -print-prog-name=collect2` | \ + grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + fi + archive_cmds='$CC -shared ${wl}-bnoentry -o $objdir/$soname $libobjs $deplibs $linkopts' + else + always_export_symbols=yes + archive_expsym_cmds='$CC -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bM:SRE ${wl}-bnoentry' + hardcode_direct=yes + fi hardcode_minus_L=yes - ;; + # Though LIBPATH variable hardcodes shlibpath into executable, + # it doesn't affect searching for -l* libraries; this confuses + # tests in mdemo. + hardcode_shlibpath_var=unsupported + hardcode_libdir_flag_spec='-L$libdir' + ;; amigaos*) - archive_cmds='$rm $objdir/a2ixlibrary.data;$echo "#define NAME $libname" > $objdir/a2ixlibrary.data;$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data;$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data;$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data;$AR cru $lib$libobjs;$RANLIB $lib;(cd $objdir && a2ixlibrary -32)' + archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)' hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes ;; + cygwin* | mingw*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib /OUT:$oldlib$oldobjs' + fix_srcfile_path='`cygpath -w $srcfile`' + ;; + + freebsd1*) + ld_shlibs=no + can_build_shared=no + ;; + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little # extra space). freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib$libobjs /usr/lib/c++rt0.o' + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes - hardcode_minus_L=yes + hardcode_minus_L=no # verified on 2.2.6 hardcode_shlibpath_var=no ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. freebsd2*) - archive_cmds='$LD -Bshareable -o $lib$libobjs' + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' hardcode_direct=yes hardcode_minus_L=yes hardcode_shlibpath_var=no ;; - # FreeBSD 3, at last, uses gcc -shared to do shared libraries. - freebsd3*) - archive_cmds='$CC -shared -o $lib$libobjs' + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes - hardcode_minus_L=yes + hardcode_minus_L=no hardcode_shlibpath_var=no ;; hpux9*) - archive_cmds='$rm $objdir/$soname;$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs;mv $objdir/$soname $lib' + archive_cmds='$rm $objdir/$soname~$LD -b +s +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_direct=yes hardcode_minus_L=yes export_dynamic_flag_spec='${wl}-E' ;; - hpux10*) - archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs' + hpux10* | hpux11*) + archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' hardcode_direct=yes hardcode_minus_L=yes @@ -829,20 +1241,28 @@ ;; irix5* | irix6*) - archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs' + if test "$with_gcc" = yes; then + archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + else + archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib' + fi hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: ;; netbsd*) - # Tested with NetBSD 1.2 ld - archive_cmds='$LD -Bshareable -o $lib$libobjs' - hardcode_libdir_flag_spec='-R$libdir' + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts' # ELF + fi + hardcode_libdir_flag_spec='${wl}-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no ;; openbsd*) - archive_cmds='$LD -Bshareable -o $lib$libobjs' + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -852,45 +1272,45 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def;$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def;$echo DATA >> $objdir/$libname.def;$echo " SINGLE NONSHARED" >> $objdir/$libname.def;$echo EXPORTS >> $objdir/$libname.def;emxexp$libobjs >> $objdir/$libname.def;$CC -Zdll -Zcrtdll -o $lib$libobjs $objdir/$libname.def' + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def' old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def' ;; osf3* | osf4*) - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs$deplibs' + if test "$with_gcc" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib' + fi hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; sco3.2v5*) - archive_cmds='$LD -G -o $lib$libobjs' + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts' hardcode_direct=yes ;; - solaris2*) + solaris*) no_undefined_flag=' -z text' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib$libobjs' + # $CC -shared without GNU ld will not create a library from C++ + # object files and a static libstdc++, better avoid it by now + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp' hardcode_libdir_flag_spec='-R$libdir' hardcode_shlibpath_var=no - - # Solaris 2 before 2.5 hardcodes -L paths. - case "$host_os" in - solaris2.[0-4]*) - hardcode_minus_L=yes - ;; - esac ;; sunos4*) + # Why do we need -Bstatic? To avoid inter-library dependencies, maybe... if test "$with_gcc" = yes; then - archive_cmds='$CC -shared -o $lib$libobjs' + # Use -fPIC here because libgcc is multilibbed + archive_cmds='$CC -shared ${wl}-Bstatic -fPIC -o $lib $libobjs $deplibs $linkopts' else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs' - fi - - if test "$with_gnu_ld" = yes; then - export_dynamic_flag_spec='${wl}-export-dynamic' + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts' fi hardcode_libdir_flag_spec='-L$libdir' hardcode_direct=yes @@ -898,8 +1318,24 @@ hardcode_shlibpath_var=no ;; + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + hardcode_direct=no + hardcode_minus_L=no + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + uts4*) - archive_cmds='$LD -G -h $soname -o $lib$libobjs' + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=no + hardcode_minus_L=no + hardcode_shlibpath_var=no + ;; + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' hardcode_libdir_flag_spec='-L$libdir' hardcode_direct=no hardcode_minus_L=no @@ -917,23 +1353,25 @@ if test -z "$NM"; then echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6 case "$NM" in - /* | [A-Za-z]:\\*) ;; # Let the user override the test with a path. + /* | [A-Za-z]:[/\\]*) ;; # Let the user override the test with a path. *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/nm; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - NM="$ac_dir/nm -B" - elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - NM="$ac_dir/nm -p" + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then + NM="$ac_dir/nm -B" + break + elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then + NM="$ac_dir/nm -p" + break else - NM="$ac_dir/nm" + NM=${NM="$ac_dir/nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags fi - break fi done IFS="$ac_save_ifs" @@ -950,40 +1388,51 @@ # [They come from Ultrix. What could be older than Ultrix?!! ;)] # Character class describing NM global symbol codes. -symcode='[BCDEGRSTU]' +symcode='[BCDEGRST]' # Regexp to match symbols that can be accessed directly from C. sympat='\([_A-Za-z][_A-Za-z0-9]*\)' # Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \1' +symxfrm='\1 \2\3 \3' + +# Transform an extracted symbol line into a proper C declaration +global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'" # Define system-specific variables. case "$host_os" in aix*) - symcode='[BCDTU]' + symcode='[BCDT]' + ;; +cygwin* | mingw*) + symcode='[ABCDGISTW]' + ;; +hpux*) # Its linker distinguishes data from code symbols + global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'" ;; irix*) - # Cannot use undefined symbols on IRIX because inlined functions mess us up. symcode='[BCDEGRST]' ;; -solaris2*) - symcode='[BDTU]' +solaris*) + symcode='[BDT]' ;; esac # If we're using GNU nm, then use its standard symbol codes. if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - symcode='[ABCDGISTUW]' + symcode='[ABCDGISTW]' fi -# Write the raw and C identifiers. -global_symbol_pipe="sed -n -e 's/^.* $symcode $sympat$/$symxfrm/p'" +# Try without a prefix undercore, then with it. +for ac_symprfx in "" "_"; do -# Check to see that the pipe works correctly. -pipe_works=no -$rm conftest* -cat > conftest.c < conftest.c <&5 -if { (eval echo $progname:999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then - # Now try to grab the symbols. - nlist=conftest.nm - if { echo "$progname:1002: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then - - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - wcout=`wc "$nlist" 2>/dev/null` - count=`$echo "X$wcout" | $Xsed -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'` - (test "$count" -ge 0) 2>/dev/null || count=-1 - else - rm -f "$nlist"T - count=-1 - fi + echo "$progname:1447: checking if global_symbol_pipe works" >&5 + if { (eval echo $progname:1448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then + # Now try to grab the symbols. + nlist=conftest.nm + if { echo "$progname:1451: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then + + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi - # Make sure that we snagged all the symbols we need. - if egrep ' nm_test_var$' "$nlist" >/dev/null; then - if egrep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.c + # Make sure that we snagged all the symbols we need. + if egrep ' nm_test_var$' "$nlist" >/dev/null; then + if egrep ' nm_test_func$' "$nlist" >/dev/null; then + cat < conftest.c #ifdef __cplusplus extern "C" { #endif EOF - # Now generate the symbol file. - sed 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> conftest.c + # Now generate the symbol file. + eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.c' - cat <> conftest.c + cat <> conftest.c #if defined (__STDC__) && __STDC__ -# define __ptr_t void * +# define lt_ptr_t void * #else -# define __ptr_t char * +# define lt_ptr_t char * +# define const #endif -/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */ -int dld_preloaded_symbol_count = $count; - /* The mapping between symbol names and symbols. */ -struct { - char *name; - __ptr_t address; +const struct { + const char *name; + lt_ptr_t address; } -dld_preloaded_symbols[] = +lt_preloaded_symbols[] = { EOF - sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$nlist" >> conftest.c - cat <<\EOF >> conftest.c - {0, (__ptr_t) 0} + sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.c + cat <<\EOF >> conftest.c + {0, (lt_ptr_t) 0} }; #ifdef __cplusplus } #endif EOF - # Now try linking the two files. - mv conftest.o conftestm.o - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS='conftestm.o' - CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo $progname:1060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - pipe_works=yes - else - echo "$progname: failed program was:" >&5 - cat conftest.c >&5 - fi - LIBS="$save_LIBS" + # Now try linking the two files. + mv conftest.$objext conftestm.$objext + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="conftestm.$objext" + CFLAGS="$CFLAGS$no_builtin_flag" + if { (eval echo $progname:1503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + pipe_works=yes + else + echo "$progname: failed program was:" >&5 + cat conftest.c >&5 + fi + LIBS="$save_LIBS" + else + echo "cannot find nm_test_func in $nlist" >&5 + fi else - echo "cannot find nm_test_func in $nlist" >&5 + echo "cannot find nm_test_var in $nlist" >&5 fi else - echo "cannot find nm_test_var in $nlist" >&5 + echo "cannot run $global_symbol_pipe" >&5 fi else - echo "cannot run $global_symbol_pipe" >&5 + echo "$progname: failed program was:" >&5 + cat conftest.c >&5 fi -else - echo "$progname: failed program was:" >&5 - cat conftest.c >&5 -fi -$rm conftest* + $rm conftest* -# Do not use the global_symbol_pipe unless it works. + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + global_symbol_pipe= + fi +done echo "$ac_t$pipe_works" 1>&6 -test "$pipe_works" = yes || global_symbol_pipe= + +if test -z "$global_symbol_pipe"; then + global_symbol_to_cdecl= +fi # Check hardcoding attributes. echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6 @@ -1100,25 +1552,20 @@ # We can link without hardcoding, and we can hardcode nonexisting dirs. hardcode_action=immediate fi -elif test "$hardcode_direct" != yes && \ - test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" != yes; then - # We cannot hardcode anything. - hardcode_action=unsupported else - # We can only hardcode existing directories. - hardcode_action=relink + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported fi echo "$ac_t$hardcode_action" 1>&6 -test "$hardcode_action" = unsupported && can_build_shared=no reload_flag= reload_cmds='$LD$reload_flag -o $output$reload_objs' echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6 -# PORTME Some linker may need a different reload flag. +# PORTME Some linkers may need a different reload flag. reload_flag='-r' -echo "$ac_t$reload_flag" +echo "$ac_t$reload_flag" 1>&6 test -n "$reload_flag" && reload_flag=" $reload_flag" # PORTME Fill in your ld.so characteristics @@ -1130,18 +1577,45 @@ finish_cmds= finish_eval= shlibpath_var= +shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" - +sys_lib_dlsearch_path_spec="/lib /usr/lib" +sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +file_magic_cmd= +file_magic_test_file= +deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [regex]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given egrep regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6 case "$host_os" in -aix3* | aix4*) +aix3*) version_type=linux - library_names_spec='${libname}${release}.so.$versuffix $libname.a' + library_names_spec='${libname}${release}.so$versuffix $libname.a' shlibpath_var=LIBPATH # AIX has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}.so.$major' + soname_spec='${libname}${release}.so$major' + ;; + +aix4*) + version_type=linux + # AIX has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + # We preserve .a as extension for shared libraries though AIX4.2 + # and later linker supports .so + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a' + shlibpath_var=LIBPATH + deplibs_check_method=pass_all ;; amigaos*) @@ -1150,36 +1624,123 @@ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' ;; -freebsd2* | freebsd3*) - version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix $libname.so' - finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' +beos*) + library_names_spec='${libname}.so' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi4*) + version_type=linux + library_names_spec='${libname}.so$major ${libname}.so' + soname_spec='${libname}.so' + finish_cmds='PATH="$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + deplibs_check_method='file_magic ELF 32-bit LSB shared object' + file_magic_cmd=/usr/bin/file + file_magic_test_file=/shlib/libc.so + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw*) + version_type=windows + if test "$with_gcc" = yes; then + library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a' + else + library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib' + fi + dynamic_linker='Win32 ld.exe' + deplibs_check_method='file_magic file format pei*-i386.*architecture: i386' + file_magic_cmd='objdump -f' + need_lib_prefix=no + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +freebsd1*) + dynamic_linker=no + ;; + +freebsd*) + objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case "$version_type" in + freebsd-elf*) + deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' + file_magic_cmd=/usr/bin/file + file_magic_test_file=`echo /usr/lib/libc.so*` + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + deplibs_check_method=unknown + library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix' + need_version=yes + ;; + esac + finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH ;; gnu*) - version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix' + version_type=linux + library_names_spec='${libname}${release}.so$versuffix ${libname}.so' shlibpath_var=LD_LIBRARY_PATH ;; -hpux9* | hpux10*) +hpux9* | hpux10* | hpux11*) # Give a soname corresponding to the major version so that dld.sl refuses to # link against other versions. dynamic_linker="$host_os dld.sl" version_type=sunos + need_lib_prefix=no + need_version=no shlibpath_var=SHLIB_PATH - library_names_spec='${libname}${release}.sl.$versuffix ${libname}${release}.sl.$major $libname.sl' - soname_spec='${libname}${release}.sl.$major' + library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' + soname_spec='${libname}${release}.sl$major' # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' ;; -irix5* | irix6*) - version_type=osf +irix5*) + version_type=irix soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so.$versuffix $libname.so' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' shlibpath_var=LD_LIBRARY_PATH + deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" # or should it be pass_all? + file_magic_cmd=/usr/bin/file + file_magic_test_file=`echo /lib/libc.so*` + shlibpath_overrides_runpath=no + ;; + +irix6*) + version_type=irix + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}.so' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' + case "$LD" in # libtool.m4 will add one of these switches to LD + *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + # even though /usr/local/lib is always searched, the man-page says + # shared libraries should not be installed there if they use an ABI + # different from -32, so we'd better not search for shared libraries + # there either + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" # or should it be pass_all? + file_magic_cmd=/usr/bin/file + file_magic_test_file=`echo /lib${libsuff}/libc.so*` ;; # No shared lib support for Linux oldld, aout, or coff. @@ -1190,10 +1751,16 @@ # This must be Linux ELF. linux-gnu*) version_type=linux - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' - soname_spec='${libname}${release}.so.$major' + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + soname_spec='${libname}${release}.so$major' finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + file_magic_cmd=/usr/bin/file + file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` if test -f /lib/ld.so.1; then dynamic_linker='GNU ld.so' @@ -1206,15 +1773,34 @@ fi ;; -netbsd* | openbsd*) +netbsd*) + version_type=sunos + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' + finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' + soname_spec='${libname}${release}.so$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + ;; + +openbsd*) version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix' - finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + need_version=no + fi + library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH ;; os2*) libname_spec='$name' + need_lib_prefix=no library_names_spec='$libname.dll $libname.a' dynamic_linker='OS/2 ld.exe' shlibpath_var=LIBPATH @@ -1223,42 +1809,79 @@ osf3* | osf4*) version_type=osf soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so.$versuffix $libname.so' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' shlibpath_var=LD_LIBRARY_PATH + # deplibs_check_method='pass_all' + # Although pass_all appears to work, it copies symbols from static libraries + # into shared ones and exports them. So, when a program is linked with two + # or more libraries that have got copies of the same symbols, link fails + # This was only tested on osf4: + deplibs_check_method='file_magic COFF format alpha shared library' + file_magic_cmd=/usr/bin/file + file_magic_test_file=/shlib/libc.so + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; sco3.2v5*) version_type=osf - soname_spec='${libname}${release}.so.$major' - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' + soname_spec='${libname}${release}.so$major' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH ;; -solaris2*) +solaris*) version_type=linux - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' - soname_spec='${libname}${release}.so.$major' + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + soname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib" + file_magic_cmd=/usr/bin/file + file_magic_test_file=/lib/libc.so ;; sunos4*) version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix' - finish_cmds='PATH="$PATH:/usr/etc" ldconfig $libdir' + library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes ;; -sysv4.2uw2*) +sysv4.2uw2* | sysv4.3* | sysv5*) version_type=linux - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' - soname_spec='${libname}${release}.so.$major' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + soname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH + case "$host_vendor" in + ncr) + deplibs_check_method='pass_all' + ;; + esac ;; uts4*) version_type=linux - library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' - soname_spec='${libname}${release}.so.$major' + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + soname_spec='${libname}${release}.so$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +dgux*) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' + soname_spec='${libname}${release}.so$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -1266,25 +1889,53 @@ dynamic_linker=no ;; esac -echo "$ac_t$dynamic_linker" +echo "$ac_t$dynamic_linker" 1>&6 test "$dynamic_linker" = no && can_build_shared=no # Report the final consequences. echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6 +if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then + case "$deplibs_check_method" in + "file_magic "*) + file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + egrep "$file_magic_regex" > /dev/null; then + : + else + cat <&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +EOF + fi ;; + esac +fi + echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6 test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case "$host_os" in -aix*) +aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then - archive_cmds="$archive_cmds;\$RANLIB \$lib" + archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; + +aix4*) + test "$enable_shared" = yes && enable_static=no + ;; esac echo "$ac_t$enable_shared" 1>&6 @@ -1294,6 +1945,15 @@ echo "checking whether to build static libraries... $enable_static" 1>&6 +if test "$hardcode_action" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + echo $ac_n "checking for objdir... $ac_c" 1>&6 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -1306,46 +1966,502 @@ rmdir .libs 2>/dev/null echo "$ac_t$objdir" 1>&6 +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else +if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then + lt_cv_dlopen=no lt_cv_dlopen_libs= +echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +echo "$progname:1977: checking for dlopen" >&5 +if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +dlopen(); +#endif + +; return 0; } +EOF +if { (eval echo $progname:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dlopen=yes" +else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_dlopen=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then + echo "$ac_t""yes" 1>&6 + lt_cv_dlopen="dlopen" +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +echo "$progname:2022: checking for dlopen in -ldl" >&5 +ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 +echo "$progname:2059: checking for dld_link in -ldld" >&5 +ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldld $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for shl_load""... $ac_c" 1>&6 +echo "$progname:2096: checking for shl_load" >&5 +if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shl_load(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +shl_load(); +#endif + +; return 0; } +EOF +if { (eval echo $progname:2123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shl_load=yes" +else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_shl_load=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then + echo "$ac_t""yes" 1>&6 + lt_cv_dlopen="shl_load" +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for LoadLibrary""... $ac_c" 1>&6 +echo "$progname:2141: checking for LoadLibrary" >&5 +if eval "test \"`echo '$''{'ac_cv_func_LoadLibrary'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char LoadLibrary(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_LoadLibrary) || defined (__stub___LoadLibrary) +choke me +#else +LoadLibrary(); +#endif + +; return 0; } +EOF +if { (eval echo $progname:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_LoadLibrary=yes" +else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_LoadLibrary=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'LoadLibrary`\" = yes"; then + echo "$ac_t""yes" 1>&6 + lt_cv_dlopen="LoadLibrary" +else + echo "$ac_t""no" 1>&6 +fi + + +fi + + +fi + + +fi + + +fi + +fi + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + fi + + case "$lt_cv_dlopen" in + dlopen) +for ac_hdr in dlfcn.h; do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "$progname:2210: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +int fnord = 0; +EOF +ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo $progname:2220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi +done + + if test "x$ac_cv_header_dlfcn_h" = xyes; then + CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + fi + eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + LIBS="$lt_cv_dlopen_libs $LIBS" + + echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 +echo "$progname:2248: checking whether a program can dlopen itself" >&5 +if test "${lt_cv_dlopen_self+set}" = set; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + lt_cv_dlopen_self=cross + else + cat > conftest.c < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LTDL_GLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LTDL_GLOBAL DL_GLOBAL +# else +# define LTDL_GLOBAL 0 +# endif +#endif + +/* We may have to define LTDL_LAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LTDL_LAZY_OR_NOW +# ifdef RTLD_LAZY +# define LTDL_LAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LTDL_LAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LTDL_LAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LTDL_LAZY_OR_NOW DL_NOW +# else +# define LTDL_LAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +fnord() { int i=42;} +main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); + if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); + if(ptr1 || ptr2) exit(0); } exit(1); } + +EOF +if { (eval echo $progname:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + lt_cv_dlopen_self=yes +else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + lt_cv_dlopen_self=no +fi +rm -fr conftest* +fi + +fi + +echo "$ac_t""$lt_cv_dlopen_self" 1>&6 + + if test "$lt_cv_dlopen_self" = yes; then + LDFLAGS="$LDFLAGS $link_static_flag" + echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 +echo "$progname:2321: checking whether a statically linked program can dlopen itself" >&5 +if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + lt_cv_dlopen_self_static=cross + else + cat > conftest.c < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LTDL_GLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LTDL_GLOBAL DL_GLOBAL +# else +# define LTDL_GLOBAL 0 +# endif +#endif + +/* We may have to define LTDL_LAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LTDL_LAZY_OR_NOW +# ifdef RTLD_LAZY +# define LTDL_LAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LTDL_LAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LTDL_LAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LTDL_LAZY_OR_NOW DL_NOW +# else +# define LTDL_LAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +fnord() { int i=42;} +main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW); + if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord"); + if(ptr1 || ptr2) exit(0); } exit(1); } + +EOF +if { (eval echo $progname:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + lt_cv_dlopen_self_static=yes +else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + lt_cv_dlopen_self_static=no +fi +rm -fr conftest* +fi + +fi + +echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6 +fi + ;; + esac + + case "$lt_cv_dlopen_self" in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case "$lt_cv_dlopen_self_static" in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + # Copy echo and quote the copy, instead of the original, because it is # used later. ltecho="$echo" +if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then + ltecho="$CONFIG_SHELL \$0 --fallback-echo" +fi +LTSHELL="$SHELL" -# Now quote all the things that may contain metacharacters. -for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \ - old_LN_S AR CC LD LN_S NM reload_flag reload_cmds wl pic_flag \ - link_static_flag no_builtin_flag export_dynamic_flag_spec \ - libname_spec library_names_spec soname_spec RANLIB \ - old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ - old_postuninstall_cmds archive_cmds postinstall_cmds postuninstall_cmds \ - allow_undefined_flag no_undefined_flag \ - finish_cmds finish_eval global_symbol_pipe \ - hardcode_libdir_flag_spec hardcode_libdir_separator; do - - case "$var" in - reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | archive_cmds | \ - postinstall_cmds | postuninstall_cmds | finish_cmds) - # Double-quote double-evaled strings. - eval "$var=\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\"\`" - ;; - *) - eval "$var=\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`" +LTCONFIG_VERSION="$VERSION" + +# Only quote variables if we're using ltmain.sh. +case "$ltmain" in +*.sh) + # Now quote all the things that may contain metacharacters. + for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \ + old_LN_S old_DLLTOOL old_AS AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \ + reload_flag reload_cmds wl \ + pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ + thread_safe_flag_spec whole_archive_flag_spec libname_spec \ + library_names_spec soname_spec \ + RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ + old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \ + file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \ + finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \ + hardcode_libdir_flag_spec hardcode_libdir_separator \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do + + case "$var" in + reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + export_symbols_cmds | archive_cmds | archive_expsym_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case "$ltecho" in + *'\$0 --fallback-echo"') + ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` ;; esac -done -ofile=libtool -trap "$rm $ofile; exit 1" 1 2 15 -echo creating $ofile -$rm $ofile -cat < $ofile -#! /bin/sh + trap "$rm \"$ofile\"; exit 1" 1 2 15 + echo "creating $ofile" + $rm "$ofile" + cat < "$ofile" +#! $SHELL -# libtool - Provide generalized library-building support services. -# Generated automatically by $PROGRAM - GNU $PACKAGE $VERSION +# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh. # -# Copyright (C) 1996-1998 Free Software Foundation, Inc. +# Copyright (C) 1996-1999 Free Software Foundation, Inc. # Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify @@ -1367,16 +2483,6 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# This program was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\ -# LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\ -# $0$ltconfig_args -# -# Compiler and other test output produced by $progname, useful for -# debugging $progname, is in ./config.log if it exists. - # Sed that helps us avoid accidentally triggering echo(1) options like -n. Xsed="sed -e s/^X//" @@ -1384,103 +2490,193 @@ # if CDPATH is set. if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi -# An echo program that does not interpret backslashes. -echo="$ltecho" +### BEGIN LIBTOOL CONFIG +EOF + cfgfile="$ofile" + ;; + +*) + # Double-quote the variables that need it (for aesthetics). + for var in old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \ + old_LN_S old_DLLTOOL old_AS; do + eval "$var=\\\"\$var\\\"" + done + + # Just create a config file. + cfgfile="$ofile.cfg" + trap "$rm \"$cfgfile\"; exit 1" 1 2 15 + echo "creating $cfgfile" + $rm "$cfgfile" + cat < "$cfgfile" +# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file. +# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +EOF + ;; +esac + +cat <> "$cfgfile" +# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# +# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\ +# LD=$old_LD NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\ +# DLLTOOL="$old_DLLTOOL" AS="$old_AS" \\ +# $0$ltconfig_args +# +# Compiler and other test output produced by $progname, useful for +# debugging $progname, is in ./config.log if it exists. # The version of $progname that generated this script. -LTCONFIG_VERSION="$VERSION" +LTCONFIG_VERSION=$LTCONFIG_VERSION # Shell to use when invoking shell scripts. -SHELL=${CONFIG_SHELL-/bin/sh} +SHELL=$LTSHELL -# Whether or not to build libtool libraries. +# Whether or not to build shared libraries. build_libtool_libs=$enable_shared -# Whether or not to build old-style libraries. +# Whether or not to build static libraries. build_old_libs=$enable_static +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + # The host system. -host_alias="$host_alias" -host="$host" +host_alias=$host_alias +host=$host + +# An echo program that does not interpret backslashes. +echo=$ltecho # The archiver. -AR="$AR" +AR=$AR # The default C compiler. -CC="$CC" +CC=$CC # The linker used to build libraries. -LD="$LD" +LD=$LD # Whether we need hard or soft links. -LN_S="$LN_S" +LN_S=$LN_S # A BSD-compatible nm program. -NM="$NM" +NM=$NM + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: assembler. +AS="$AS" # The name of the directory that contains temporary libtool files. -objdir="$objdir" +objdir=$objdir # How to create reloadable object files. -reload_flag="$reload_flag" -reload_cmds="$reload_cmds" +reload_flag=$reload_flag +reload_cmds=$reload_cmds # How to pass a linker flag through the compiler. -wl="$wl" +wl=$wl + +# Object file suffix (normally "o"). +objext="$objext" + +# Old archive suffix (normally "a"). +libext="$libext" # Additional compiler flags for building library objects. -pic_flag="$pic_flag" +pic_flag=$pic_flag + +# Does compiler simultaneously support -c and -o options +compiler_c_o=$compiler_c_o + +# Can we write directly to a .lo ? +compiler_o_lo=$compiler_o_lo + +# Must we lock files when doing compilation ? +need_locks=$need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static # Compiler flag to prevent dynamic linking. -link_static_flag="$link_static_flag" +link_static_flag=$link_static_flag # Compiler flag to turn off builtin functions. -no_builtin_flag="$no_builtin_flag" +no_builtin_flag=$no_builtin_flag # Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="$export_dynamic_flag_spec" +export_dynamic_flag_spec=$export_dynamic_flag_spec + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$whole_archive_flag_spec + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$thread_safe_flag_spec # Library versioning type. version_type=$version_type # Format of library name prefix. -libname_spec="$libname_spec" +libname_spec=$libname_spec # List of archive names. First name is the real one, the rest are links. # The last name is the one that the linker finds with -lNAME. -library_names_spec="$library_names_spec" +library_names_spec=$library_names_spec # The coded name of the library, if different from the real name. -soname_spec="$soname_spec" +soname_spec=$soname_spec # Commands used to build and install an old-style archive. -RANLIB="$RANLIB" -old_archive_cmds="$old_archive_cmds" -old_postinstall_cmds="$old_postinstall_cmds" -old_postuninstall_cmds="$old_postuninstall_cmds" +RANLIB=$RANLIB +old_archive_cmds=$old_archive_cmds +old_postinstall_cmds=$old_postinstall_cmds +old_postuninstall_cmds=$old_postuninstall_cmds # Create an old-style archive from a shared archive. -old_archive_from_new_cmds="$old_archive_from_new_cmds" +old_archive_from_new_cmds=$old_archive_from_new_cmds # Commands used to build and install a shared archive. -archive_cmds="$archive_cmds" -postinstall_cmds="$postinstall_cmds" -postuninstall_cmds="$postuninstall_cmds" +archive_cmds=$archive_cmds +archive_expsym_cmds=$archive_expsym_cmds +postinstall_cmds=$postinstall_cmds +postuninstall_cmds=$postuninstall_cmds + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$deplibs_check_method + +# Command to use when deplibs_check_method == file_magic +file_magic_cmd=$file_magic_cmd # Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="$allow_undefined_flag" +allow_undefined_flag=$allow_undefined_flag # Flag that forces no undefined symbols. -no_undefined_flag="$no_undefined_flag" +no_undefined_flag=$no_undefined_flag # Commands used to finish a libtool library installation in a directory. -finish_cmds="$finish_cmds" +finish_cmds=$finish_cmds # Same as above, but a single script fragment to be evaled but not shown. -finish_eval="$finish_eval" +finish_eval=$finish_eval # Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="$global_symbol_pipe" +global_symbol_pipe=$global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$global_symbol_to_cdecl # This is the shared library runtime path variable. runpath_var=$runpath_var @@ -1488,15 +2684,18 @@ # This is the shared library path variable. shlibpath_var=$shlibpath_var +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + # How to hardcode a shared library path into an executable. hardcode_action=$hardcode_action # Flag to hardcode \$libdir into a binary during linking. # This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec="$hardcode_libdir_flag_spec" +hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec # Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="$hardcode_libdir_separator" +hardcode_libdir_separator=$hardcode_libdir_separator # Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the # resulting binary. @@ -1510,11 +2709,37 @@ # the resulting binary. hardcode_shlibpath_var=$hardcode_shlibpath_var +# Compile-time system search path for libraries +sys_lib_search_path_spec=$sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$fix_srcfile_path" + +# Set to yes if exported symbols are required +always_export_symbols=$always_export_symbols + +# The command to extract exported symbols +export_symbols_cmds=$export_symbols_cmds + +# Symbols that should not be listed in the preloaded symbols +exclude_expsyms=$exclude_expsyms + +# Symbols that must always be exported +include_expsyms=$include_expsyms + EOF -case "$host_os" in -aix3*) - cat <<\EOF >> $ofile +case "$ltmain" in +*.sh) + echo '### END LIBTOOL CONFIG' >> "$ofile" + echo >> "$ofile" + case "$host_os" in + aix3*) + cat <<\EOF >> "$ofile" + # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. @@ -1522,15 +2747,73 @@ COLLECT_NAMES= export COLLECT_NAMES fi - EOF + ;; + esac + + # Append the ltmain.sh script. + cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1) + + chmod +x "$ofile" + ;; + +*) + # Compile the libtool program. + echo "FIXME: would compile $ltmain" ;; esac -# Append the ltmain.sh script. -cat "$ltmain" >> $ofile || (rm -f $ofile; exit 1) +test -n "$cache_file" || exit 0 + +# AC_CACHE_SAVE +trap '' 1 2 15 +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : +else + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +rm -f confcache -chmod +x $ofile exit 0 # Local Variables: diff -ruN gimp-1.0.2/ltmain.sh gimp-1.0.3/ltmain.sh --- gimp-1.0.2/ltmain.sh Thu Apr 30 14:33:24 1998 +++ gimp-1.0.3/ltmain.sh Sun Mar 28 14:42:31 1999 @@ -1,7 +1,7 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun ltconfig. # -# Copyright (C) 1996-1998 Free Software Foundation, Inc. +# Copyright (C) 1996-1999 Free Software Foundation, Inc. # Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify @@ -23,6 +23,25 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# Check that we have a working $echo. +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null`" = 'X\t'; then + # Yippee, $echo works! + : +else + # Restart under the correct shell, and then maybe $echo will work. + exec $SHELL "$0" --no-reexec ${1+"$@"} +fi + # The name of this program. progname=`$echo "$0" | sed 's%^.*/%%'` modename="$progname" @@ -30,7 +49,8 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.2 +VERSION=1.2f +TIMESTAMP=" (1.385 1999/03/15 17:24:54)" default_mode= help="Try \`$progname --help' for more information." @@ -41,15 +61,22 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' +SP2NL='tr \040 \012' +NL2SP='tr \012 \040' # NLS nuisances. # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LANG+set}" = set; then LANG=C; export LANG; fi +# We save the old values to restore during execute mode. +if test "${LC_ALL+set}" = set; then + save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL +fi +if test "${LANG+set}" = set; then + save_LANG="$LANG"; LANG=C; export LANG +fi if test "$LTCONFIG_VERSION" != "$VERSION"; then echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2 @@ -72,6 +99,7 @@ show="$echo" show_help= execute_dlfiles= +lo2o="s/\\.lo\$/.${objext}/" # Parse our command line options once, thoroughly. while test $# -gt 0 @@ -107,10 +135,20 @@ ;; --version) - echo "$PROGRAM (GNU $PACKAGE) $VERSION" + echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" + exit 0 + ;; + + --config) + sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0 exit 0 ;; + --debug) + echo "$progname: enabling shell trace mode" + set -x + ;; + --dry-run | -n) run=: ;; @@ -172,15 +210,15 @@ mode=link for arg do - case "$arg" in - -c) - mode=compile - break - ;; - esac + case "$arg" in + -c) + mode=compile + break + ;; + esac done ;; - *db | *dbx) + *db | *dbx | *strace | *truss) mode=execute ;; *install*|cp|mv) @@ -195,11 +233,11 @@ # Just use the default operation mode. if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi + if test -n "$nonopt"; then + $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 + else + $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 + fi fi ;; esac @@ -227,23 +265,39 @@ srcfile="$nonopt" suppress_output= + user_target=no for arg do # Accept any command-line options. case "$arg" in -o) - $echo "$modename: you cannot specify the output filename with \`-o'" 1>&2 - $echo "$help" 1>&2 - exit 1 + if test "$user_target" != "no"; then + $echo "$modename: you cannot specify \`-o' more than once" 1>&2 + exit 1 + fi + user_target=next ;; -static) - build_libtool_libs=no build_old_libs=yes continue ;; esac + case "$user_target" in + next) + # The next one is the -o target name + user_target=yes + continue + ;; + yes) + # We got the output file + user_target=set + libobj="$arg" + continue + ;; + esac + # Accept the current argument as the source file. lastarg="$srcfile" srcfile="$arg" @@ -272,11 +326,22 @@ fi done - # Get the name of the library object. - libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` + case "$user_target" in + set) + ;; + no) + # Get the name of the library object. + libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` + ;; + *) + $echo "$modename: you must specify a target with \`-o'" 1>&2 + exit 1 + ;; + esac # Recognize several different file suffixes. - xform='[cCFSfms]' + # If the user specifies -o file.o, it is replaced with file.lo + xform='[cCFSfmso]' case "$libobj" in *.ada) xform=ada ;; *.adb) xform=adb ;; @@ -293,9 +358,9 @@ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` case "$libobj" in - *.lo) obj=`$echo "X$libobj" | $Xsed -e 's/\.lo$/.o/'` ;; + *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; *) - $echo "$modename: cannot determine name of library object from \`$srcfile'" 1>&2 + $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 exit 1 ;; esac @@ -308,11 +373,54 @@ # Delete any leftover library objects. if test "$build_old_libs" = yes; then - $run $rm $obj $libobj - trap "$run $rm $obj $libobj; exit 1" 1 2 15 + removelist="$obj $libobj" else - $run $rm $libobj - trap "$run $rm $libobj; exit 1" 1 2 15 + removelist="$libobj" + fi + + $run $rm $removelist + trap "$run $rm $removelist; exit 1" 1 2 15 + + # Calculate the filename of the output object if compiler does + # not support -o with -c + if test "$compiler_c_o" = no; then + output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext} + lockfile="$output_obj.lock" + removelist="$removelist $output_obj $lockfile" + trap "$run $rm $removelist; exit 1" 1 2 15 + else + need_locks=no + lockfile= + fi + + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test "$need_locks" = yes; then + until ln "$0" "$lockfile" 2>/dev/null; do + $show "Waiting for $lockfile to be removed" + sleep 2 + done + elif test "$need_locks" = warn; then + if test -f "$lockfile"; then + echo "\ +*** ERROR, $lockfile exists and contains: +`cat $lockfile 2>/dev/null` + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $run $rm $removelist + exit 1 + fi + echo $srcfile > "$lockfile" + fi + + if test -n "$fix_srcfile_path"; then + eval srcfile=\"$fix_srcfile_path\" fi # Only build a PIC object if we are building libtool libraries. @@ -321,23 +429,101 @@ fbsd_hideous_sh_bug=$base_compile # All platforms use -DPIC, to notify preprocessed assembler code. - $show "$base_compile$pic_flag -DPIC $srcfile" - if $run eval "$base_compile\$pic_flag -DPIC \$srcfile"; then : + command="$base_compile $pic_flag -DPIC $srcfile" + if test "$build_old_libs" = yes; then + lo_libobj="$libobj" + dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` + if test "X$dir" = "X$libobj"; then + dir="$objdir" + else + dir="$dir/$objdir" + fi + libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` + + if test -d "$dir"; then + $show "$rm $libobj" + $run $rm $libobj + else + $show "$mkdir $dir" + $run $mkdir $dir + status=$? + if test $status -ne 0 && test ! -d $dir; then + exit $status + fi + fi + fi + if test "$compiler_o_lo" = yes; then + output_obj="$libobj" + command="$command -o $output_obj" + elif test "$compiler_c_o" = yes; then + output_obj="$obj" + command="$command -o $output_obj" + fi + + $show "$command" + if $run eval "$command"; then : else - test -n "$obj" && $run $rm $obj - exit 1 + test -n "$output_obj" && $run $rm $removelist + exit 1 fi - # If we have no pic_flag, then copy the object into place and finish. - if test -z "$pic_flag"; then - $show "$LN_S $obj $libobj" - $run $LN_S $obj $libobj - exit $? + if test "$need_locks" = warn && + test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then + echo "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $run $rm $removelist + exit 1 fi - # Just move the object, then go on to compile the next one - $show "$mv $obj $libobj" - $run $mv $obj $libobj || exit 1 + # Just move the object if needed, then go on to compile the next one + if test x"$output_obj" != x"$libobj"; then + $show "$mv $output_obj $libobj" + if $run $mv $output_obj $libobj; then : + else + error=$? + $run $rm $removelist + exit $error + fi + fi + + # If we have no pic_flag, then copy the object into place and finish. + if test -z "$pic_flag" && test "$build_old_libs" = yes; then + # Rename the .lo from within objdir to obj + if test -f $obj; then + $show $rm $obj + $run $rm $obj + fi + + $show "$mv $libobj $obj" + if $run $mv $libobj $obj; then : + else + error=$? + $run $rm $removelist + exit $error + fi + + # Now arrange that obj and lo_libobj become the same file + $show "$LN_S $obj $lo_libobj" + if $run $LN_S $obj $lo_libobj; then + exit 0 + else + error=$? + $run $rm $removelist + exit $error + fi + fi # Allow error messages only from the first compilation. suppress_output=' >/dev/null 2>&1' @@ -345,20 +531,72 @@ # Only build a position-dependent object if we build old libraries. if test "$build_old_libs" = yes; then + command="$base_compile $srcfile" + if test "$compiler_c_o" = yes; then + command="$command -o $obj" + output_obj="$obj" + fi + # Suppress compiler output if we already did a PIC compilation. - $show "$base_compile $srcfile$suppress_output" - if $run eval "$base_compile \$srcfile$suppress_output"; then : + command="$command$suppress_output" + $show "$command" + if $run eval "$command"; then : else - $run $rm $obj $libobj - exit 1 + $run $rm $removelist + exit 1 + fi + + if test "$need_locks" = warn && + test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then + echo "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support \`-c' and \`-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $run $rm $removelist + exit 1 + fi + + # Just move the object if needed + if test x"$output_obj" != x"$obj"; then + $show "$mv $output_obj $obj" + if $run $mv $output_obj $obj; then : + else + error=$? + $run $rm $removelist + exit $error + fi + fi + + # Create an invalid libtool object if no PIC, so that we do not + # accidentally link it into a program. + if test "$build_libtool_libs" != yes; then + $show "echo timestamp > $libobj" + $run eval "echo timestamp > \$libobj" || exit $? + else + # Move the .lo from within objdir + $show "$mv $libobj $lo_libobj" + if $run $mv $libobj $lo_libobj; then : + else + error=$? + $run $rm $removelist + exit $error + fi fi fi - # Create an invalid libtool object if no PIC, so that we do not - # accidentally link it into a program. - if test "$build_libtool_libs" != yes; then - $show "echo timestamp > $libobj" - $run eval "echo timestamp > \$libobj" || exit $? + # Unlock the critical section if it was locked + if test "$need_locks" != no; then + $rm "$lockfile" fi exit 0 @@ -367,28 +605,225 @@ # libtool link mode link) modename="$modename: link" + C_compiler="$CC" # save it, to compile generated C sources CC="$nonopt" - allow_undefined=yes + case "$host" in + *-*-cygwin* | *-*-mingw* | *-*-os2*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # which system we are compiling for in order to pass an extra + # flag for every libtool invokation. + # allow_undefined=no + + # FIXME: Unfortunately, there are problems with the above when trying + # to make a dll which has undefined symbols, in which case not + # even a static library is built. For now, we need to specify + # -no-undefined on the libtool link line when we can be certain + # that all symbols are satisfied, otherwise we get a static library. + allow_undefined=yes + + # This is a source program that is used to create dlls on Windows + # Don't remove nor modify the starting and closing comments +# /* ltdll.c starts here */ +# #define WIN32_LEAN_AND_MEAN +# #include +# #undef WIN32_LEAN_AND_MEAN +# #include +# +# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); +# +# #include +# DECLARE_CYGWIN_DLL( DllMain ); +# HINSTANCE __hDllInstance_base; +# +# BOOL APIENTRY +# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +# { +# __hDllInstance_base = hInst; +# return TRUE; +# } +# /* ltdll.c ends here */ + # This is a source program that is used to create import libraries + # on Windows for dlls which lack them. Don't remove nor modify the + # starting and closing comments +# /* impgen.c starts here */ +# /* Copyright (C) 1999 Free Software Foundation, Inc. +# +# This file is part of GNU libtool. +# +# 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. +# */ +# +# #include /* for printf() */ +# #include /* for open(), lseek(), read() */ +# #include /* for O_RDONLY, O_BINARY */ +# #include /* for strdup() */ +# +# static unsigned int +# pe_get16 (fd, offset) +# int fd; +# int offset; +# { +# unsigned char b[2]; +# lseek (fd, offset, SEEK_SET); +# read (fd, b, 2); +# return b[0] + (b[1]<<8); +# } +# +# static unsigned int +# pe_get32 (fd, offset) +# int fd; +# int offset; +# { +# unsigned char b[4]; +# lseek (fd, offset, SEEK_SET); +# read (fd, b, 4); +# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); +# } +# +# static unsigned int +# pe_as32 (ptr) +# void *ptr; +# { +# unsigned char *b = ptr; +# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24); +# } +# +# int +# main (argc, argv) +# int argc; +# char *argv[]; +# { +# int dll; +# unsigned long pe_header_offset, opthdr_ofs, num_entries, i; +# unsigned long export_rva, export_size, nsections, secptr, expptr; +# unsigned long name_rvas, nexp; +# unsigned char *expdata, *erva; +# char *filename, *dll_name; +# +# filename = argv[1]; +# +# dll = open(filename, O_RDONLY|O_BINARY); +# if (!dll) +# return 1; +# +# dll_name = filename; +# +# for (i=0; filename[i]; i++) +# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':') +# dll_name = filename + i +1; +# +# pe_header_offset = pe_get32 (dll, 0x3c); +# opthdr_ofs = pe_header_offset + 4 + 20; +# num_entries = pe_get32 (dll, opthdr_ofs + 92); +# +# if (num_entries < 1) /* no exports */ +# return 1; +# +# export_rva = pe_get32 (dll, opthdr_ofs + 96); +# export_size = pe_get32 (dll, opthdr_ofs + 100); +# nsections = pe_get16 (dll, pe_header_offset + 4 +2); +# secptr = (pe_header_offset + 4 + 20 + +# pe_get16 (dll, pe_header_offset + 4 + 16)); +# +# expptr = 0; +# for (i = 0; i < nsections; i++) +# { +# char sname[8]; +# unsigned long secptr1 = secptr + 40 * i; +# unsigned long vaddr = pe_get32 (dll, secptr1 + 12); +# unsigned long vsize = pe_get32 (dll, secptr1 + 16); +# unsigned long fptr = pe_get32 (dll, secptr1 + 20); +# lseek(dll, secptr1, SEEK_SET); +# read(dll, sname, 8); +# if (vaddr <= export_rva && vaddr+vsize > export_rva) +# { +# expptr = fptr + (export_rva - vaddr); +# if (export_rva + export_size > vaddr + vsize) +# export_size = vsize - (export_rva - vaddr); +# break; +# } +# } +# +# expdata = (unsigned char*)malloc(export_size); +# lseek (dll, expptr, SEEK_SET); +# read (dll, expdata, export_size); +# erva = expdata - export_rva; +# +# nexp = pe_as32 (expdata+24); +# name_rvas = pe_as32 (expdata+32); +# +# printf ("EXPORTS\n"); +# for (i = 0; i&2 - fi - build_libtool_libs=no + fi + build_libtool_libs=no build_old_libs=yes - break - ;; + break + ;; esac done @@ -410,44 +845,80 @@ test -n "$old_archive_from_new_cmds" && build_old_libs=yes # Go through the arguments, transforming them on the way. - for arg - do + while test $# -gt 0; do + arg="$1" + shift + # If the previous option needs an argument, assign it. if test -n "$prev"; then - case "$prev" in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac - - case "$prev" in - dlfiles|dlprefiles) - case "$arg" in - *.la | *.lo) ;; # We handle these cases below. - *) - dlprefiles="$dlprefiles $arg" - test "$prev" = dlfiles && dlfiles="$dlfiles $arg" - prev= - ;; - esac - ;; + case "$prev" in + output) + compile_command="$compile_command @OUTPUT@" + finalize_command="$finalize_command @OUTPUT@" + ;; + esac + + case "$prev" in + dlfiles|dlprefiles) + if test "$preload" = no; then + # Add the symbol object into the linking commands. + compile_command="$compile_command @SYMFILE@" + finalize_command="$finalize_command @SYMFILE@" + preload=yes + fi + case "$arg" in + *.la | *.lo) ;; # We handle these cases below. + self) + if test "$prev" = dlprefiles; then + dlself=yes + elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + dlself=yes + fi + prev= + continue + ;; + *) + dlprefiles="$dlprefiles $arg" + test "$prev" = dlfiles && dlfiles="$dlfiles $arg" + prev= + ;; + esac + ;; + expsyms) + export_symbols="$arg" + if test ! -f "$arg"; then + $echo "$modename: symbol file \`$arg' does not exist" + exit 1 + fi + prev= + continue + ;; + expsyms_regex) + export_symbols_regex="$arg" + prev= + continue + ;; release) release="-$arg" prev= continue ;; - rpath) - rpath="$rpath $arg" + rpath) + rpath="$rpath $arg" prev= continue ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac + xrpath) + xrpath="$xrpath $arg" + prev= + continue + ;; + *) + eval "$prev=\"\$arg\"" + prev= + continue + ;; + esac fi prevarg="$arg" @@ -455,10 +926,11 @@ case "$arg" in -all-static) if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" + compile_command="$compile_command $link_static_flag" finalize_command="$finalize_command $link_static_flag" - fi - continue + dlopen_self=$dlopen_self_static + fi + continue ;; -allow-undefined) @@ -467,47 +939,91 @@ continue ;; + -avoid-version) + avoid_version=yes + continue + ;; + -dlopen) - prev=dlfiles - continue - ;; + prev=dlfiles + continue + ;; -dlpreopen) - prev=dlprefiles - continue - ;; + prev=dlprefiles + continue + ;; -export-dynamic) - if test "$export_dynamic" != yes; then - export_dynamic=yes + if test "$export_dynamic" != yes; then + export_dynamic=yes if test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" else arg= fi + fi + ;; - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - fi - ;; + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + $echo "$modename: cannot have more than one -exported-symbols" + exit 1 + fi + if test "$arg" = "-export-symbols"; then + prev=expsyms + else + prev=expsyms_regex + fi + continue + ;; -L*) - dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'` - case "$dir" in - /* | [A-Za-z]:\\*) + dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'` + case "$dir" in + /* | [A-Za-z]:[/\\]*) # Add the corresponding hardcode_libdir_flag, if it is not identical. - ;; - *) - $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2 - exit 1 - ;; - esac - deplibs="$deplibs $arg" - ;; + ;; + *) + $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2 + exit 1 + ;; + esac + case " $deplibs " in + *" $arg "*) ;; + *) deplibs="$deplibs $arg";; + esac + case " $lib_search_path " in + *" $dir "*) ;; + *) lib_search_path="$lib_search_path $dir";; + esac + case "$host" in + *-*-cygwin* | *-*-mingw* | *-*-os2*) + dllsearchdir=`cd "$dir" && pwd || echo "$dir"` + case ":$dllsearchpath:" in + ::) dllsearchpath="$dllsearchdir";; + *":$dllsearchdir:"*) ;; + *) dllsearchpath="$dllsearchpath:$dllsearchdir";; + esac + ;; + esac + ;; - -l*) deplibs="$deplibs $arg" ;; + -l*) + deplibs="$deplibs $arg" + ;; + -module) + if test "$module" != yes; then + module=yes + if test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + else + arg= + fi + fi + ;; + -no-undefined) allow_undefined=no continue @@ -521,23 +1037,39 @@ ;; -rpath) - prev=rpath - continue - ;; + prev=rpath + continue + ;; + + -R) + prev=xrpath + continue + ;; + + -R*) + xrpath="$xrpath "`$echo "X$arg" | $Xsed -e 's/^-R//'` + continue + ;; -static) # If we have no pic_flag, then this is the same as -all-static. if test -z "$pic_flag" && test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" + compile_command="$compile_command $link_static_flag" finalize_command="$finalize_command $link_static_flag" - fi + dlopen_self=$dlopen_self_static + fi + continue + ;; + + -thread-safe) + thread_safe=yes continue ;; -version-info) - prev=vinfo - continue - ;; + prev=vinfo + continue + ;; # Some other compiler flag. -* | +*) @@ -549,18 +1081,18 @@ arg="\"$arg\"" ;; esac - ;; + ;; - *.o | *.a) - # A standard object. - objs="$objs $arg" - ;; + *.o | *.obj | *.a | *.lib) + # A standard object. + objs="$objs $arg" + ;; *.lo) - # A library object. + # A library object. if test "$prev" = dlfiles; then dlfiles="$dlfiles $arg" - if test "$build_libtool_libs" = yes; then + if test "$build_libtool_libs" = yes && test "$dlopen" = yes; then prev= continue else @@ -571,191 +1103,268 @@ if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/\.o/'` + dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"` prev= fi libobjs="$libobjs $arg" - ;; + ;; *.la) - # A libtool-controlled library. + # A libtool-controlled library. - dlname= - libdir= - library_names= - old_library= - - # Check to see that this really is a libtool archive. - if (sed -e '2q' $arg | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2 - exit 1 - fi - - # If there is no directory component, then add one. - case "$arg" in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$libdir"; then - $echo "$modename: \`$arg' contains no -rpath information" 1>&2 - exit 1 - fi - - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$arg'" 1>&2 - exit 1 - fi - - # Find the relevant object directory and library name. - name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'` - dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$arg"; then - dir="$objdir" - else - dir="$dir/$objdir" - fi - - # This library was specified with -dlopen. - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - if test -z "$dlname"; then - # If there is no dlname, we need to preload. - prev=dlprefiles - else - # We should not create a dependency on this library, but we + dlname= + libdir= + library_names= + old_library= + + # Check to see that this really is a libtool archive. + if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + else + $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2 + exit 1 + fi + + # If the library was installed with an old release of libtool, + # it will not redefine variable installed. + installed=yes + + # If there is no directory component, then add one. + case "$arg" in + */* | *\\*) . $arg ;; + *) . ./$arg ;; + esac + + # Get the name of the library we link against. + linklib= + for l in $old_library $library_names; do + linklib="$l" + done + + if test -z "$linklib"; then + $echo "$modename: cannot find name of link library for \`$arg'" 1>&2 + exit 1 + fi + + # Find the relevant object directory and library name. + name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'` + + if test "X$installed" = Xyes; then + dir="$libdir" + else + dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` + if test "X$dir" = "X$arg"; then + dir="$objdir" + else + dir="$dir/$objdir" + fi + fi + + if test -n "$dependency_libs"; then + # Extract -R from dependency_libs + temp_deplibs= + for deplib in $dependency_libs; do + case "$deplib" in + -R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-R//'` + case " $rpath $xrpath " in + *" $temp_xrpath "*) ;; + *) xrpath="$xrpath $temp_xrpath";; + esac;; + -L*) case "$compile_command $temp_deplibs " in + *" $deplib "*) ;; + *) temp_deplibs="$temp_deplibs $deplib";; + esac;; + *) temp_deplibs="$temp_deplibs $deplib";; + esac + done + dependency_libs="$temp_deplibs" + fi + + if test -z "$libdir"; then + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $dir/$old_library" + old_convenience="$old_convenience $dir/$old_library" + deplibs="$deplibs$dependency_libs" + compile_command="$compile_command $dir/$old_library$dependency_libs" + finalize_command="$finalize_command $dir/$old_library$dependency_libs" + continue + fi + + # This library was specified with -dlopen. + if test "$prev" = dlfiles; then + dlfiles="$dlfiles $arg" + if test -z "$dlname" || test "$dlopen" != yes || test "$build_libtool_libs" = no; then + # If there is no dlname, no dlopen support or we're linking statically, + # we need to preload. + prev=dlprefiles + else + # We should not create a dependency on this library, but we # may need any libraries it requires. compile_command="$compile_command$dependency_libs" finalize_command="$finalize_command$dependency_libs" - prev= - continue - fi - fi - - # The library was specified with -dlpreopen. - if test "$prev" = dlprefiles; then - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - dlprefiles="$dlprefiles $dir/$old_library" - else - dlprefiles="$dlprefiles $dir/$linklib" - fi - prev= - fi - - if test "$build_libtool_libs" = yes && test -n "$library_names"; then - link_against_libtool_libs="$link_against_libtool_libs $arg" - if test -n "$shlibpath_var"; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *) temp_rpath="$temp_rpath $dir" ;; - esac - fi + prev= + continue + fi + fi + + # The library was specified with -dlpreopen. + if test "$prev" = dlprefiles; then + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + dlprefiles="$dlprefiles $dir/$old_library" + else + dlprefiles="$dlprefiles $dir/$linklib" + fi + prev= + fi + + if test "$build_libtool_libs" = yes && test -n "$library_names"; then + link_against_libtool_libs="$link_against_libtool_libs $arg" + if test -n "$shlibpath_var"; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath " in + *" $dir "*) ;; + *) temp_rpath="$temp_rpath $dir" ;; + esac + fi + # We need an absolute path. + case "$dir" in + /* | [A-Za-z]:[/\\]*) absdir="$dir" ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + $echo "$modename: cannot determine absolute directory name of \`$libdir'" 1>&2 + exit 1 + fi + ;; + esac + # This is the magic to use -rpath. - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - # Put the magic libdir with the hardcode flag. - hardcode_libdirs="$libdir" - libdir="@HARDCODE_LIBDIRS@" - else - # Just accumulate the unique libdirs. - case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - libdir= - fi - fi - - if test -n "$libdir"; then - eval flag=\"$hardcode_libdir_flag_spec\" - - compile_command="$compile_command $flag" - finalize_command="$finalize_command $flag" - fi - elif test -n "$runpath_var"; then - # Do the same for the permanent run path. - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - - - case "$hardcode_action" in - immediate) - if test "$hardcode_direct" = no; then - compile_command="$compile_command $dir/$linklib" - elif test "$hardcode_minus_L" = no; then - compile_command="$compile_command -L$dir -l$name" - elif test "$hardcode_shlibpath_var" = no; then - compile_shlibpath="$compile_shlibpath$dir:" - compile_command="$compile_command -l$name" - fi - ;; - - relink) - # We need an absolute path. - case "$dir" in - /* | [A-Za-z]:\\*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit 1 - fi - dir="$absdir" - ;; - esac - - if test "$hardcode_direct" = yes; then - compile_command="$compile_command $dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - compile_command="$compile_command -L$dir -l$name" - elif test "$hardcode_shlibpath_var" = yes; then - compile_shlibpath="$compile_shlibpath$dir:" - compile_command="$compile_command -l$name" - fi - ;; - - *) - $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2 - exit 1 - ;; - esac - - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - finalize_command="$finalize_command $libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - finalize_command="$finalize_command -L$libdir -l$name" - elif test "$hardcode_shlibpath_var" = yes; then - finalize_shlibpath="$finalize_shlibpath$libdir:" - finalize_command="$finalize_command -l$name" - else - # We cannot seem to hardcode it, guess we'll fake it. - finalize_command="$finalize_command -L$libdir -l$name" - fi - else - # Transform directly to old archives if we don't build new libraries. - if test -n "$pic_flag" && test -z "$old_library"; then - $echo "$modename: cannot find static library for \`$arg'" 1>&2 - exit 1 - fi + # Skip directories that are in the system default run-time + # search path, unless they have been requested with -R. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) compile_rpath="$compile_rpath $absdir" + esac + ;; + esac + + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" + esac + ;; + esac + + lib_linked=yes + case "$hardcode_action" in + immediate | unsupported) + if test "$hardcode_direct" = no; then + compile_command="$compile_command $dir/$linklib" + deplibs="$deplibs $dir/$linklib" + case "$host" in + *-*-cygwin* | *-*-mingw* | *-*-os2*) + dllsearchdir=`cd "$dir" && pwd || echo "$dir"` + if test -n "$dllsearchpath"; then + dllsearchpath="$dllsearchpath:$dllsearchdir" + else + dllsearchpath="$dllsearchdir" + fi + ;; + esac + elif test "$hardcode_minus_L" = no; then + case "$host" in + *-*-sunos*) + compile_shlibpath="$compile_shlibpath$dir:" + ;; + esac + case "$compile_command " in + *" -L$dir "*) ;; + *) compile_command="$compile_command -L$dir";; + esac + compile_command="$compile_command -l$name" + deplibs="$deplibs -L$dir -l$name" + elif test "$hardcode_shlibpath_var" = no; then + case ":$compile_shlibpath:" in + *":$dir:"*) ;; + *) compile_shlibpath="$compile_shlibpath$dir:";; + esac + compile_command="$compile_command -l$name" + deplibs="$deplibs -l$name" + else + lib_linked=no + fi + ;; + + relink) + if test "$hardcode_direct" = yes; then + compile_command="$compile_command $absdir/$linklib" + deplibs="$deplibs $absdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + case "$compile_command " in + *" -L$absdir "*) ;; + *) compile_command="$compile_command -L$absdir";; + esac + compile_command="$compile_command -l$name" + deplibs="$deplibs -L$absdir -l$name" + elif test "$hardcode_shlibpath_var" = yes; then + case ":$compile_shlibpath:" in + *":$absdir:"*) ;; + *) compile_shlibpath="$compile_shlibpath$absdir:";; + esac + compile_command="$compile_command -l$name" + deplibs="$deplibs -l$name" + else + lib_linked=no + fi + ;; + + *) + lib_linked=no + ;; + esac + + if test "$lib_linked" != yes; then + $echo "$modename: configuration error: unsupported hardcode properties" + exit 1 + fi + + # Finalize command for both is simple: just hardcode it. + if test "$hardcode_direct" = yes; then + finalize_command="$finalize_command $libdir/$linklib" + elif test "$hardcode_minus_L" = yes; then + case "$finalize_command " in + *" -L$libdir "*) ;; + *) finalize_command="$finalize_command -L$libdir";; + esac + finalize_command="$finalize_command -l$name" + elif test "$hardcode_shlibpath_var" = yes; then + case ":$finalize_shlibpath:" in + *":$libdir:"*) ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:";; + esac + finalize_command="$finalize_command -l$name" + else + # We cannot seem to hardcode it, guess we'll fake it. + case "$finalize_command " in + *" -L$dir "*) ;; + *) finalize_command="$finalize_command -L$libdir";; + esac + finalize_command="$finalize_command -l$name" + fi + else + # Transform directly to old archives if we don't build new libraries. + if test -n "$pic_flag" && test -z "$old_library"; then + $echo "$modename: cannot find static library for \`$arg'" 1>&2 + exit 1 + fi # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and @@ -765,16 +1374,24 @@ compile_command="$compile_command $dir/$linklib" finalize_command="$finalize_command $dir/$linklib" else - compile_command="$compile_command -L$dir -l$name" - finalize_command="$finalize_command -L$dir -l$name" + case "$compile_command " in + *" -L$dir "*) ;; + *) compile_command="$compile_command -L$dir";; + esac + compile_command="$compile_command -l$name" + case "$finalize_command " in + *" -L$dir "*) ;; + *) finalize_command="$finalize_command -L$dir";; + esac + finalize_command="$finalize_command -l$name" fi - fi + fi # Add in any libraries that this one depends upon. compile_command="$compile_command$dependency_libs" finalize_command="$finalize_command$dependency_libs" continue - ;; + ;; # Some other compiler argument. *) @@ -786,7 +1403,7 @@ arg="\"$arg\"" ;; esac - ;; + ;; esac # Now actually substitute the argument into the commands. @@ -802,14 +1419,11 @@ exit 1 fi - if test -n "$vinfo" && test -n "$release"; then - $echo "$modename: you cannot specify both \`-version-info' and \`-release'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi + oldlibs= + # calculate the name of the file, without its directory + outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` + libobjs_save="$libobjs" - oldlib= - oldobjs= case "$output" in "") $echo "$modename: you must specify an output file" 1>&2 @@ -817,64 +1431,93 @@ exit 1 ;; - */* | *\\*) - $echo "$modename: output file \`$output' must have no directory components" 1>&2 - exit 1 - ;; + *.a | *.lib) + if test -n "$link_against_libtool_libs"; then + $echo "$modename: error: cannot link libtool libraries into archives" 1>&2 + exit 1 + fi + + if test -n "$deplibs"; then + $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 + fi + + if test -n "$dlfiles$dlprefiles"; then + $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 + fi + + if test -n "$rpath"; then + $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 + fi + + if test -n "$xrpath"; then + $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 + fi + + if test -n "$vinfo"; then + $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2 + fi + + if test -n "$release"; then + $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 + fi + + if test -n "$export_symbols"; then + $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 + fi - *.a) # Now set the variables for building old libraries. build_libtool_libs=no - build_old_libs=yes - oldlib="$output" - $show "$rm $oldlib" - $run $rm $oldlib + oldlibs="$output" ;; *.la) # Make sure we only generate libraries of the form `libNAME.la'. - case "$output" in - lib*) ;; + case "$outputname" in + lib*) + name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + eval libname=\"$libname_spec\" + ;; *) - $echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit 1 + if test "$module" = no; then + $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` + eval libname=\"$libname_spec\" + else + libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` + fi ;; esac - name=`$echo "X$output" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval libname=\"$libname_spec\" + output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` + if test "X$output_objdir" = "X$output"; then + output_objdir="$objdir" + else + output_objdir="$output_objdir/$objdir" + fi # All the library-specific variables (install_libdir is set above). library_names= old_library= dlname= - current=0 - revision=0 - age=0 if test -n "$objs"; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1 - exit 1 + $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1 + exit 1 fi # How the heck are we supposed to write a wrapper for a shared library? if test -n "$link_against_libtool_libs"; then - $echo "$modename: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2 - exit 1 + $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2 + exit 1 fi if test -n "$dlfiles$dlprefiles"; then - $echo "$modename: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2 - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test -z "$rpath"; then - $echo "$modename: you must specify an installation directory with \`-rpath'" 1>&2 - $echo "$help" 1>&2 - exit 1 + $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 fi set dummy $rpath @@ -883,233 +1526,593 @@ fi install_libdir="$2" - # Parse the version information argument. - IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' - set dummy $vinfo - IFS="$save_ifs" + oldlibs= + if test -z "$rpath"; then + if test "$build_libtool_libs" = yes; then + # Building a libtool convenience library. + libext=al + oldlibs="$output_objdir/$libname.$libext $oldlibs" + build_libtool_libs=convenience + build_old_libs=yes + fi + dependency_libs="$deplibs" - if test -n "$5"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi + if test -n "$vinfo"; then + $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2 + fi - test -n "$2" && current="$2" - test -n "$3" && revision="$3" - test -n "$4" && age="$4" - - # Check that each of the things are valid numbers. - case "$current" in - 0 | [1-9] | [1-9][0-9]*) ;; - *) - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac + if test -n "$release"; then + $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 + fi + else - case "$revision" in - 0 | [1-9] | [1-9][0-9]*) ;; - *) - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac + # Parse the version information argument. + IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 + IFS="$save_ifs" + + if test -n "$8"; then + $echo "$modename: too many parameters to \`-version-info'" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi - case "$age" in - 0 | [1-9] | [1-9][0-9]*) ;; - *) - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac + current="$2" + revision="$3" + age="$4" + + # Check that each of the things are valid numbers. + case "$current" in + 0 | [1-9] | [1-9][0-9]*) ;; + *) + $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + ;; + esac + + case "$revision" in + 0 | [1-9] | [1-9][0-9]*) ;; + *) + $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + ;; + esac - if test $age -gt $current; then - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - fi - - # Calculate the version variables. - version_vars="version_type current age revision" - case "$version_type" in - none) ;; - - linux) - version_vars="$version_vars major versuffix" - major=`expr $current - $age` - versuffix="$major.$age.$revision" - ;; - - osf) - version_vars="$version_vars versuffix verstring" - major=`expr $current - $age` - versuffix="$current.$age.$revision" - verstring="$versuffix" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test $loop != 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - - sunos) - version_vars="$version_vars major versuffix" - major="$current" - versuffix="$current.$revision" - ;; + case "$age" in + 0 | [1-9] | [1-9][0-9]*) ;; + *) + $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + ;; + esac - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 - ;; - esac + if test $age -gt $current; then + $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 + $echo "$modename: \`$vinfo' is not valid version information" 1>&2 + exit 1 + fi + + # Calculate the version variables. + major= + versuffix= + verstring= + case "$version_type" in + none) ;; + + irix) + major=`expr $current - $age + 1` + versuffix="$major.$revision" + verstring="sgi$major.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$revision + while test $loop != 0; do + iface=`expr $revision - $loop` + loop=`expr $loop - 1` + verstring="sgi$major.$iface:$verstring" + done + ;; + + linux) + major=.`expr $current - $age` + versuffix="$major.$age.$revision" + ;; + + osf) + major=`expr $current - $age` + versuffix=".$current.$age.$revision" + verstring="$current.$age.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$age + while test $loop != 0; do + iface=`expr $current - $loop` + loop=`expr $loop - 1` + verstring="$verstring:${iface}.0" + done + + # Make executables depend on our current version. + verstring="$verstring:${current}.0" + ;; + + sunos) + major=".$current" + versuffix=".$current.$revision" + ;; + + freebsd-aout) + major=".$current" + versuffix=".$current.$revision"; + ;; + + freebsd-elf) + major=".$current" + versuffix=".$current"; + ;; + + windows) + # Like Linux, but with '-' rather than '.', since we only + # want one extension on Windows 95. + major=`expr $current - $age` + versuffix="-$major-$age-$revision" + ;; + + *) + $echo "$modename: unknown library version type \`$version_type'" 1>&2 + echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 + exit 1 + ;; + esac + + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= + verstring="0.0" + if test "$need_version" = no; then + versuffix= + else + versuffix=".0.0" + fi + fi + + # Remove version info from name if versioning should be avoided + if test "$avoid_version" = yes && test "$need_version" = no; then + major= + versuffix= + verstring="" + fi + + # Check to see if the archive will have undefined symbols. + if test "$allow_undefined" = yes; then + if test "$allow_undefined_flag" = unsupported; then + $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 + build_libtool_libs=no + build_old_libs=yes + fi + else + # Don't allow undefined symbols. + allow_undefined_flag="$no_undefined_flag" + fi + + dependency_libs="$deplibs" + case "$host" in + *-*-cygwin* | *-*-mingw* | *-*-os2*) + # these systems don't actually have a c library (as such)! + ;; + *) + # Add libc to deplibs on all other systems. + deplibs="$deplibs -lc" + ;; + esac + fi # Create the output directory, or remove our outputs if we need to. - if test -d $objdir; then - $show "$rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*" - $run $rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.* + if test -d $output_objdir; then + $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" + $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.* else - $show "$mkdir $objdir" - $run $mkdir $objdir + $show "$mkdir $output_objdir" + $run $mkdir $output_objdir status=$? - if test $status -eq 0 || test -d $objdir; then : - else + if test $status -ne 0 && test ! -d $output_objdir; then exit $status fi fi - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + oldlibs="$oldlibs $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` fi - # Add libc to deplibs on all systems. - dependency_libs="$deplibs" - deplibs="$deplibs -lc" + if test "$build_libtool_libs" = yes; then + # Transform deplibs into only deplibs that can be linked in shared. + name_save=$name + libname_save=$libname + release_save=$release + versuffix_save=$versuffix + major_save=$major + # I'm not sure if I'm treating the release correctly. I think + # release should show up in the -l (ie -lgmp5) so we don't want to + # add it in twice. Is that correct? + release="" + versuffix="" + major="" + newdeplibs= + droppeddeps=no + case "$deplibs_check_method" in + pass_all) + newdeplibs=$deplibs + ;; # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behaviour. + test_compile) + # This code stresses the "libraries are programs" paradigm to its + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. + $rm conftest.c + cat > conftest.c </dev/null` + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potlib" 2>/dev/null \ + | grep " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an + # endless loop below, in case of cyclic links. + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? + potlib="$potent_lib" + while test -h "$potlib" 2>/dev/null; do + potliblink=`ls -ld $potlib | sed 's/.* -> //'` + case "$potliblink" in + /*) potlib="$potliblink";; + *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + esac + done + if eval $file_magic_cmd \"\$potlib\" \ + | sed 10q \ + | egrep "$file_magic_regex" > /dev/null; then + newdeplibs="$newdeplibs $a_deplib" + a_deplib="" + break 2 + fi + done + done + if test -n "$a_deplib" ; then + droppeddeps=yes + echo + echo "*** Warning: This library needs some functionality provided by $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." + fi + else + # Add a -L argument. + newdeplibs="$newdeplibs $a_deplib" + fi + done # Gone through all deplibs. + ;; + none | unknown | *) newdeplibs="" + if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ + -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' | + grep . >/dev/null; then + echo + if test "X$deplibs_check_method" = "Xnone"; then + echo "*** Warning: inter-library dependencies are not supported in this platform." + else + echo "*** Warning: inter-library dependencies are not known to be supported." + fi + echo "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + fi + ;; + esac + versuffix=$versuffix_save + major=$major_save + release=$release_save + libname=$libname_save + name=$name_save + + if test "$droppeddeps" = yes; then + if test "$module" = yes; then + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" + echo "*** dependencies of module $libname. Therefore, libtool will create" + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + dlname= + library_names= + else + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." + fi + fi + fi + # test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then - # Get the real and link names of the library. - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi + deplibs=$newdeplibs + # Done checking deplibs! + + # Get the real and link names of the library. + eval library_names=\"$library_names_spec\" + set dummy $library_names + realname="$2" + shift; shift - lib="$objdir/$realname" + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + + lib="$output_objdir/$realname" for link do linknames="$linknames $link" done - # Use standard objects if they are PIC. - test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'` + # Ensure that we have .o objects for linkers which dislike .lo + # (e.g. aix) incase we are running --disable-static + for obj in $libobjs; do + oldobj=`$echo "X$obj" | $Xsed -e "$lo2o"` + test -f $oldobj || ${LN_S} $obj $oldobj + done - # Do each of the archive commands. - eval cmds=\"$archive_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Create links to the real library. - for linkname in $linknames; do - $show "(cd $objdir && $LN_S $realname $linkname)" - $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $? - done - - # If -export-dynamic was specified, set the dlname. - if test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi + # Use standard objects if they are pic + test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - # Now set the variables for building old libraries. - oldlib="$objdir/$libname.a" + if test -n "$whole_archive_flag_spec"; then + if test -n "$convenience"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + fi + else + for xlib in $convenience; do + # Extract the objects. + xdir="$xlib"x + generated="$generated $xdir" + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "mkdir $xdir" + $run mkdir "$xdir" + status=$? + if test $status -ne 0 && test ! -d "$xdir"; then + exit $status + fi + $show "(cd $xdir && $AR x ../$xlib)" + $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $? + + libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + done + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + + linkopts="$linkopts $flag" + fi + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then + $show "generating symbol list for \`$libname.la'" + export_symbols="$objdir/$libname.exp" + $run $rm $export_symbols + eval cmds=\"$export_symbols_cmds\" + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + if test -n "$export_symbols_regex"; then + $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" + $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + $show "$mv \"${export_symbols}T\" \"$export_symbols\"" + $run eval '$mv "${export_symbols}T" "$export_symbols"' + fi + fi + fi + + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' + fi + + # Do each of the archive commands. + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval cmds=\"$archive_expsym_cmds\" + else + eval cmds=\"$archive_cmds\" + fi + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then + $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" + $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? + fi + done + + # If -module or -export-dynamic was specified, set the dlname. + if test "$module" = yes || test "$export_dynamic" = yes; then + # On all known operating systems, these are identical. + dlname="$soname" + fi + fi ;; - *.lo | *.o) + *.lo | *.o | *.obj) if test -n "$link_against_libtool_libs"; then - $echo "$modename: error: cannot link libtool libraries into reloadable objects" 1>&2 - exit 1 + $echo "$modename: error: cannot link libtool libraries into objects" 1>&2 + exit 1 fi if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2 + $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 fi if test -n "$dlfiles$dlprefiles"; then - $echo "$modename: warning: \`-dlopen' is ignored while creating objects" 1>&2 - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 fi if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored while creating objects" 1>&2 + $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 + fi + + if test -n "$xrpath"; then + $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 fi if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored while creating objects" 1>&2 + $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 fi if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2 + $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 fi case "$output" in *.lo) - if test -n "$objs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit 1 - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e 's/\.lo$/.o/'` - ;; + if test -n "$objs"; then + $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 + exit 1 + fi + libobj="$output" + obj=`$echo "X$output" | $Xsed -e "$lo2o"` + ;; *) - libobj= - obj="$output" - ;; + libobj= + obj="$output" + ;; esac # Delete the old objects. $run $rm $obj $libobj # Create the old-style object. - reload_objs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` + reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` output="$obj" eval cmds=\"$reload_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? done IFS="$save_ifs" @@ -1117,353 +2120,522 @@ test -z "$libobj" && exit 0 if test "$build_libtool_libs" != yes; then - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - $show "echo timestamp > $libobj" - $run eval "echo timestamp > $libobj" || exit $? - exit 0 + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + $show "echo timestamp > $libobj" + $run eval "echo timestamp > $libobj" || exit $? + exit 0 fi if test -n "$pic_flag"; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs" - output="$libobj" - eval cmds=\"$reload_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs" + output="$libobj" + eval cmds=\"$reload_cmds\" + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" else - # Just create a symlink. - $show "$LN_S $obj $libobj" - $run $LN_S $obj $libobj || exit 1 + # Just create a symlink. + $show $rm $libobj + $run $rm $libobj + $show "$LN_S $obj $libobj" + $run $LN_S $obj $libobj || exit $? fi exit 0 ;; + # Anything else should be a program. *) if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored while linking programs" 1>&2 + $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 fi if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2 + $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 fi - if test -n "$rpath"; then + if test "$preload" = yes; then + if test "$dlopen" = unknown && test "$dlopen_self" = unknown && + test "$dlopen_self_static" = unknown; then + $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." + fi + fi + + if test "$dlself" = yes && test "$export_dynamic" = no; then + $echo "$modename: error: \`-dlopen self' requires \`-export-dynamic'" 1>&2 + exit 1 + fi + + if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - # Put the magic libdir with the hardcode flag. - hardcode_libdirs="$libdir" - libdir="@HARDCODE_LIBDIRS@" - else - # Just accumulate the unique libdirs. - case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - libdir= - fi - fi - - if test -n "$libdir"; then - eval flag=\"$hardcode_libdir_flag_spec\" - - compile_command="$compile_command $flag" - finalize_command="$finalize_command $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi + for libdir in $rpath $xrpath; do + # This is the magic to use -rpath. + case "$compile_rpath " in + *" $libdir "*) ;; + *) compile_rpath="$compile_rpath $libdir" ;; + esac + case "$finalize_rpath " in + *" $libdir "*) ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; + esac done fi - # Substitute the hardcoded libdirs into the compile commands. - if test -n "$hardcode_libdir_separator"; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"` - fi + # Now hardcode the library paths + rpath= + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$echo "X$compile_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` - finalize_command=`$echo "X$finalize_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` - fi + rpath="$rpath $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) perm_rpath="$perm_rpath $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" + + rpath= + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" - if test "$export_dynamic" = yes && test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${output}S.c" + rpath="$rpath $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; + *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" + + output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` + if test "X$output_objdir" = "X$output"; then + output_objdir="$objdir" else - dlsyms= + output_objdir="$output_objdir/$objdir" fi - if test -n "$dlsyms"; then - # Add our own program objects to the preloaded list. - dlprefiles=`$echo "X$objs$dlprefiles " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'` - - # Discover the nlist of each of the dlfiles. - nlist="$objdir/${output}.nm" + if test -n "$libobjs" && test "$build_old_libs" = yes; then + # Transform all the library objects into standard objects. + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + fi - if test -d $objdir; then - $show "$rm $nlist ${nlist}T" - $run $rm "$nlist" "${nlist}T" + dlsyms= + if test -n "$dlfiles$dlprefiles" || test "$dlself" = yes; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then + dlsyms="${outputname}S.c" else - $show "$mkdir $objdir" - $run $mkdir $objdir - status=$? - if test $status -eq 0 || test -d $objdir; then : - else - exit $status - fi + $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 fi + fi - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - # Parse the name list into a source file. - $show "creating $objdir/$dlsyms" - if test -z "$run"; then - # Make sure we at least have an empty file. - test -f "$nlist" || : > "$nlist" - - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - wcout=`wc "$nlist" 2>/dev/null` - count=`echo "X$wcout" | $Xsed -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'` - (test "$count" -ge 0) 2>/dev/null || count=-1 + if test -n "$dlsyms"; then + case "$dlsyms" in + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. + nlist="$objdir/${output}.nm" + + if test -d $objdir; then + $show "$rm $nlist ${nlist}S ${nlist}T" + $run $rm "$nlist" "${nlist}S" "${nlist}T" else - $rm "$nlist"T - count=-1 + $show "$mkdir $objdir" + $run $mkdir $objdir + status=$? + if test $status -ne 0 && test ! -d $objdir; then + exit $status + fi fi - case "$dlsyms" in - "") ;; - *.c) - $echo > "$objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$output' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION */ + # Parse the name list into a source file. + $show "creating $objdir/$dlsyms" + + $echo > "$objdir/$dlsyms" "\ +/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ +/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ #ifdef __cplusplus extern \"C\" { #endif /* Prevent the only kind of declaration conflicts we can make. */ -#define dld_preloaded_symbol_count some_other_symbol -#define dld_preloaded_symbols some_other_symbol +#define lt_preloaded_symbols some_other_symbol /* External symbol declarations for the compiler. */\ " - if test -f "$nlist"; then - sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$objdir/$dlsyms" + if test "$dlself" = yes; then + $show "generating symbol list for \`$output'" + + echo ': @PROGRAM@ ' > "$nlist" + + # Add our own program objects to the symbol list. + progfiles=`$echo "X$objs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + for arg in $progfiles; do + $show "extracting global C symbols from \`$arg'" + $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + $run eval '$mv "$nlist"T "$nlist"' + fi + + if test -n "$export_symbols_regex"; then + $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T' + $run eval '$mv "$nlist"T "$nlist"' + fi + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + export_symbols="$objdir/$output.exp" + $run $rm $export_symbols + $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + else + $run $rm $export_symbols + $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$objdir/$output.exp"' + $run eval 'grep -f "$objdir/$output.exp" < "$nlist" > "$nlist"T' + $run eval 'mv "$nlist"T "$nlist"' + fi + fi + + for arg in $dlprefiles; do + $show "extracting global C symbols from \`$arg'" + name=`echo "$arg" | sed -e 's%^.*/%%'` + $run eval 'echo ": $name " >> "$nlist"' + $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" + done + + if test -z "$run"; then + # Make sure we have at least an empty file. + test -f "$nlist" || : > "$nlist" + + if test -n "$exclude_expsyms"; then + egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $mv "$nlist"T "$nlist" + fi + + # Try sorting and uniquifying the output. + if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then + : + else + grep -v "^: " < "$nlist" > "$nlist"S + fi + + if test -f "$nlist"S; then + eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' else - echo '/* NONE */' >> "$objdir/$dlsyms" + echo '/* NONE */' >> "$output_objdir/$dlsyms" fi - $echo >> "$objdir/$dlsyms" "\ + $echo >> "$output_objdir/$dlsyms" "\ -#undef dld_preloaded_symbol_count -#undef dld_preloaded_symbols +#undef lt_preloaded_symbols #if defined (__STDC__) && __STDC__ -# define __ptr_t void * +# define lt_ptr_t void * #else -# define __ptr_t char * +# define lt_ptr_t char * +# define const #endif -/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */ -int dld_preloaded_symbol_count = $count; - /* The mapping between symbol names and symbols. */ -struct { - char *name; - __ptr_t address; +const struct { + const char *name; + lt_ptr_t address; } -dld_preloaded_symbols[] = +lt_preloaded_symbols[] = {\ " - if test -f "$nlist"; then - sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$objdir/$dlsyms" - fi + sed -n -e 's/^: \([^ ]*\) $/ {\"\1\", (lt_ptr_t) 0},/p' \ + -e 's/^. \([^ ]*\) \([^ ]*\)$/ {"\2", (lt_ptr_t) \&\2},/p' \ + < "$nlist" >> "$output_objdir/$dlsyms" - $echo >> "$objdir/$dlsyms" "\ - {0, (__ptr_t) 0} + $echo >> "$output_objdir/$dlsyms" "\ + {0, (lt_ptr_t) 0} }; +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt_preloaded_symbols; +} +#endif + #ifdef __cplusplus } #endif\ " - ;; + fi - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit 1 - ;; + pic_flag_for_symtable= + case "$host" in + # compiling the symbol table file with pic_flag works around + # a FreeBSD bug that causes programs to crash when -lm is + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. + *-*-freebsd2*|*-*-freebsd3.0*) + case "$compile_command " in + *" -static "*) ;; + *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; + esac esac - fi - # Now compile the dynamic symbol file. - $show "(cd $objdir && $CC -c$no_builtin_flag \"$dlsyms\")" - $run eval '(cd $objdir && $CC -c$no_builtin_flag "$dlsyms")' || exit $? - - # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"` - elif test "$export_dynamic" != yes; then - test -n "$dlfiles$dlprefiles" && $echo "$modename: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2 + # Now compile the dynamic symbol file. + $show "(cd $objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + + # Transform the symbol file into the correct name. + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"` + ;; + *) + $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 + exit 1 + ;; + esac else - # We keep going just in case the user didn't refer to - # dld_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + # We keep going just in case the user didn't refer to + # lt_preloaded_symbols. The linker will fail if global_symbol_pipe + # really was required. + + # Nullify the symbol file. + compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - - # We have no uninstalled library dependencies, so finalize right now. - $show "$compile_command" - $run eval "$compile_command" - exit $? + # Replace the output file specification. + compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + link_command="$compile_command$compile_rpath" + + # We have no uninstalled library dependencies, so finalize right now. + $show "$link_command" + $run eval "$link_command" + exit $? fi - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'%g'` - finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'T%g'` + if test -n "$shlibpath_var"; then + # We should set the shlibpath_var + rpath= + for dir in $temp_rpath; do + case "$dir" in + /* | [A-Za-z]:[/\\]*) + # Absolute path. + rpath="$rpath$dir:" + ;; + *) + # Relative path: add a thisdir entry. + rpath="$rpath\$thisdir/$dir:" + ;; + esac + done + temp_rpath="$rpath" + fi - # Create the binary in the object directory, then wrap it. - if test -d $objdir; then : + if test -n "$compile_shlibpath$finalize_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi + + compile_var= + finalize_var= + if test -n "$runpath_var"; then + if test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + rpath="$rpath$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + if test -n "$finalize_perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do + rpath="$rpath$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + fi + + if test "$hardcode_action" = relink; then + # Fast installation is not supported + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" + + # AGH! Flame the AIX and HP-UX people for me, will ya? + $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 + $echo "$modename: \`$output' will be relinked during installation" 1>&2 else - $show "$mkdir $objdir" - $run $mkdir $objdir - status=$? - if test $status -eq 0 || test -d $objdir; then : + if test "$fast_install" != no; then + link_command="$finalize_var$compile_command$finalize_rpath" + if test "$fast_install" = yes; then + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + else + # fast_install is set to needless + relink_command= + fi else - exit $status + link_command="$compile_var$compile_command$compile_rpath" + relink_command="$finalize_var$finalize_command$finalize_rpath" fi fi - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case "$dir" in - /* | [A-Za-z]:\\*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" + # Replace the output file specification. + link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + + # Create the binary in the object directory, then wrap it. + if test ! -d $output_objdir; then + $show "$mkdir $output_objdir" + $run $mkdir $output_objdir + status=$? + if test $status -ne 0 && test ! -d $objdir; then + exit $status + fi fi # Delete the old output file. - $run $rm $output - - if test -n "$compile_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_command="$runpath_var=\"$rpath\$$runpath_var\" $compile_command" - finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command" - fi - - case "$hardcode_action" in - relink) - # AGH! Flame the AIX and HP-UX people for me, will ya? - $echo "$modename: warning: using a buggy system linker" 1>&2 - $echo "$modename: relinking will be required before \`$output' can be installed" 1>&2 - ;; - esac + $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname - $show "$compile_command" - $run eval "$compile_command" || exit $? + $show "$link_command" + $run eval "$link_command" || exit $? # Now create the wrapper script. $show "creating $output" - # Quote the finalize command for shipping. - finalize_command=`$echo "X$finalize_command" | $Xsed -e "$sed_quote_subst"` + # Quote the relink command for shipping. + if test -n "$relink_command"; then + relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + fi # Quote $echo for shipping. - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` + if test "X$echo" = "X$SHELL $0 --fallback-echo"; then + case "$0" in + /* | [A-Za-z]:[/\\]*) qecho="$SHELL $0 --fallback-echo";; + *) qecho="$SHELL `pwd`/$0 --fallback-echo";; + esac + qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` + else + qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` + fi # Only actually do things if our run command is non-null. if test -z "$run"; then - $rm $output - trap "$rm $output; exit 1" 1 2 15 + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in + *.exe) output=`echo $output|sed 's,.exe$,,'` ;; + esac + $rm $output + trap "$rm $output; exit 1" 1 2 15 - $echo > $output "\ -#! /bin/sh + $echo > $output "\ +#! $SHELL -# $output - temporary wrapper script for $objdir/$output -# Generated by ltmain.sh - GNU $PACKAGE $VERSION +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. # -# This wrapper script should never be moved out of \``pwd`'. +# This wrapper script should never be moved out of the build directory. # If it is, it will not operate correctly. # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi +relink_command=\"$relink_command\" + # This environment variable determines our operation mode. if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: + # install mode needs the following variable: link_against_libtool_libs='$link_against_libtool_libs' - finalize_command=\"$finalize_command\" else # When we are sourced in execute mode, \$file and \$echo are already set. - if test \"\$libtool_execute_magic\" = \"$magic\"; then : - else + if test \"\$libtool_execute_magic\" != \"$magic\"; then echo=\"$qecho\" file=\"\$0\" + # Make sure echo works. + if test \"X\$1\" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then + # Yippee, \$echo works! + : + else + # Restart under the correct shell, and then maybe \$echo will work. + exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} + fi fi\ " - $echo >> $output "\ + $echo >> $output "\ # Find the directory that this script lives in. thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` @@ -1477,7 +2649,7 @@ # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then case \"\$destdir\" in - /* | [A-Za-z]:\\*) thisdir=\"\$destdir\" ;; + /* | [A-Za-z]:[/\\]*) thisdir=\"\$destdir\" ;; *) thisdir=\"\$thisdir/\$destdir\" ;; esac fi @@ -1489,35 +2661,97 @@ # Try to get the absolute directory name. absdir=\`cd \"\$thisdir\" && pwd\` test -n \"\$absdir\" && thisdir=\"\$absdir\" +" + if test "$fast_install" = yes; then + echo >> $output "\ + program=lt-'$outputname' progdir=\"\$thisdir/$objdir\" - program='$output' + + if test ! -f \"\$progdir/\$program\" || \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then + + file=\"\$\$-\$program\" + + if test ! -d \"\$progdir\"; then + $mkdir \"\$progdir\" + else + $rm \"\$progdir/\$file\" + fi" + + echo >> $output "\ + + # relink executable if necessary + if test -n \"\$relink_command\"; then + if (cd \"\$thisdir\" && eval \$relink_command); then : + else + $rm \"\$progdir/\$file\" + exit 1 + fi + fi + + $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $rm \"\$progdir/\$program\"; + $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $rm \"\$progdir/\$file\" + fi" + else + echo >> $output "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" + fi + + echo >> $output "\ if test -f \"\$progdir/\$program\"; then" - # Export our shlibpath_var if we have one. - if test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $echo >> $output "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" # Some systems cannot cope with colon-terminated $shlibpath_var - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/:*\$//'\` + # The second colon is a workaround for a bug in BeOS R4 sed + $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` export $shlibpath_var " - fi + fi + + # fixup the dll searchpath if we need to. + if test -n "$dllsearchpath"; then + $echo >> $output "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi - $echo >> $output "\ + $echo >> $output "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. - +" + case $host in + *-*-cygwin* | *-*-mingw | *-*-os2*) + # win32 systems need to use the prog path for dll + # lookup to work + $echo >> $output "\ + exec \$progdir\\\\\$program \${1+\"\$@\"} +" + ;; + *) + $echo >> $output "\ # Export the path to the program. PATH=\"\$progdir:\$PATH\" export PATH exec \$program \${1+\"\$@\"} - +" + ;; + esac + $echo >> $output "\ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" exit 1 fi @@ -1530,16 +2764,49 @@ fi fi\ " - chmod +x $output + chmod +x $output fi exit 0 ;; esac # See if we need to build an old-fashioned archive. - if test "$build_old_libs" = "yes"; then - # Transform .lo files to .o files. - oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` + for oldlib in $oldlibs; do + + if test "$build_libtool_libs" = convenience; then + oldobjs="$libobjs_save" + addlibs="$convenience" + build_libtool_libs=no + else + if test "$build_libtool_libs" = module; then + oldobjs="$libobjs_save" + build_libtool_libs=no + else + oldobjs="$objs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` + fi + addlibs="$old_convenience" + fi + + # Add in members from convenience archives. + for xlib in $addlibs; do + # Extract the objects. + xdir="$xlib"x + generated="$generated $xdir" + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "mkdir $xdir" + $run mkdir "$xdir" + status=$? + if test $status -ne 0 && test ! -d "$xdir"; then + exit $status + fi + $show "(cd $xdir && $AR x ../$xlib)" + $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $? + + oldobjs="$oldobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + done # Do each command in the archive commands. if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then @@ -1547,28 +2814,40 @@ else eval cmds=\"$old_archive_cmds\" fi - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? done IFS="$save_ifs" + done + + if test -n "$generated"; then + $show "${rm}r$generated" + $run ${rm}r$generated fi # Now create the libtool archive. case "$output" in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.a" - + test "$build_old_libs" = yes && old_library="$libname.$libext" $show "creating $output" + if test -n "$xrpath"; then + temp_xrpath= + for libdir in $xrpath; do + temp_xrpath="$temp_xrpath -R$libdir" + done + dependency_libs="$temp_xrpath $dependency_libs" + fi + # Only create the output if not a dry run. if test -z "$run"; then - $echo > $output "\ + $echo > $output "\ # $output - a libtool library file -# Generated by ltmain.sh - GNU $PACKAGE $VERSION +# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP # The name that we can dlopen(3). dlname='$dlname' @@ -1587,15 +2866,22 @@ age=$age revision=$revision +# Is this an already installed library? +installed=no + # Directory that this library needs to be installed in: libdir='$install_libdir'\ " + + $rm "$output_objdir/$outputname"i + sed 's/^installed=no$/installed=yes/' \ + < "$output" > "$output_objdir/$outputname"i || exit 1 fi # Do a symbolic link so that the libtool archive can be found in # LD_LIBRARY_PATH before the program is installed. - $show "(cd $objdir && $LN_S ../$output $output)" - $run eval "(cd $objdir && $LN_S ../$output $output)" || exit 1 + $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" + $run eval "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" || exit $? ;; esac exit 0 @@ -1605,9 +2891,9 @@ install) modename="$modename: install" - # There may be an optional /bin/sh argument at the beginning of + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL"; then + if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh; then # Aesthetically quote it. arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` case "$arg" in @@ -1639,14 +2925,14 @@ opts= prev= install_type= - isdir= + isdir=no stripme= for arg do if test -n "$dest"; then - files="$files $dest" - dest="$arg" - continue + files="$files $dest" + dest="$arg" + continue fi case "$arg" in @@ -1656,20 +2942,20 @@ -m) prev="-m" ;; -o) prev="-o" ;; -s) - stripme=" -s" - continue - ;; + stripme=" -s" + continue + ;; -*) ;; *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest="$arg" - continue - fi - ;; + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + prev= + else + dest="$arg" + continue + fi + ;; esac # Aesthetically quote the argument. @@ -1696,9 +2982,9 @@ if test -z "$files"; then if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 + $echo "$modename: no file or destination specified" 1>&2 else - $echo "$modename: you must specify a destination" 1>&2 + $echo "$modename: you must specify a destination" 1>&2 fi $echo "$help" 1>&2 exit 1 @@ -1709,7 +2995,7 @@ # Check to see that the destination is a directory. test -d "$dest" && isdir=yes - if test -n "$isdir"; then + if test "$isdir" = yes; then destdir="$dest" destname= else @@ -1720,23 +3006,23 @@ # Not a directory, so check to see that there is only one file specified. set dummy $files if test $# -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit 1 + $echo "$modename: \`$dest' is not a directory" 1>&2 + $echo "$help" 1>&2 + exit 1 fi fi case "$destdir" in - /* | [A-Za-z]:\\*) ;; + /* | [A-Za-z]:[/\\]*) ;; *) for file in $files; do - case "$file" in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - esac + case "$file" in + *.lo) ;; + *) + $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + esac done ;; esac @@ -1752,209 +3038,220 @@ # Do each installation. case "$file" in - *.a) - # Do the static libraries later. - staticlibs="$staticlibs $file" - ;; + *.a | *.lib) + # Do the static libraries later. + staticlibs="$staticlibs $file" + ;; *.la) - # Check to see that this really is a libtool archive. - if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - library_names= - old_library= - # If there is no directory component, then add one. - case "$file" in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/" - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift - - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$realname $destdir/$realname" - $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $? - test "X$dlname" = "X$realname" && dlname= - - if test $# -gt 0; then - # Delete the old symlinks. - rmcmd="$rm" - for linkname - do - rmcmd="$rmcmd $destdir/$linkname" - done - $show "$rmcmd" - $run $rmcmd - - # ... and create new ones. - for linkname - do - test "X$dlname" = "X$linkname" && dlname= - $show "(cd $destdir && $LN_S $realname $linkname)" - $run eval "(cd $destdir && $LN_S $realname $linkname)" - done - fi - - if test -n "$dlname"; then - # Install the dynamically-loadable library. - $show "$install_prog $dir/$dlname $destdir/$dlname" - $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $? - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - eval cmds=\"$postinstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - $show "$install_prog $file $destdir/$name" - $run eval "$install_prog $file $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; + # Check to see that this really is a libtool archive. + if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + else + $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi + + library_names= + old_library= + # If there is no directory component, then add one. + case "$file" in + */* | *\\*) . $file ;; + *) . ./$file ;; + esac + + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) current_libdirs="$current_libdirs $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) future_libdirs="$future_libdirs $libdir" ;; + esac + fi + + dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/" + test "X$dir" = "X$file/" && dir= + dir="$dir$objdir" + + # See the names of the shared library. + set dummy $library_names + if test -n "$2"; then + realname="$2" + shift + shift + + # Install the shared library and build the symlinks. + $show "$install_prog $dir/$realname $destdir/$realname" + $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $? + test "X$dlname" = "X$realname" && dlname= + + if test $# -gt 0; then + # Delete the old symlinks, and create new ones. + for linkname + do + test "X$dlname" = "X$linkname" && dlname= + if test "$linkname" != "$realname"; then + $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" + $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" + fi + done + fi + + if test -n "$dlname"; then + # Install the dynamically-loadable library. + $show "$install_prog $dir/$dlname $destdir/$dlname" + $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $? + fi + + # Do each command in the postinstall commands. + lib="$destdir/$realname" + eval cmds=\"$postinstall_cmds\" + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? + done + IFS="$save_ifs" + fi + + # Install the pseudo-library for information purposes. + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + if test ! -f "$instname"; then + # Just in case it was removed... + $show "Creating $instname" + $rm "$instname" + sed 's/^installed=no$/installed=yes/' "$file" > "$instname" + fi + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + ;; *.lo) - # Install (i.e. copy) a libtool object. + # Install (i.e. copy) a libtool object. + + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + destfile="$destdir/$destfile" + fi + + # Deduce the name of the destination old-style object file. + case "$destfile" in + *.lo) + staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` + ;; + *.o | *.obj) + staticdest="$destfile" + destfile= + ;; + *) + $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 + $echo "$help" 1>&2 + exit 1 + ;; + esac - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case "$destfile" in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/\.o/'` - ;; - *.o) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? - fi - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/\.o/'` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi - exit 0 - ;; + # Install the libtool object if requested. + if test -n "$destfile"; then + $show "$install_prog $file $destfile" + $run eval "$install_prog $file $destfile" || exit $? + fi + + # Install the old object if enabled. + if test "$build_old_libs" = yes; then + # Deduce the name of the old-style object file. + staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` + + $show "$install_prog $staticobj $staticdest" + $run eval "$install_prog \$staticobj \$staticdest" || exit $? + fi + exit 0 + ;; *) - # Do a test to see if this is really a libtool program. - if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then - link_against_libtool_libs= - finalize_command= - - # If there is no directory component, then add one. - case "$file" in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Check the variables that should have been set. - if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then - $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 - exit 1 - fi - - finalize=yes - for lib in $link_against_libtool_libs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case "$lib" in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" - if test -z "$libdir"; then - $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2 - elif test -f "$libfile"; then : - else - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done - - if test "$hardcode_action" = relink; then - if test "$finalize" = yes; then - $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2 - $show "$finalize_command" - if $run eval "$finalize_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - continue - fi - file="$objdir/$file"T - else - $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2 - fi - else - # Install the binary that we compiled earlier. + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + destfile="$destdir/$destfile" + fi + + # Do a test to see if this is really a libtool program. + if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + link_against_libtool_libs= + relink_command= + + # If there is no directory component, then add one. + case "$file" in + */* | *\\*) . $file ;; + *) . ./$file ;; + esac + + # Check the variables that should have been set. + if test -z "$link_against_libtool_libs"; then + $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 + exit 1 + fi + + finalize=yes + for lib in $link_against_libtool_libs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + # If there is no directory component, then add one. + case "$lib" in + */* | *\\*) . $lib ;; + *) . ./$lib ;; + esac + fi + libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" + if test -n "$libdir" && test ! -f "$libfile"; then + $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 + finalize=no + fi + done + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + if test "$finalize" = yes; then + outputname="/tmp/$$-$file" + # Replace the output file specification. + relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + + $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2 + $show "$relink_command" + if $run eval "$relink_command"; then : + else + $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 + continue + fi + file="$outputname" + else + $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2 + fi + else + # Install the binary that we compiled earlier. file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi + fi + fi - $show "$install_prog$stripme $file $dest" - $run eval "$install_prog\$stripme \$file \$dest" || exit $? - ;; + $show "$install_prog$stripme $file $destfile" + $run eval "$install_prog\$stripme \$file \$destfile" || exit $? + test -n "$outputname" && $rm $outputname + ;; esac done @@ -1969,11 +3266,11 @@ # Do each command in the postinstall commands. eval cmds=\"$old_postinstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || exit $? done IFS="$save_ifs" done @@ -1996,43 +3293,49 @@ finish) modename="$modename: finish" libdirs="$nonopt" + admincmds= if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then for dir do - libdirs="$libdirs $dir" + libdirs="$libdirs $dir" done for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. eval cmds=\"$finish_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" - done - IFS="$save_ifs" + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + $show "$cmd" + $run eval "$cmd" || admincmds="$admincmds + $cmd" + done + IFS="$save_ifs" fi if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $run eval "$cmds" + $run eval "$cmds" || admincmds="$admincmds + $cmds" fi done fi - echo "------------------------------------------------------------------------------" + # Exit here if they wanted silent mode. + test "$show" = : && exit 0 + + echo "----------------------------------------------------------------------" echo "Libraries have been installed in:" for libdir in $libdirs; do echo " $libdir" done echo - echo "To link against installed libraries in a given directory, LIBDIR," - echo "you must use the \`-LLIBDIR' flag during linking." - echo - echo " You will also need to do one of the following:" + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then echo " - add LIBDIR to the \`$shlibpath_var' environment variable" echo " during execution" @@ -2047,13 +3350,16 @@ echo " - use the \`$flag' linker flag" fi + if test -n "$admincmds"; then + echo " - have your system administrator run these commands:$admincmds" + fi if test -f /etc/ld.so.conf; then echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" fi echo echo "See any operating system documentation about shared libraries for" echo "more information, such as the ld(1) and ld.so(8) manual pages." - echo "------------------------------------------------------------------------------" + echo "----------------------------------------------------------------------" exit 0 ;; @@ -2071,8 +3377,7 @@ # Handle -dlopen flags immediately. for file in $execute_dlfiles; do - if test -f "$file"; then : - else + if test ! -f "$file"; then $echo "$modename: \`$file' is not a file" 1>&2 $echo "$help" 1>&2 exit 1 @@ -2081,22 +3386,22 @@ dir= case "$file" in *.la) - # Check to see that this really is a libtool archive. - if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi + # Check to see that this really is a libtool archive. + if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : + else + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 + $echo "$help" 1>&2 + exit 1 + fi # Read the libtool library. dlname= library_names= - # If there is no directory component, then add one. + # If there is no directory component, then add one. case "$file" in */* | *\\*) . $file ;; - *) . ./$file ;; + *) . ./$file ;; esac # Skip this library if it cannot be dlopened. @@ -2125,7 +3430,7 @@ *) $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue + continue ;; esac @@ -2152,8 +3457,8 @@ case "$file" in -*) ;; *) - # Do a test to see if this is really a libtool program. - if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then + # Do a test to see if this is really a libtool program. + if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then # If there is no directory component, then add one. case "$file" in */* | *\\*) . $file ;; @@ -2163,7 +3468,7 @@ # Transform arg to wrapped name. file="$progdir/$program" fi - ;; + ;; esac # Quote arguments (to preserve shell metacharacters). file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` @@ -2174,6 +3479,14 @@ # Export the shlibpath_var. eval "export $shlibpath_var" + # Restore saved enviroment variables + if test "${save_LC_ALL+set}" = set; then + LC_ALL="$save_LC_ALL"; export LC_ALL + fi + if test "${save_LANG+set}" = set; then + LANG="$save_LANG"; export LANG + fi + # Now actually exec the command. eval "exec \$cmd$args" @@ -2217,17 +3530,17 @@ case "$name" in *.la) - # Possibly a libtool archive, so verify it. - if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - rmfiles="$rmfiles $dir/$n" - test "X$n" = "X$dlname" && dlname= - done - test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname" - test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library" + # Possibly a libtool archive, so verify it. + if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + . $dir/$name + + # Delete the libtool libraries and symlinks. + for n in $library_names; do + rmfiles="$rmfiles $dir/$n" + test "X$n" = "X$dlname" && dlname= + done + test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname" + test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library" $show "$rm $rmfiles" $run $rm $rmfiles @@ -2235,7 +3548,7 @@ if test -n "$library_names"; then # Do each command in the postuninstall commands. eval cmds=\"$postuninstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -2244,10 +3557,10 @@ IFS="$save_ifs" fi - if test -n "$old_library"; then + if test -n "$old_library"; then # Do each command in the old_postuninstall commands. eval cmds=\"$old_postuninstall_cmds\" - IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -2256,21 +3569,21 @@ IFS="$save_ifs" fi - # FIXME: should reinstall the best remaining shared library. - fi - ;; + # FIXME: should reinstall the best remaining shared library. + fi + ;; *.lo) - if test "$build_old_libs" = yes; then - oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/\.o/'` - rmfiles="$rmfiles $dir/$oldobj" - fi + if test "$build_old_libs" = yes; then + oldobj=`$echo "X$name" | $Xsed -e "$lo2o"` + rmfiles="$rmfiles $dir/$oldobj" + fi $show "$rm $rmfiles" $run $rm $rmfiles - ;; + ;; *) - $show "$rm $rmfiles" + $show "$rm $rmfiles" $run $rm $rmfiles ;; esac @@ -2297,8 +3610,10 @@ Provide generalized library-building support services. + --config show all configuration variables + --debug enable verbose shell tracing -n, --dry-run display commands without modifying any files - --features display configuration information and exit + --features display basic configuration information and exit --finish same as \`--mode=finish' --help display this help message and exit --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] @@ -2326,6 +3641,11 @@ Compile a source file into a libtool library object. +This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -static always build a \`.o' file suitable for static linking + COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -2392,18 +3712,23 @@ The following components of LINK-COMMAND are treated specially: -all-static do not do any dynamic linking at all + -avoid-version do not add a version suffix if possible -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to dld_preloaded_symbols + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE + try to export only the symbols listed in SYMFILE -LLIBDIR search LIBDIR for required installed libraries -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -static do not do any dynamic linking of libtool libraries -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] + specify library version info [each variable defaults to 0] All other options (arguments beginning with \`-') are ignored. @@ -2411,14 +3736,15 @@ treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, only -library objects (\`.lo' files) may be specified, and \`-rpath' is required. +If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +only library objects (\`.lo' files) may be specified, and \`-rpath' is +required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a', then a standard library is created using \`ar' -and \`ranlib'. +If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +using \`ar' and \`ranlib', or on Windows using \`lib'. -If OUTPUT-FILE ends in \`.lo' or \`.o', then a reloadable object file is -created, otherwise an executable program is created." +If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +is created, otherwise an executable program is created." ;; uninstall) diff -ruN gimp-1.0.2/plug-ins/AlienMap/Makefile.in gimp-1.0.3/plug-ins/AlienMap/Makefile.in --- gimp-1.0.2/plug-ins/AlienMap/Makefile.in Wed Oct 14 20:19:52 1998 +++ gimp-1.0.3/plug-ins/AlienMap/Makefile.in Mon Mar 29 13:12:51 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = AlienMap -AlienMap_SOURCES = \ - AlienMap.c logo.h +AlienMap_SOURCES = AlienMap.c logo.h + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la AlienMap_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ AlienMap_LDADD = $(LDADD) AlienMap_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README INSTALL Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(AlienMap_SOURCES) OBJECTS = $(AlienMap_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/AlienMap/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done AlienMap.o: AlienMap.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h logo.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/CEL/Makefile.in gimp-1.0.3/plug-ins/CEL/Makefile.in --- gimp-1.0.2/plug-ins/CEL/Makefile.in Wed Oct 14 20:19:56 1998 +++ gimp-1.0.3/plug-ins/CEL/Makefile.in Mon Mar 29 13:12:52 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = CEL -CEL_SOURCES = \ - CEL.c +CEL_SOURCES = CEL.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la CEL_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ CEL_LDADD = $(LDADD) CEL_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(CEL_SOURCES) OBJECTS = $(CEL_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/CEL/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done CEL.o: CEL.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/CML_explorer/Makefile.in gimp-1.0.3/plug-ins/CML_explorer/Makefile.in --- gimp-1.0.2/plug-ins/CML_explorer/Makefile.in Wed Oct 14 20:19:59 1998 +++ gimp-1.0.3/plug-ins/CML_explorer/Makefile.in Mon Mar 29 13:12:53 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = CML_explorer -CML_explorer_SOURCES = \ - CML_explorer.c +CML_explorer_SOURCES = CML_explorer.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la CML_explorer_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ CML_explorer_LDADD = $(LDADD) CML_explorer_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(CML_explorer_SOURCES) OBJECTS = $(CML_explorer_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/CML_explorer/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done CML_explorer.o: CML_explorer.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/Makefile.in gimp-1.0.3/plug-ins/Makefile.in --- gimp-1.0.2/plug-ins/Makefile.in Wed Oct 14 20:18:45 1998 +++ gimp-1.0.3/plug-ins/Makefile.in Mon Mar 29 13:12:35 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -115,143 +118,15 @@ palettedata = @palettedata@ patterndata = @patterndata@ -SUBDIRS = \ - libgck \ - megawidget \ - gpc \ - dbbrowser \ - script-fu \ - @AA@ \ - @JPEG@ \ - @MPEG@ \ - @PNG@ \ - @TIFF@ \ - @WEBBROWSER@ \ - @XD@ \ - @XPM@ \ - AlienMap \ - CEL \ - CML_explorer \ - MapObject \ - align_layers \ - animoptimize \ - apply_lens \ - autocrop \ - animationplay \ - autostretch_hsv \ - blinds \ - blur \ - bmp \ - bumpmap \ - bz2 \ - c_astretch \ - checkerboard \ - colorify \ - compose \ - convmatrix \ - cubism \ - decompose \ - deinterlace \ - depthmerge \ - despeckle \ - destripe \ - diffraction \ - displace \ - edge \ - emboss \ - engrave \ - exchange \ - faxg3 \ - film \ - fits \ - flame \ - flarefx \ - fractaltrace \ - gauss_iir \ - gauss_rle \ - gbr \ - gee \ - gfig \ - gfli \ - gicon \ - gif \ - glasstile \ - gqbist \ - gradmap \ - grid \ - gtm \ - gz \ - header \ - hot \ - hrz \ - ifscompose \ - illusion \ - iwarp \ - laplace \ - mail \ - max_rgb \ - maze \ - mblur \ - mosaic \ - nlfilt \ - noisify \ - normalize \ - nova \ - oilify \ - pagecurl \ - palette \ - papertile \ - pat \ - pcx \ - pix \ - pixelize \ - plasma \ - pnm \ - polar \ - print \ - ps \ - psd \ - randomize \ - ripple \ - rotate \ - rotators \ - scatter_hsv \ - screenshot \ - semiflatten \ - sgi \ - sharpen \ - shift \ - sinus \ - smooth_palette \ - snoise \ - snp \ - sobel \ - sparkle \ - spread \ - struc \ - sunras \ - tga \ - threshold_alpha \ - tile \ - tileit \ - tiler \ - url \ - video \ - vinvert \ - vpropagate \ - waves \ - whirlpinch \ - xwd \ - zealouscrop +SUBDIRS = libgck megawidget gpc dbbrowser script-fu @AA@ @JPEG@ @MPEG@ @PNG@ @TIFF@ @WEBBROWSER@ @XD@ @XPM@ AlienMap CEL CML_explorer MapObject align_layers animoptimize apply_lens autocrop animationplay autostretch_hsv blinds blur bmp bumpmap bz2 c_astretch checkerboard colorify compose convmatrix cubism decompose deinterlace depthmerge despeckle destripe diffraction displace edge emboss engrave exchange faxg3 film fits flame flarefx fractaltrace gauss_iir gauss_rle gbr gee gfig gfli gicon gif glasstile gqbist gradmap grid gtm gz header hot hrz ifscompose illusion iwarp laplace mail max_rgb maze mblur mosaic nlfilt noisify normalize nova oilify pagecurl palette papertile pat pcx pix pixelize plasma pnm polar print ps psd randomize ripple rotate rotators scatter_hsv screenshot semiflatten sgi sharpen shift sinus smooth_palette snoise snp sobel sparkle spread struc sunras tga threshold_alpha tile tileit tiler url video vinvert vpropagate waves whirlpinch xwd zealouscrop -scriptdata = + +scriptdata = pluginlibdir = $(gimpplugindir)/plug-ins -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + LIBGIMPUI = $(top_builddir)/libgimp/libgimpui.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -263,11 +138,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: all-recursive all-am - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -288,41 +162,65 @@ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) tags); \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ done; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ @@ -347,84 +245,90 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ done +info-am: info: info-recursive +dvi-am: dvi: dvi-recursive -check: all-am - $(MAKE) check-recursive +check-am: all-am +check: check-recursive +installcheck-am: installcheck: installcheck-recursive -all-am: Makefile - +install-exec-am: install-exec: install-exec-recursive - @$(NORMAL_INSTALL) +install-data-am: install-data: install-data-recursive - @$(NORMAL_INSTALL) +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive - @: - +uninstall-am: uninstall: uninstall-recursive - +all-am: Makefile +all-redirect: all-recursive install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive +installdirs-am: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-tags mostlyclean-generic +mostlyclean: mostlyclean-recursive + clean-am: clean-tags clean-generic mostlyclean-am +clean: clean-recursive + distclean-am: distclean-tags distclean-generic clean-am + -rm -f libtool + +distclean: distclean-recursive maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ distclean-am - -mostlyclean: mostlyclean-recursive mostlyclean-am - -clean: clean-recursive clean-am - -distclean: distclean-recursive distclean-am - -rm -f config.status - -rm -f libtool - -maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-recursive + .PHONY: install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ uninstalldirs-recursive all-recursive check-recursive \ installcheck-recursive info-recursive dvi-recursive \ mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck all-am install-exec install-data install uninstall all \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/MapObject/Makefile.in gimp-1.0.3/plug-ins/MapObject/Makefile.in --- gimp-1.0.2/plug-ins/MapObject/Makefile.in Wed Oct 14 20:20:04 1998 +++ gimp-1.0.3/plug-ins/MapObject/Makefile.in Mon Mar 29 13:12:54 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,25 +122,17 @@ 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 +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 + + +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/plug-ins/libgck -I$(includedir) $(X_CFLAGS) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(top_builddir)/plug-ins/libgck/gck/libgck.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(top_builddir)/plug-ins/libgck/gck/libgck.la -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/plug-ins/libgck \ - -I$(includedir) \ - $(X_CFLAGS) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(top_builddir)/plug-ins/libgck/gck/libgck.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(top_builddir)/plug-ins/libgck/gck/libgck.la MapObject_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -155,24 +150,24 @@ MapObject_LDADD = $(LDADD) MapObject_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README Makefile.am Makefile.in TODO DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(MapObject_SOURCES) OBJECTS = $(MapObject_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/MapObject/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -194,15 +189,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -250,8 +245,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -279,9 +278,13 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done arcball.o: arcball.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h arcball.h @@ -361,71 +364,80 @@ diffref1.xpm diffref2.xpm specref1.xpm specref2.xpm high1.xpm \ high2.xpm -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/MapObject/mapobject_ui.c gimp-1.0.3/plug-ins/MapObject/mapobject_ui.c --- gimp-1.0.2/plug-ins/MapObject/mapobject_ui.c Thu Mar 19 18:42:21 1998 +++ gimp-1.0.3/plug-ins/MapObject/mapobject_ui.c Fri Mar 26 22:15:46 1999 @@ -131,7 +131,7 @@ GtkAdjustment *adjustment; valueptr=(gdouble *)gtk_object_get_data(GTK_OBJECT(widget),"ValuePtr"); - adjustment=gtk_range_get_adjustment(GTK_RANGE(scale)); + adjustment=gtk_range_get_adjustment(GTK_RANGE(widget)); *valueptr=(gdouble)adjustment->value; @@ -169,7 +169,7 @@ GtkAdjustment *adjustment; valueptr=(gdouble *)gtk_object_get_data(GTK_OBJECT(widget),"ValuePtr"); - adjustment=gtk_range_get_adjustment(GTK_RANGE(scale)); + adjustment=gtk_range_get_adjustment(GTK_RANGE(widget)); *valueptr=(gdouble)adjustment->value; } diff -ruN gimp-1.0.2/plug-ins/aa/Makefile.in gimp-1.0.3/plug-ins/aa/Makefile.in --- gimp-1.0.2/plug-ins/aa/Makefile.in Wed Oct 14 20:19:25 1998 +++ gimp-1.0.3/plug-ins/aa/Makefile.in Mon Mar 29 13:12:44 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -121,20 +124,14 @@ aa_SOURCES = aa.c -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBAA_LIB@ - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) @LIBAA_LIB@ + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la + aa_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +148,24 @@ aa_LDADD = $(LDADD) aa_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(aa_SOURCES) OBJECTS = $(aa_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/aa/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +187,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +243,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +276,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done aa.o: aa.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/align_layers/Makefile.in gimp-1.0.3/plug-ins/align_layers/Makefile.in --- gimp-1.0.2/plug-ins/align_layers/Makefile.in Wed Oct 14 20:20:08 1998 +++ gimp-1.0.3/plug-ins/align_layers/Makefile.in Mon Mar 29 13:12:55 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = align_layers -align_layers_SOURCES = \ - align_layers.c +align_layers_SOURCES = align_layers.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la align_layers_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ align_layers_LDADD = $(LDADD) align_layers_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(align_layers_SOURCES) OBJECTS = $(align_layers_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/align_layers/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done align_layers.o: align_layers.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/animationplay/Makefile.in gimp-1.0.3/plug-ins/animationplay/Makefile.in --- gimp-1.0.2/plug-ins/animationplay/Makefile.in Wed Oct 14 20:20:22 1998 +++ gimp-1.0.3/plug-ins/animationplay/Makefile.in Mon Mar 29 13:12:59 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = animationplay -animationplay_SOURCES = \ - animationplay.c +animationplay_SOURCES = animationplay.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la animationplay_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ animationplay_LDADD = $(LDADD) animationplay_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(animationplay_SOURCES) OBJECTS = $(animationplay_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/animationplay/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done animationplay.o: animationplay.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/animoptimize/Makefile.in gimp-1.0.3/plug-ins/animoptimize/Makefile.in --- gimp-1.0.2/plug-ins/animoptimize/Makefile.in Wed Oct 14 20:20:11 1998 +++ gimp-1.0.3/plug-ins/animoptimize/Makefile.in Mon Mar 29 13:12:56 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = animoptimize -animoptimize_SOURCES = \ - animoptimize.c +animoptimize_SOURCES = animoptimize.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la animoptimize_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ animoptimize_LDADD = $(LDADD) animoptimize_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(animoptimize_SOURCES) OBJECTS = $(animoptimize_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/animoptimize/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done animoptimize.o: animoptimize.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/apply_lens/Makefile.in gimp-1.0.3/plug-ins/apply_lens/Makefile.in --- gimp-1.0.2/plug-ins/apply_lens/Makefile.in Wed Oct 14 20:20:15 1998 +++ gimp-1.0.3/plug-ins/apply_lens/Makefile.in Mon Mar 29 13:12:57 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = apply_lens -apply_lens_SOURCES = \ - apply_lens.c +apply_lens_SOURCES = apply_lens.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la apply_lens_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ apply_lens_LDADD = $(LDADD) apply_lens_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(apply_lens_SOURCES) OBJECTS = $(apply_lens_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/apply_lens/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done apply_lens.o: apply_lens.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/autocrop/Makefile.in gimp-1.0.3/plug-ins/autocrop/Makefile.in --- gimp-1.0.2/plug-ins/autocrop/Makefile.in Wed Oct 14 20:20:18 1998 +++ gimp-1.0.3/plug-ins/autocrop/Makefile.in Mon Mar 29 13:12:58 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = autocrop -autocrop_SOURCES = \ - autocrop.c +autocrop_SOURCES = autocrop.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la autocrop_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ autocrop_LDADD = $(LDADD) autocrop_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(autocrop_SOURCES) OBJECTS = $(autocrop_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/autocrop/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done autocrop.o: autocrop.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/autostretch_hsv/Makefile.in gimp-1.0.3/plug-ins/autostretch_hsv/Makefile.in --- gimp-1.0.2/plug-ins/autostretch_hsv/Makefile.in Wed Oct 14 20:20:25 1998 +++ gimp-1.0.3/plug-ins/autostretch_hsv/Makefile.in Mon Mar 29 13:13:01 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = autostretch_hsv -autostretch_hsv_SOURCES = \ - autostretch_hsv.c +autostretch_hsv_SOURCES = autostretch_hsv.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la autostretch_hsv_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ autostretch_hsv_LDADD = $(LDADD) autostretch_hsv_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(autostretch_hsv_SOURCES) OBJECTS = $(autostretch_hsv_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/autostretch_hsv/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done autostretch_hsv.o: autostretch_hsv.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/blinds/Makefile.in gimp-1.0.3/plug-ins/blinds/Makefile.in --- gimp-1.0.2/plug-ins/blinds/Makefile.in Wed Oct 14 20:20:29 1998 +++ gimp-1.0.3/plug-ins/blinds/Makefile.in Mon Mar 29 13:13:02 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = blinds -blinds_SOURCES = \ - blinds.c +blinds_SOURCES = blinds.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la blinds_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ blinds_LDADD = $(LDADD) blinds_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(blinds_SOURCES) OBJECTS = $(blinds_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/blinds/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done blinds.o: blinds.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/blinds/blinds.c gimp-1.0.3/plug-ins/blinds/blinds.c --- gimp-1.0.2/plug-ins/blinds/blinds.c Tue May 26 01:46:30 1998 +++ gimp-1.0.3/plug-ins/blinds/blinds.c Mon Mar 29 11:39:20 1999 @@ -48,6 +48,7 @@ * to allow the plug-in to build with Digitals compiler. */ +#include #include #include #include diff -ruN gimp-1.0.2/plug-ins/blur/Makefile.am gimp-1.0.3/plug-ins/blur/Makefile.am --- gimp-1.0.2/plug-ins/blur/Makefile.am Sun Aug 30 15:13:01 1998 +++ gimp-1.0.3/plug-ins/blur/Makefile.am Thu Jan 21 16:20:36 1999 @@ -5,7 +5,7 @@ pluginlib_PROGRAMS = blur blur_SOURCES = \ - blur.c $(top_srcdir)/plug-ins/gpc/gpc.h + blur.c INCLUDES = \ $(X_CFLAGS) \ diff -ruN gimp-1.0.2/plug-ins/blur/Makefile.in gimp-1.0.3/plug-ins/blur/Makefile.in --- gimp-1.0.2/plug-ins/blur/Makefile.in Wed Oct 14 20:20:33 1998 +++ gimp-1.0.3/plug-ins/blur/Makefile.in Mon Mar 29 13:13:03 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,23 +122,16 @@ pluginlib_PROGRAMS = blur -blur_SOURCES = \ - blur.c $(top_srcdir)/plug-ins/gpc/gpc.h +blur_SOURCES = blur.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/plug-ins/gpc/libgpc.a $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/plug-ins/gpc/libgpc.a $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/plug-ins/gpc/libgpc.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/gpc/libgpc.a \ - $(top_builddir)/libgimp/libgimp.la blur_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -152,24 +148,24 @@ blur_LDADD = $(LDADD) blur_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(blur_SOURCES) OBJECTS = $(blur_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/blur/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -191,15 +187,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -247,8 +243,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -276,79 +276,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done blur.o: blur.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../plug-ins/gpc/gpc.h \ ../../config.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/blur/blur.c gimp-1.0.3/plug-ins/blur/blur.c --- gimp-1.0.2/plug-ins/blur/blur.c Mon Jul 13 20:45:54 1998 +++ gimp-1.0.3/plug-ins/blur/blur.c Mon Mar 29 11:39:24 1999 @@ -51,6 +51,7 @@ * ****************************************************************************/ +#include #include #include #include "libgimp/gimp.h" diff -ruN gimp-1.0.2/plug-ins/bmp/Makefile.in gimp-1.0.3/plug-ins/bmp/Makefile.in --- gimp-1.0.2/plug-ins/bmp/Makefile.in Wed Oct 14 20:20:36 1998 +++ gimp-1.0.3/plug-ins/bmp/Makefile.in Mon Mar 29 13:13:04 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = bmp -bmp_SOURCES = \ - bmp.c bmp.h bmpread.c bmpwrite.c +bmp_SOURCES = bmp.c bmp.h bmpread.c bmpwrite.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la bmp_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ bmp_LDADD = $(LDADD) bmp_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(bmp_SOURCES) OBJECTS = $(bmp_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/bmp/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,9 +277,13 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done bmp.o: bmp.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h bmp.h @@ -286,71 +292,80 @@ bmpwrite.o: bmpwrite.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h bmp.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/bumpmap/Makefile.in gimp-1.0.3/plug-ins/bumpmap/Makefile.in --- gimp-1.0.2/plug-ins/bumpmap/Makefile.in Wed Oct 14 20:20:40 1998 +++ gimp-1.0.3/plug-ins/bumpmap/Makefile.in Mon Mar 29 13:13:05 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = bumpmap -bumpmap_SOURCES = \ - bumpmap.c +bumpmap_SOURCES = bumpmap.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la bumpmap_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ bumpmap_LDADD = $(LDADD) bumpmap_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(bumpmap_SOURCES) OBJECTS = $(bumpmap_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/bumpmap/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done bumpmap.o: bumpmap.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ ../../libgimp/gimpmenu.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/bumpmap/bumpmap.c gimp-1.0.3/plug-ins/bumpmap/bumpmap.c --- gimp-1.0.2/plug-ins/bumpmap/bumpmap.c Sun Apr 12 22:41:23 1998 +++ gimp-1.0.3/plug-ins/bumpmap/bumpmap.c Mon Mar 29 11:39:26 1999 @@ -85,6 +85,7 @@ */ +#include #include #include #include diff -ruN gimp-1.0.2/plug-ins/bz2/Makefile.in gimp-1.0.3/plug-ins/bz2/Makefile.in --- gimp-1.0.2/plug-ins/bz2/Makefile.in Wed Oct 14 20:20:44 1998 +++ gimp-1.0.3/plug-ins/bz2/Makefile.in Mon Mar 29 13:13:06 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = bz2 -bz2_SOURCES = \ - bz2.c +bz2_SOURCES = bz2.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la bz2_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ bz2_LDADD = $(LDADD) bz2_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(bz2_SOURCES) OBJECTS = $(bz2_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/bz2/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done bz2.o: bz2.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/c_astretch/Makefile.in gimp-1.0.3/plug-ins/c_astretch/Makefile.in --- gimp-1.0.2/plug-ins/c_astretch/Makefile.in Wed Oct 14 20:20:47 1998 +++ gimp-1.0.3/plug-ins/c_astretch/Makefile.in Mon Mar 29 13:13:07 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = c_astretch -c_astretch_SOURCES = \ - c_astretch.c +c_astretch_SOURCES = c_astretch.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la c_astretch_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ c_astretch_LDADD = $(LDADD) c_astretch_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(c_astretch_SOURCES) OBJECTS = $(c_astretch_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/c_astretch/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done c_astretch.o: c_astretch.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/checkerboard/Makefile.in gimp-1.0.3/plug-ins/checkerboard/Makefile.in --- gimp-1.0.2/plug-ins/checkerboard/Makefile.in Wed Oct 14 20:20:51 1998 +++ gimp-1.0.3/plug-ins/checkerboard/Makefile.in Mon Mar 29 13:13:08 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = checkerboard -checkerboard_SOURCES = \ - checkerboard.c +checkerboard_SOURCES = checkerboard.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la checkerboard_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ checkerboard_LDADD = $(LDADD) checkerboard_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(checkerboard_SOURCES) OBJECTS = $(checkerboard_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/checkerboard/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done checkerboard.o: checkerboard.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/checkerboard/checkerboard.c gimp-1.0.3/plug-ins/checkerboard/checkerboard.c --- gimp-1.0.2/plug-ins/checkerboard/checkerboard.c Sun Apr 12 22:41:27 1998 +++ gimp-1.0.3/plug-ins/checkerboard/checkerboard.c Sun Nov 8 18:26:38 1998 @@ -301,6 +301,10 @@ static gint *in = NULL; /* initialized first time */ gint i,j,k, len; + /* avoid a FP exception */ + if (size == 1) + size = 2; + len = size*size; /* * Initialize the array; since we'll be called thousands of diff -ruN gimp-1.0.2/plug-ins/colorify/Makefile.in gimp-1.0.3/plug-ins/colorify/Makefile.in --- gimp-1.0.2/plug-ins/colorify/Makefile.in Wed Oct 14 20:20:55 1998 +++ gimp-1.0.3/plug-ins/colorify/Makefile.in Mon Mar 29 13:13:09 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = colorify -colorify_SOURCES = \ - colorify.c +colorify_SOURCES = colorify.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la colorify_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ colorify_LDADD = $(LDADD) colorify_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(colorify_SOURCES) OBJECTS = $(colorify_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/colorify/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done colorify.o: colorify.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/compose/Makefile.in gimp-1.0.3/plug-ins/compose/Makefile.in --- gimp-1.0.2/plug-ins/compose/Makefile.in Wed Oct 14 20:20:58 1998 +++ gimp-1.0.3/plug-ins/compose/Makefile.in Mon Mar 29 13:13:10 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = compose -compose_SOURCES = \ - compose.c +compose_SOURCES = compose.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la compose_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ compose_LDADD = $(LDADD) compose_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(compose_SOURCES) OBJECTS = $(compose_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/compose/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done compose.o: compose.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../libgimp/gimpmenu.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/convmatrix/Makefile.in gimp-1.0.3/plug-ins/convmatrix/Makefile.in --- gimp-1.0.2/plug-ins/convmatrix/Makefile.in Wed Oct 14 20:21:03 1998 +++ gimp-1.0.3/plug-ins/convmatrix/Makefile.in Mon Mar 29 13:13:11 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = convmatrix -convmatrix_SOURCES = \ - convmatrix.c +convmatrix_SOURCES = convmatrix.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la convmatrix_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ convmatrix_LDADD = $(LDADD) convmatrix_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(convmatrix_SOURCES) OBJECTS = $(convmatrix_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/convmatrix/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done convmatrix.o: convmatrix.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/cubism/Makefile.in gimp-1.0.3/plug-ins/cubism/Makefile.in --- gimp-1.0.2/plug-ins/cubism/Makefile.in Wed Oct 14 20:21:06 1998 +++ gimp-1.0.3/plug-ins/cubism/Makefile.in Mon Mar 29 13:13:12 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = cubism -cubism_SOURCES = \ - cubism.c +cubism_SOURCES = cubism.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la cubism_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ cubism_LDADD = $(LDADD) cubism_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(cubism_SOURCES) OBJECTS = $(cubism_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/cubism/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done cubism.o: cubism.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ - ../../libgimp/gimpenums.h - -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS + ../../libgimp/gimpenums.h ../../config.h +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/cubism/cubism.c gimp-1.0.3/plug-ins/cubism/cubism.c --- gimp-1.0.2/plug-ins/cubism/cubism.c Sun Apr 12 22:41:32 1998 +++ gimp-1.0.3/plug-ins/cubism/cubism.c Sun Nov 8 18:26:39 1998 @@ -17,6 +17,7 @@ * * You can contact me at quartic@polloux.fciencias.unam.mx * You can contact the original The Gimp authors at gimp@xcf.berkeley.edu + * Speedups by Elliot Lee */ @@ -26,6 +27,8 @@ #include "gtk/gtk.h" #include "libgimp/gimp.h" +#include "config.h" + /* Some useful macros */ #define SQR(a) ((a) * (a)) @@ -96,7 +99,7 @@ static gdouble fp_rand (gdouble val); static gint int_rand (gint val); static gdouble calc_alpha_blend (gdouble * vec, - gdouble dist, + gdouble one_over_dist, gdouble x, gdouble y); static void polygon_add_point (Polygon * poly, @@ -501,6 +504,27 @@ free (random_indices); } +static inline gdouble +calc_alpha_blend (gdouble *vec, + gdouble one_over_dist, + gdouble x, + gdouble y) +{ + gdouble r; + + if (!one_over_dist) + return 1.0; + else + { + r = (vec[0] * x + vec[1] * y) * one_over_dist; + if (r < 0.2) + r = 0.2; + else if (r > 1.0) + r = 1.0; + } + return r; +} + static void fill_poly_color (Polygon *poly, GDrawable *drawable, @@ -514,22 +538,22 @@ gint min_x, min_y; gint max_x, max_y; gint size_x, size_y; - gint * max_scanlines; - gint * min_scanlines; - gint * vals; + gint * max_scanlines, *max_scanlines_iter; + gint * min_scanlines, *min_scanlines_iter; gint val; gint alpha; gint bytes; guchar buf[4]; - gint b, i, j, k, x, y; + gint i, j, x, y; gdouble sx, sy; gdouble ex, ey; gdouble xx, yy; gdouble vec[2]; - gdouble dist; + gdouble dist, one_over_dist; gint supersample; gint supersample2; gint x1, y1, x2, y2; + gint *vals, *vals_iter, *vals_end; sx = poly->pts[0].x; sy = poly->pts[0].y; @@ -539,9 +563,11 @@ dist = sqrt (SQR (ex - sx) + SQR (ey - sy)); if (dist > 0.0) { - vec[0] = (ex - sx) / dist; - vec[1] = (ey - sy) / dist; - } + one_over_dist = 1/dist; + vec[0] = (ex - sx) * one_over_dist; + vec[1] = (ey - sy) * one_over_dist; + } else + one_over_dist = 0.0; supersample = SUPERSAMPLE; supersample2 = SQR (supersample); @@ -558,20 +584,37 @@ size_y = (max_y - min_y) * supersample; size_x = (max_x - min_x) * supersample; - min_scanlines = (gint *) malloc (sizeof (gint) * size_y); - max_scanlines = (gint *) malloc (sizeof (gint) * size_y); + min_scanlines = min_scanlines_iter = (gint *) malloc (sizeof (gint) * size_y); + max_scanlines = max_scanlines_iter = (gint *) malloc (sizeof (gint) * size_y); for (i = 0; i < size_y; i++) { min_scanlines[i] = max_x * supersample; max_scanlines[i] = min_x * supersample; } - for (i = 0; i < poly->npts; i++) - { - xs = (gint) ((i) ? poly->pts[i-1].x : poly->pts[poly->npts-1].x); - ys = (gint) ((i) ? poly->pts[i-1].y : poly->pts[poly->npts-1].y); - xe = (gint) poly->pts[i].x; - ye = (gint) poly->pts[i].y; + if(poly->npts) { + gint poly_npts = poly->npts; + Vertex *curptr; + + xs = (gint) (poly->pts[poly_npts-1].x); + ys = (gint) (poly->pts[poly_npts-1].y); + xe = (gint) poly->pts[0].x; + ye = (gint) poly->pts[0].y; + + xs *= supersample; + ys *= supersample; + xe *= supersample; + ye *= supersample; + + convert_segment (xs, ys, xe, ye, min_y * supersample, + min_scanlines, max_scanlines); + + for(i = 1, curptr = &poly->pts[0]; i < poly_npts; i++) { + xs = (gint) curptr->x; + ys = (gint) curptr->y; + curptr++; + xe = (gint) curptr->x; + ye = (gint) curptr->y; xs *= supersample; ys *= supersample; @@ -581,20 +624,22 @@ convert_segment (xs, ys, xe, ye, min_y * supersample, min_scanlines, max_scanlines); } + } gimp_pixel_rgn_init (&src_rgn, drawable, 0, 0, drawable->width, drawable->height, TRUE, TRUE); vals = (gint *) malloc (sizeof (gint) * size_x); - for (i = 0; i < size_y; i++) + for (i = 0; i < size_y; i++, min_scanlines_iter++, max_scanlines_iter++) { - if (! (i % supersample)) + if (! (i % supersample)) { memset (vals, 0, sizeof (gint) * size_x); + } - yy = (gdouble) i / (gdouble) supersample + min_y; + yy = (gdouble)i / (gdouble)supersample + min_y; - for (j = min_scanlines[i]; j < max_scanlines[i]; j++) + for (j = *min_scanlines_iter; j < *max_scanlines_iter; j++) { x = j - min_x * supersample; vals[x] += 255; @@ -612,21 +657,37 @@ if (x >= x1 && x < x2) { - val = 0; - for (k = 0; k < supersample; k++) - val += vals[j + k]; + for (val = 0, vals_iter = &vals[j], + vals_end = &vals_iter[supersample]; + vals_iter < vals_end; + vals_iter++) + val += *vals_iter; + val /= supersample2; if (val > 0) { xx = (gdouble) j / (gdouble) supersample + min_x; - alpha = (gint) (val * calc_alpha_blend (vec, dist, xx - sx, yy - sy)); + alpha = (gint) (val * calc_alpha_blend (vec, one_over_dist, xx - sx, yy - sy)); gimp_pixel_rgn_get_pixel (&src_rgn, buf, x, y); +#ifndef USE_READABLE_BUT_SLOW_CODE + { + guchar *buf_iter = buf, + *col_iter = col, + *buf_end = buf+bytes; + + for(; buf_iter < buf_end; buf_iter++, col_iter++) + *buf_iter = ((guint)(*col_iter * alpha) + + (((guint)*buf_iter) + * (256 - alpha))) >> 8; + } +#else /* original, pre-ECL code */ for (b = 0; b < bytes; b++) buf[b] = ((col[b] * alpha) + (buf[b] * (255 - alpha))) / 255; +#endif gimp_pixel_rgn_set_pixel (&src_rgn, buf, x, y); } } @@ -671,27 +732,6 @@ xstart += xinc; } } -} - -static gdouble -calc_alpha_blend (gdouble *vec, - gdouble dist, - gdouble x, - gdouble y) -{ - gdouble r; - - if (!dist) - return 1.0; - else - { - r = (vec[1] * y + vec[0] * x) / dist; - if (r < 0.2) - r = 0.2; - else if (r > 1.0) - r = 1.0; - } - return r; } static void diff -ruN gimp-1.0.2/plug-ins/dbbrowser/Makefile.in gimp-1.0.3/plug-ins/dbbrowser/Makefile.in --- gimp-1.0.2/plug-ins/dbbrowser/Makefile.in Wed Oct 14 20:19:10 1998 +++ gimp-1.0.3/plug-ins/dbbrowser/Makefile.in Mon Mar 29 13:12:40 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -121,24 +124,16 @@ pluginlib_PROGRAMS = dbbrowser -dbbrowser_SOURCES = \ - dbbrowser.c \ - dbbrowser.h \ - dbbrowser_utils.c \ - dbbrowser_utils.h - -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la +dbbrowser_SOURCES = dbbrowser.c dbbrowser.h dbbrowser_utils.c dbbrowser_utils.h + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la + dbbrowser_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -155,24 +150,24 @@ dbbrowser_LDADD = $(LDADD) dbbrowser_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README INSTALL Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(dbbrowser_SOURCES) OBJECTS = $(dbbrowser_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/dbbrowser/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -194,15 +189,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -250,8 +245,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -279,9 +278,13 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done dbbrowser.o: dbbrowser.c dbbrowser.h ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h @@ -289,71 +292,80 @@ ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h dbbrowser.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/dbbrowser/dbbrowser_utils.c gimp-1.0.3/plug-ins/dbbrowser/dbbrowser_utils.c --- gimp-1.0.2/plug-ins/dbbrowser/dbbrowser_utils.c Mon Jul 13 20:46:06 1998 +++ gimp-1.0.3/plug-ins/dbbrowser/dbbrowser_utils.c Fri Mar 26 22:15:48 1999 @@ -17,11 +17,13 @@ */ -/* +/* dbbrowser_utils.c - 0.08 26th sept 97 by Thomas NOEL + 0.08 26th sept 97 by Thomas NOEL */ +#include + #include "dbbrowser_utils.h" GList *proc_table; @@ -41,49 +43,50 @@ GParamDef *selected_return_vals ) ) /* create the dialog box */ /* console_entry != NULL => called from the script-fu-console */ - + { - + dbbrowser_t* dbbrowser; - + GtkWidget *button; GtkWidget *hbox,*searchhbox,*vbox; GtkWidget *label; dbbrowser = (gpointer)malloc(sizeof(dbbrowser_t)); - + dbbrowser->apply_callback = apply_callback; - + /* the dialog box */ dbbrowser->dlg = gtk_dialog_new (); - + gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), "DB Browser (init)"); gtk_window_position (GTK_WINDOW (dbbrowser->dlg), GTK_WIN_POS_MOUSE); gtk_signal_connect (GTK_OBJECT (dbbrowser->dlg), "destroy", (GtkSignalFunc) dialog_close_callback, dbbrowser); - + /* hbox : left=list ; right=description */ - + hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dlg)->vbox), + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dlg)->vbox), hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); - + /* left = vbox : the list and the search entry */ - + vbox = gtk_vbox_new( FALSE, 0 ); - gtk_container_border_width (GTK_CONTAINER (vbox), 3); - gtk_box_pack_start (GTK_BOX (hbox), + gtk_container_border_width (GTK_CONTAINER (vbox), 3); + gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, TRUE, 0); gtk_widget_show(vbox); - + /* list : list in a scrolled_win */ - + dbbrowser->clist = gtk_clist_new(1); - gtk_clist_set_policy (GTK_CLIST (dbbrowser->clist), GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); + dbbrowser->scrolled_win = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dbbrowser->scrolled_win), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_clist_set_selection_mode (GTK_CLIST (dbbrowser->clist), GTK_SELECTION_BROWSE); @@ -91,9 +94,10 @@ gtk_signal_connect (GTK_OBJECT (dbbrowser->clist), "select_row", (GtkSignalFunc) procedure_select_callback, dbbrowser); - gtk_box_pack_start (GTK_BOX (vbox), - dbbrowser->clist, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), dbbrowser->scrolled_win, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (dbbrowser->scrolled_win), dbbrowser->clist); gtk_widget_show(dbbrowser->clist); + gtk_widget_show(dbbrowser->scrolled_win); /* search entry */ @@ -104,12 +108,12 @@ label = gtk_label_new("Search :"); gtk_misc_set_alignment( GTK_MISC(label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (searchhbox), + gtk_box_pack_start (GTK_BOX (searchhbox), label, TRUE, TRUE, 0); gtk_widget_show(label); dbbrowser->search_entry = gtk_entry_new(); - gtk_box_pack_start (GTK_BOX (searchhbox), + gtk_box_pack_start (GTK_BOX (searchhbox), dbbrowser->search_entry, TRUE, TRUE, 0); gtk_widget_show(dbbrowser->search_entry); @@ -117,10 +121,10 @@ dbbrowser->descr_scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dbbrowser->descr_scroll), - GTK_POLICY_ALWAYS, + GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS ); - gtk_box_pack_start (GTK_BOX (hbox), + gtk_box_pack_start (GTK_BOX (hbox), dbbrowser->descr_scroll, TRUE, TRUE, 0); gtk_widget_set_usize (dbbrowser->descr_scroll, DBL_WIDTH - DBL_LIST_WIDTH, 0); gtk_widget_show (dbbrowser->descr_scroll); @@ -133,7 +137,7 @@ GTK_WIDGET_SET_FLAGS (dbbrowser->name_button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (dbbrowser->name_button), "clicked", (GtkSignalFunc) dialog_search_callback, dbbrowser); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dlg)->action_area), + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dlg)->action_area), dbbrowser->name_button , TRUE, TRUE, 0); gtk_widget_show(dbbrowser->name_button); @@ -141,7 +145,7 @@ GTK_WIDGET_SET_FLAGS (dbbrowser->blurb_button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (dbbrowser->blurb_button), "clicked", (GtkSignalFunc) dialog_search_callback, dbbrowser); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dlg)->action_area), + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dlg)->action_area), dbbrowser->blurb_button , TRUE, TRUE, 0); gtk_widget_show(dbbrowser->blurb_button); @@ -150,7 +154,7 @@ GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) dialog_apply_callback, dbbrowser ); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dlg)->action_area), + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dlg)->action_area), button, TRUE, TRUE, 0); gtk_widget_show (button); } @@ -159,14 +163,14 @@ GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) dialog_close_callback, dbbrowser); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dlg)->action_area), + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dbbrowser->dlg)->action_area), button, TRUE, TRUE, 0); gtk_widget_show (button); /* now build the list */ - gtk_widget_show (dbbrowser->clist); + gtk_widget_show (dbbrowser->clist); gtk_widget_show (dbbrowser->dlg); /* initialize the "return" value (for "apply") */ @@ -194,8 +198,8 @@ static gint procedure_select_callback (GtkWidget *widget, - gint row, - gint column, + gint row, + gint column, GdkEventButton * bevent, gpointer data) { @@ -211,21 +215,21 @@ return FALSE; } -static void -dialog_select (dbbrowser_t *dbbrowser, +static void +dialog_select (dbbrowser_t *dbbrowser, gchar *proc_name) /* update the description box (right) */ { GtkWidget* label, *old_table; gint i,row=0; - - if (dbbrowser->selected_proc_name) + + if (dbbrowser->selected_proc_name) g_free(dbbrowser->selected_proc_name); dbbrowser->selected_proc_name = g_strdup(proc_name); if (dbbrowser->selected_scheme_proc_name) g_free(dbbrowser->selected_scheme_proc_name); - dbbrowser->selected_scheme_proc_name = + dbbrowser->selected_scheme_proc_name = g_strdup(proc_name); convert_string(dbbrowser->selected_scheme_proc_name); @@ -237,22 +241,22 @@ if (dbbrowser->selected_params) g_free(dbbrowser->selected_params); if (dbbrowser->selected_return_vals) g_free(dbbrowser->selected_return_vals); - gimp_query_procedure (proc_name, - &(dbbrowser->selected_proc_blurb), - &(dbbrowser->selected_proc_help), + gimp_query_procedure (proc_name, + &(dbbrowser->selected_proc_blurb), + &(dbbrowser->selected_proc_help), &(dbbrowser->selected_proc_author), - &(dbbrowser->selected_proc_copyright), - &(dbbrowser->selected_proc_date), - &(dbbrowser->selected_proc_type), + &(dbbrowser->selected_proc_copyright), + &(dbbrowser->selected_proc_date), + &(dbbrowser->selected_proc_type), &(dbbrowser->selected_nparams), - &(dbbrowser->selected_nreturn_vals), - &(dbbrowser->selected_params), + &(dbbrowser->selected_nreturn_vals), + &(dbbrowser->selected_params), &(dbbrowser->selected_return_vals)); /* save the "old" table */ old_table = dbbrowser->descr_table; - dbbrowser->descr_table = gtk_table_new( + dbbrowser->descr_table = gtk_table_new( 10 + dbbrowser->selected_nparams + dbbrowser->selected_nreturn_vals , 5 , FALSE ); @@ -261,7 +265,7 @@ /* show the name */ label = gtk_label_new("Name :"); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, 0, 1, row, row+1, GTK_FILL, GTK_FILL, 3, 6); gtk_widget_show(label); @@ -277,7 +281,7 @@ /* show the description */ label = gtk_label_new("Blurb :"); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, 0, 1, row, row+1, GTK_FILL, GTK_FILL, 3, 0); gtk_widget_show(label); @@ -296,19 +300,19 @@ row++; /* in parameters */ - if (dbbrowser->selected_nparams) + if (dbbrowser->selected_nparams) { label = gtk_label_new("In :"); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, - 0, 1, row, row+(dbbrowser->selected_nparams), + 0, 1, row, row+(dbbrowser->selected_nparams), GTK_FILL, GTK_FILL, 3, 0); gtk_widget_show(label); - for (i=0;i<(dbbrowser->selected_nparams);i++) + for (i=0;i<(dbbrowser->selected_nparams);i++) { /* name */ label = gtk_label_new((dbbrowser->selected_params[i]).name); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, 1, 2, row, row+1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show(label); @@ -326,12 +330,12 @@ gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, 3, 4, row, row+1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show(label); - + row++; } } - - if ((dbbrowser->selected_nparams) && + + if ((dbbrowser->selected_nparams) && (dbbrowser->selected_nreturn_vals)) { label = gtk_hseparator_new(); /* ok, not really a label ... :) */ gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, @@ -345,18 +349,18 @@ if (dbbrowser->selected_nreturn_vals) { label = gtk_label_new("Out :"); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, - 0, 1, row, row+(dbbrowser->selected_nreturn_vals), + 0, 1, row, row+(dbbrowser->selected_nreturn_vals), GTK_FILL, GTK_FILL, 3, 0); gtk_widget_show(label); - for (i=0;i<(dbbrowser->selected_nreturn_vals);i++) + for (i=0;i<(dbbrowser->selected_nreturn_vals);i++) { /* name */ label = gtk_label_new((dbbrowser->selected_return_vals[i]).name); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, - 1, 2, row, row+1, + 1, 2, row, row+1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show(label); @@ -364,15 +368,15 @@ label = gtk_label_new(GParamType2char((dbbrowser->selected_return_vals[i]).type)); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, - 2, 3, row, row+1, + 2, 3, row, row+1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show(label); /* description */ label = gtk_label_new((dbbrowser->selected_return_vals[i]).description); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, - 3, 4, row, row+1, + 3, 4, row, row+1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show(label); row++; @@ -382,7 +386,7 @@ /* show the author & the copyright */ - if ((dbbrowser->selected_nparams) || + if ((dbbrowser->selected_nparams) || (dbbrowser->selected_nreturn_vals)) { label = gtk_hseparator_new(); /* ok, not really a label ... :) */ gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, @@ -393,9 +397,9 @@ } label = gtk_label_new("Author :"); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, - 0, 1, row, row+1, + 0, 1, row, row+1, GTK_FILL, GTK_FILL, 3, 0); gtk_widget_show(label); @@ -406,11 +410,11 @@ GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show(label); row++; - + label = gtk_label_new("Date :"); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, - 0, 1, row, row+1, + 0, 1, row, row+1, GTK_FILL, GTK_FILL, 3, 0); gtk_widget_show(label); @@ -423,9 +427,9 @@ row++; label = gtk_label_new("Copyright :"); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, - 0, 1, row, row+1, + 0, 1, row, row+1, GTK_FILL, GTK_FILL, 3, 0); gtk_widget_show(label); @@ -439,9 +443,9 @@ /* label = gtk_label_new("Help :"); - gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_table_attach (GTK_TABLE (dbbrowser->descr_table), label, - 0, 1, row, row+1, + 0, 1, row, row+1, GTK_FILL, GTK_FILL, 3, 0); gtk_widget_show(label); @@ -449,13 +453,14 @@ if (old_table) gtk_widget_destroy(old_table); - gtk_container_add (GTK_CONTAINER (dbbrowser->descr_scroll), - dbbrowser->descr_table ); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (dbbrowser->descr_scroll), + dbbrowser->descr_table); + gtk_widget_show(dbbrowser->descr_table); } static void -dialog_close_callback (GtkWidget *widget, +dialog_close_callback (GtkWidget *widget, gpointer data) /* end of the dialog */ { @@ -472,8 +477,8 @@ } } -static void -dialog_apply_callback (GtkWidget *widget, +static void +dialog_apply_callback (GtkWidget *widget, gpointer data) /* end of the dialog */ { @@ -493,8 +498,8 @@ dbbrowser->selected_return_vals ); } -static void -dialog_search_callback (GtkWidget *widget, +static void +dialog_search_callback (GtkWidget *widget, gpointer data) /* search in the whole db */ { @@ -510,9 +515,9 @@ /* search */ - if ( widget == (dbbrowser->name_button) ) + if ( widget == (dbbrowser->name_button) ) { - gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), + gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), "DB Browser (by name - please wait)"); query = g_string_new (""); @@ -529,24 +534,24 @@ } gimp_query_database (query->str, - ".*", ".*", ".*", ".*", ".*", ".*", + ".*", ".*", ".*", ".*", ".*", ".*", &num_procs, &proc_list); g_string_free (query, TRUE); } else if ( widget == (dbbrowser->blurb_button) ) { - gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), + gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), "DB Browser (by blurb - please wait)"); - gimp_query_database (".*", + gimp_query_database (".*", gtk_entry_get_text( GTK_ENTRY(dbbrowser->search_entry) ), ".*", ".*", ".*", ".*", ".*", &num_procs, &proc_list); } else { - gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), + gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), "DB Browser (please wait)"); - gimp_query_database (".*", ".*", ".*", ".*", ".*", ".*", ".*", + gimp_query_database (".*", ".*", ".*", ".*", ".*", ".*", ".*", &num_procs, &proc_list); } @@ -562,7 +567,7 @@ gtk_clist_insert (GTK_CLIST (GTK_CLIST(dbbrowser->clist)), j, &label); func_name = g_strdup (proc_list[i]); - + gtk_clist_set_row_data_full(GTK_CLIST(dbbrowser->clist), j, func_name, g_free); } @@ -576,7 +581,7 @@ if (num_procs != 0) { gchar *insert_name, *label_name; int i,j,savej; - + for (i = 0; i < num_procs ; i++) { insert_name=g_strdup(proc_list[0]); savej=0; @@ -587,7 +592,7 @@ savej=j; } } - + proc_list[savej][0]='\255'; label_name = g_strdup( insert_name ); @@ -600,14 +605,14 @@ } } */ - + if ( dbbrowser->clist ) { ; } - + g_free( proc_list ); - gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), + gtk_window_set_title (GTK_WINDOW (dbbrowser->dlg), "DB Browser"); gtk_clist_thaw(GTK_CLIST(dbbrowser->clist)); @@ -615,7 +620,7 @@ /* utils ... */ -static void +static void convert_string (char *str) { while (*str) @@ -625,7 +630,7 @@ } } -static char* +static char* GParamType2char(GParamType t) { switch (t) { diff -ruN gimp-1.0.2/plug-ins/dbbrowser/dbbrowser_utils.h gimp-1.0.3/plug-ins/dbbrowser/dbbrowser_utils.h --- gimp-1.0.2/plug-ins/dbbrowser/dbbrowser_utils.h Sun Apr 12 22:41:37 1998 +++ gimp-1.0.3/plug-ins/dbbrowser/dbbrowser_utils.h Thu Mar 11 18:17:03 1999 @@ -17,9 +17,9 @@ */ -/* +/* dbbrowser_utils.h - 0.08 26th sept 97 by Thomas NOEL + 0.08 26th sept 97 by Thomas NOEL */ /* configuration */ @@ -51,6 +51,7 @@ GtkWidget* descr_table; GtkWidget* clist; + GtkWidget* scrolled_win; /* the currently selected procedure */ gchar *selected_proc_name; @@ -64,7 +65,7 @@ int selected_nparams; int selected_nreturn_vals; GParamDef *selected_params; - GParamDef *selected_return_vals; + GParamDef *selected_return_vals; void (*apply_callback) ( gchar *selected_proc_name, gchar *selected_scheme_proc_name, @@ -88,27 +89,26 @@ static gint procedure_select_callback (GtkWidget *widget, - gint row, - gint column, + gint row, + gint column, GdkEventButton * bevent, gpointer data); static void -dialog_search_callback(GtkWidget *, +dialog_search_callback(GtkWidget *, gpointer); static void -dialog_select(dbbrowser_t *dbbrowser, +dialog_select(dbbrowser_t *dbbrowser, gchar *proc_name); static void -dialog_close_callback(GtkWidget *, +dialog_close_callback(GtkWidget *, gpointer); -static void +static void convert_string (gchar *str); -static gchar* +static gchar* GParamType2char(GParamType t); - diff -ruN gimp-1.0.2/plug-ins/decompose/Makefile.in gimp-1.0.3/plug-ins/decompose/Makefile.in --- gimp-1.0.2/plug-ins/decompose/Makefile.in Wed Oct 14 20:21:10 1998 +++ gimp-1.0.3/plug-ins/decompose/Makefile.in Mon Mar 29 13:13:13 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = decompose -decompose_SOURCES = \ - decompose.c +decompose_SOURCES = decompose.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la decompose_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ decompose_LDADD = $(LDADD) decompose_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(decompose_SOURCES) OBJECTS = $(decompose_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/decompose/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done decompose.o: decompose.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/deinterlace/Makefile.am gimp-1.0.3/plug-ins/deinterlace/Makefile.am --- gimp-1.0.2/plug-ins/deinterlace/Makefile.am Sun Aug 30 16:23:13 1998 +++ gimp-1.0.3/plug-ins/deinterlace/Makefile.am Thu Jan 21 16:20:37 1999 @@ -5,7 +5,7 @@ pluginlib_PROGRAMS = deinterlace deinterlace_SOURCES = \ - deinterlace.c $(top_srcdir)/plug-ins/megawidget/megawidget.h + deinterlace.c INCLUDES = \ $(X_CFLAGS) \ diff -ruN gimp-1.0.2/plug-ins/deinterlace/Makefile.in gimp-1.0.3/plug-ins/deinterlace/Makefile.in --- gimp-1.0.2/plug-ins/deinterlace/Makefile.in Wed Oct 14 20:21:14 1998 +++ gimp-1.0.3/plug-ins/deinterlace/Makefile.in Mon Mar 29 13:13:14 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,24 +122,17 @@ pluginlib_PROGRAMS = deinterlace -deinterlace_SOURCES = \ - deinterlace.c $(top_srcdir)/plug-ins/megawidget/megawidget.h +deinterlace_SOURCES = deinterlace.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la deinterlace_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -153,24 +149,24 @@ deinterlace_LDADD = $(LDADD) deinterlace_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(deinterlace_SOURCES) OBJECTS = $(deinterlace_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/deinterlace/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -192,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -248,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -277,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done deinterlace.o: deinterlace.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ ../../plug-ins/megawidget/megawidget.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/depthmerge/Makefile.in gimp-1.0.3/plug-ins/depthmerge/Makefile.in --- gimp-1.0.2/plug-ins/depthmerge/Makefile.in Wed Oct 14 20:21:18 1998 +++ gimp-1.0.3/plug-ins/depthmerge/Makefile.in Mon Mar 29 13:13:15 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = depthmerge -depthmerge_SOURCES = \ - depthmerge.c +depthmerge_SOURCES = depthmerge.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la depthmerge_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ depthmerge_LDADD = $(LDADD) depthmerge_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(depthmerge_SOURCES) OBJECTS = $(depthmerge_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/depthmerge/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done depthmerge.o: depthmerge.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ ../../libgimp/gimpui.h ../../libgimp/gimpmenu.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/despeckle/Makefile.in gimp-1.0.3/plug-ins/despeckle/Makefile.in --- gimp-1.0.2/plug-ins/despeckle/Makefile.in Wed Oct 14 20:21:22 1998 +++ gimp-1.0.3/plug-ins/despeckle/Makefile.in Mon Mar 29 13:13:16 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = despeckle -despeckle_SOURCES = \ - despeckle.c +despeckle_SOURCES = despeckle.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la despeckle_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ despeckle_LDADD = $(LDADD) despeckle_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(despeckle_SOURCES) OBJECTS = $(despeckle_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/despeckle/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done despeckle.o: despeckle.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ ../../libgimp/gimpui.h ../../libgimp/gimpmenu.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/destripe/Makefile.in gimp-1.0.3/plug-ins/destripe/Makefile.in --- gimp-1.0.2/plug-ins/destripe/Makefile.in Wed Oct 14 20:21:25 1998 +++ gimp-1.0.3/plug-ins/destripe/Makefile.in Mon Mar 29 13:13:17 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = destripe -destripe_SOURCES = \ - destripe.c +destripe_SOURCES = destripe.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la destripe_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ destripe_LDADD = $(LDADD) destripe_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(destripe_SOURCES) OBJECTS = $(destripe_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/destripe/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done destripe.o: destripe.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ ../../libgimp/gimpmenu.h ../../config.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/diffraction/Makefile.in gimp-1.0.3/plug-ins/diffraction/Makefile.in --- gimp-1.0.2/plug-ins/diffraction/Makefile.in Wed Oct 14 20:21:29 1998 +++ gimp-1.0.3/plug-ins/diffraction/Makefile.in Mon Mar 29 13:13:18 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = diffraction -diffraction_SOURCES = \ - diffraction.c +diffraction_SOURCES = diffraction.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la diffraction_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ diffraction_LDADD = $(LDADD) diffraction_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(diffraction_SOURCES) OBJECTS = $(diffraction_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/diffraction/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done diffraction.o: diffraction.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/displace/Makefile.in gimp-1.0.3/plug-ins/displace/Makefile.in --- gimp-1.0.2/plug-ins/displace/Makefile.in Wed Oct 14 20:21:33 1998 +++ gimp-1.0.3/plug-ins/displace/Makefile.in Mon Mar 29 13:13:19 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = displace -displace_SOURCES = \ - displace.c +displace_SOURCES = displace.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la displace_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ displace_LDADD = $(LDADD) displace_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(displace_SOURCES) OBJECTS = $(displace_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/displace/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done displace.o: displace.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ ../../libgimp/gimpmenu.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/edge/Makefile.in gimp-1.0.3/plug-ins/edge/Makefile.in --- gimp-1.0.2/plug-ins/edge/Makefile.in Wed Oct 14 20:21:37 1998 +++ gimp-1.0.3/plug-ins/edge/Makefile.in Mon Mar 29 13:13:20 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = edge -edge_SOURCES = \ - edge.c +edge_SOURCES = edge.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la edge_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ edge_LDADD = $(LDADD) edge_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(edge_SOURCES) OBJECTS = $(edge_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/edge/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done edge.o: edge.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ ../../libgimp/gimpmenu.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/emboss/Makefile.am gimp-1.0.3/plug-ins/emboss/Makefile.am --- gimp-1.0.2/plug-ins/emboss/Makefile.am Sun Aug 30 16:23:55 1998 +++ gimp-1.0.3/plug-ins/emboss/Makefile.am Thu Jan 21 16:20:38 1999 @@ -5,7 +5,7 @@ pluginlib_PROGRAMS = emboss emboss_SOURCES = \ - emboss.c $(top_srcdir)/plug-ins/megawidget/megawidget.h + emboss.c INCLUDES = \ $(X_CFLAGS) \ diff -ruN gimp-1.0.2/plug-ins/emboss/Makefile.in gimp-1.0.3/plug-ins/emboss/Makefile.in --- gimp-1.0.2/plug-ins/emboss/Makefile.in Wed Oct 14 20:21:40 1998 +++ gimp-1.0.3/plug-ins/emboss/Makefile.in Mon Mar 29 13:13:21 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,24 +122,17 @@ pluginlib_PROGRAMS = emboss -emboss_SOURCES = \ - emboss.c $(top_srcdir)/plug-ins/megawidget/megawidget.h +emboss_SOURCES = emboss.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la emboss_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -153,24 +149,24 @@ emboss_LDADD = $(LDADD) emboss_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(emboss_SOURCES) OBJECTS = $(emboss_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/emboss/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -192,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -248,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -277,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done emboss.o: emboss.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h \ ../../plug-ins/megawidget/megawidget.h ../../config.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/engrave/Makefile.in gimp-1.0.3/plug-ins/engrave/Makefile.in --- gimp-1.0.2/plug-ins/engrave/Makefile.in Wed Oct 14 20:21:48 1998 +++ gimp-1.0.3/plug-ins/engrave/Makefile.in Mon Mar 29 13:13:22 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = engrave -engrave_SOURCES = \ - engrave.c +engrave_SOURCES = engrave.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la engrave_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ engrave_LDADD = $(LDADD) engrave_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(engrave_SOURCES) OBJECTS = $(engrave_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/engrave/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done engrave.o: engrave.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/exchange/Makefile.in gimp-1.0.3/plug-ins/exchange/Makefile.in --- gimp-1.0.2/plug-ins/exchange/Makefile.in Wed Oct 14 20:21:54 1998 +++ gimp-1.0.3/plug-ins/exchange/Makefile.in Mon Mar 29 13:13:23 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = exchange -exchange_SOURCES = \ - exchange.c +exchange_SOURCES = exchange.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la exchange_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ exchange_LDADD = $(LDADD) exchange_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(exchange_SOURCES) OBJECTS = $(exchange_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/exchange/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done exchange.o: exchange.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/faxg3/Makefile.in gimp-1.0.3/plug-ins/faxg3/Makefile.in --- gimp-1.0.2/plug-ins/faxg3/Makefile.in Wed Oct 14 20:21:59 1998 +++ gimp-1.0.3/plug-ins/faxg3/Makefile.in Mon Mar 29 13:13:24 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = faxg3 -faxg3_SOURCES = \ - faxg3.c g3.c g3.h run_tbl.c +faxg3_SOURCES = faxg3.c g3.c g3.h run_tbl.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la faxg3_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ faxg3_LDADD = $(LDADD) faxg3_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(faxg3_SOURCES) OBJECTS = $(faxg3_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/faxg3/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,80 +277,93 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done faxg3.o: faxg3.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h g3.h g3.o: g3.c g3.h run_tbl.o: run_tbl.c -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/faxg3/faxg3.c gimp-1.0.3/plug-ins/faxg3/faxg3.c --- gimp-1.0.2/plug-ins/faxg3/faxg3.c Sun Apr 12 22:41:49 1998 +++ gimp-1.0.3/plug-ins/faxg3/faxg3.c Mon Mar 29 11:39:28 1999 @@ -24,6 +24,7 @@ #define VERSION "0.6" #include +#include #include #include #include diff -ruN gimp-1.0.2/plug-ins/film/Makefile.in gimp-1.0.3/plug-ins/film/Makefile.in --- gimp-1.0.2/plug-ins/film/Makefile.in Wed Oct 14 20:22:04 1998 +++ gimp-1.0.3/plug-ins/film/Makefile.in Mon Mar 29 13:13:25 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = film -film_SOURCES = \ - film.c +film_SOURCES = film.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la film_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ film_LDADD = $(LDADD) film_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(film_SOURCES) OBJECTS = $(film_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/film/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done film.o: film.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/film/film.c gimp-1.0.3/plug-ins/film/film.c --- gimp-1.0.2/plug-ins/film/film.c Sat Apr 18 11:42:24 1998 +++ gimp-1.0.3/plug-ins/film/film.c Mon Mar 15 10:25:21 1999 @@ -1165,7 +1165,7 @@ list = gtk_list_new (); gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_MULTIPLE); gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_BROWSE); - gtk_container_add (GTK_CONTAINER (scrolled_win), list); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win), list); gtk_widget_show (list); for (i = 0; i < n; i++) diff -ruN gimp-1.0.2/plug-ins/fits/Makefile.in gimp-1.0.3/plug-ins/fits/Makefile.in --- gimp-1.0.2/plug-ins/fits/Makefile.in Wed Oct 14 20:22:08 1998 +++ gimp-1.0.3/plug-ins/fits/Makefile.in Mon Mar 29 13:13:26 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = fits -fits_SOURCES = \ - fits.c fitsrw.c fitsrw.h +fits_SOURCES = fits.c fitsrw.c fitsrw.h + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la fits_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ fits_LDADD = $(LDADD) fits_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(fits_SOURCES) OBJECTS = $(fits_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/fits/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done fits.o: fits.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h fitsrw.h fitsrw.o: fitsrw.c fitsrw.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/flame/Makefile.in gimp-1.0.3/plug-ins/flame/Makefile.in --- gimp-1.0.2/plug-ins/flame/Makefile.in Wed Oct 14 20:22:12 1998 +++ gimp-1.0.3/plug-ins/flame/Makefile.in Mon Mar 29 13:13:27 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,23 +122,17 @@ 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 +flame_SOURCES = 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) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) $(LIBUCB_LIB) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - $(LIBUCB_LIB) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la flame_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -152,24 +149,24 @@ flame_LDADD = $(LDADD) flame_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(flame_SOURCES) OBJECTS = $(flame_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/flame/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -191,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -247,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -276,9 +277,13 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done cmap.o: cmap.c cmap.h ../../config.h flame.o: flame.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ @@ -291,71 +296,80 @@ megawidget.h rect.o: rect.c rect.h libifs.h cmap.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/flame/megawidget.c gimp-1.0.3/plug-ins/flame/megawidget.c --- gimp-1.0.2/plug-ins/flame/megawidget.c Mon Nov 24 14:05:18 1997 +++ gimp-1.0.3/plug-ins/flame/megawidget.c Mon Mar 29 11:39:30 1999 @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: megawidget.c,v 1.1.1.1 1997/11/24 22:05:18 sopwith Exp $ */ + * $Id: megawidget.c,v 1.1.1.1.8.1 1999/03/29 19:39:30 yosh Exp $ */ /* Functions added by Xavier Bouchoux (Xavier.Bouchoux@ensimag.imag.fr) * mw_value_radio_group_new() @@ -42,6 +42,8 @@ */ +#include +#include #include #include diff -ruN gimp-1.0.2/plug-ins/flarefx/Makefile.in gimp-1.0.3/plug-ins/flarefx/Makefile.in --- gimp-1.0.2/plug-ins/flarefx/Makefile.in Wed Oct 14 20:22:16 1998 +++ gimp-1.0.3/plug-ins/flarefx/Makefile.in Mon Mar 29 13:13:28 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = flarefx -flarefx_SOURCES = \ - flarefx.c +flarefx_SOURCES = flarefx.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la flarefx_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ flarefx_LDADD = $(LDADD) flarefx_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(flarefx_SOURCES) OBJECTS = $(flarefx_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/flarefx/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done flarefx.o: flarefx.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/flarefx/flarefx.c gimp-1.0.3/plug-ins/flarefx/flarefx.c --- gimp-1.0.2/plug-ins/flarefx/flarefx.c Mon Apr 13 01:49:21 1998 +++ gimp-1.0.3/plug-ins/flarefx/flarefx.c Mon Mar 29 11:39:33 1999 @@ -35,6 +35,7 @@ */ +#include #include #include #include "libgimp/gimp.h" diff -ruN gimp-1.0.2/plug-ins/fractaltrace/Makefile.in gimp-1.0.3/plug-ins/fractaltrace/Makefile.in --- gimp-1.0.2/plug-ins/fractaltrace/Makefile.in Wed Oct 14 20:22:20 1998 +++ gimp-1.0.3/plug-ins/fractaltrace/Makefile.in Mon Mar 29 13:13:29 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = fractaltrace -fractaltrace_SOURCES = \ - fractaltrace.c +fractaltrace_SOURCES = fractaltrace.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la fractaltrace_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ fractaltrace_LDADD = $(LDADD) fractaltrace_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(fractaltrace_SOURCES) OBJECTS = $(fractaltrace_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/fractaltrace/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done fractaltrace.o: fractaltrace.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/fractaltrace/fractaltrace.c gimp-1.0.3/plug-ins/fractaltrace/fractaltrace.c --- gimp-1.0.2/plug-ins/fractaltrace/fractaltrace.c Sun Aug 23 18:31:37 1998 +++ gimp-1.0.3/plug-ins/fractaltrace/fractaltrace.c Mon Mar 29 11:39:37 1999 @@ -28,6 +28,7 @@ /******************************************************************************/ +#include #include #include #include diff -ruN gimp-1.0.2/plug-ins/gauss_iir/Makefile.in gimp-1.0.3/plug-ins/gauss_iir/Makefile.in --- gimp-1.0.2/plug-ins/gauss_iir/Makefile.in Wed Oct 14 20:22:24 1998 +++ gimp-1.0.3/plug-ins/gauss_iir/Makefile.in Mon Mar 29 13:13:30 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = gauss_iir -gauss_iir_SOURCES = \ - gauss_iir.c +gauss_iir_SOURCES = gauss_iir.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la gauss_iir_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ gauss_iir_LDADD = $(LDADD) gauss_iir_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gauss_iir_SOURCES) OBJECTS = $(gauss_iir_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gauss_iir/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done gauss_iir.o: gauss_iir.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/gauss_rle/Makefile.in gimp-1.0.3/plug-ins/gauss_rle/Makefile.in --- gimp-1.0.2/plug-ins/gauss_rle/Makefile.in Wed Oct 14 20:22:27 1998 +++ gimp-1.0.3/plug-ins/gauss_rle/Makefile.in Mon Mar 29 13:13:31 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = gauss_rle -gauss_rle_SOURCES = \ - gauss_rle.c +gauss_rle_SOURCES = gauss_rle.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la gauss_rle_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ gauss_rle_LDADD = $(LDADD) gauss_rle_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gauss_rle_SOURCES) OBJECTS = $(gauss_rle_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gauss_rle/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done gauss_rle.o: gauss_rle.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/gbr/Makefile.in gimp-1.0.3/plug-ins/gbr/Makefile.in --- gimp-1.0.2/plug-ins/gbr/Makefile.in Wed Oct 14 20:22:35 1998 +++ gimp-1.0.3/plug-ins/gbr/Makefile.in Mon Mar 29 13:13:32 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = gbr -gbr_SOURCES = \ - gbr.c +gbr_SOURCES = gbr.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la gbr_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ gbr_LDADD = $(LDADD) gbr_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gbr_SOURCES) OBJECTS = $(gbr_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gbr/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done gbr.o: gbr.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../app/brush_header.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/gee/Makefile.in gimp-1.0.3/plug-ins/gee/Makefile.in --- gimp-1.0.2/plug-ins/gee/Makefile.in Wed Oct 14 20:22:43 1998 +++ gimp-1.0.3/plug-ins/gee/Makefile.in Mon Mar 29 13:13:33 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = gee -gee_SOURCES = \ - gee.c +gee_SOURCES = gee.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la gee_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ gee_LDADD = $(LDADD) gee_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gee_SOURCES) OBJECTS = $(gee_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gee/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done gee.o: gee.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../config.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/gfig/Makefile.in gimp-1.0.3/plug-ins/gfig/Makefile.in --- gimp-1.0.2/plug-ins/gfig/Makefile.in Wed Oct 14 20:22:53 1998 +++ gimp-1.0.3/plug-ins/gfig/Makefile.in Mon Mar 29 13:13:34 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -121,22 +124,17 @@ pluginlib_PROGRAMS = gfig -gfig_SOURCES = \ - gfig.c pix_data.h +gfig_SOURCES = gfig.c pix_data.h + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la gfig_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -153,24 +151,24 @@ gfig_LDADD = $(LDADD) gfig_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = README Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gfig_SOURCES) OBJECTS = $(gfig_OBJECTS) -all: all-recursive all-am - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gfig/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -192,15 +190,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -258,41 +256,65 @@ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) tags); \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ done; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ @@ -317,91 +339,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ done gfig.o: gfig.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h pix_data.h +info-am: info: info-recursive +dvi-am: dvi: dvi-recursive -check: all-am - $(MAKE) check-recursive +check-am: all-am +check: check-recursive +installcheck-am: installcheck: installcheck-recursive -all-am: Makefile $(PROGRAMS) +install-exec-am: +install-exec: install-exec-recursive install-data-am: install-pluginlibPROGRAMS +install-data: install-data-recursive +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-recursive uninstall-am: uninstall-pluginlibPROGRAMS - -install-exec: install-exec-recursive - @$(NORMAL_INSTALL) - -install-data: install-data-recursive install-data-am - @$(NORMAL_INSTALL) - -install: install-recursive install-data-am - @: - -uninstall: uninstall-recursive uninstall-am - +uninstall: uninstall-recursive +all-am: Makefile $(PROGRAMS) +all-redirect: all-recursive install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) +installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic +mostlyclean: mostlyclean-recursive + clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ clean-tags clean-generic mostlyclean-am +clean: clean-recursive + distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ clean-am + -rm -f libtool + +distclean: distclean-recursive maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ distclean-am - -mostlyclean: mostlyclean-recursive mostlyclean-am - -clean: clean-recursive clean-am - -distclean: distclean-recursive distclean-am - -rm -f config.status - -rm -f libtool - -maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-recursive + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ @@ -413,11 +435,12 @@ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck all-am install-data-am uninstall-am install-exec \ -install-data install uninstall all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean .PHONY: files diff -ruN gimp-1.0.2/plug-ins/gfig/gfig-examples/Makefile.am gimp-1.0.3/plug-ins/gfig/gfig-examples/Makefile.am --- gimp-1.0.2/plug-ins/gfig/gfig-examples/Makefile.am Thu Mar 19 18:39:22 1998 +++ gimp-1.0.3/plug-ins/gfig/gfig-examples/Makefile.am Thu Jan 21 16:20:40 1999 @@ -17,7 +17,6 @@ -EXTRA_DATA = EXTRA_DIST = $(gfigdata_DATA) files: diff -ruN gimp-1.0.2/plug-ins/gfig/gfig-examples/Makefile.in gimp-1.0.3/plug-ins/gfig/gfig-examples/Makefile.in --- gimp-1.0.2/plug-ins/gfig/gfig-examples/Makefile.in Wed Oct 14 20:22:59 1998 +++ gimp-1.0.3/plug-ins/gfig/gfig-examples/Makefile.in Mon Mar 29 13:13:34 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -117,19 +120,9 @@ gfigdatadir = $(gimpdatadir)/gfig -gfigdata_DATA = \ - A_star \ - curves \ - polys \ - ring \ - ring+star \ - simily \ - spirals_and_stars \ - sprial \ - star2 \ - stars +gfigdata_DATA = A_star curves polys ring ring+star simily spirals_and_stars sprial star2 stars + -EXTRA_DATA = EXTRA_DIST = $(gfigdata_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -142,11 +135,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: Makefile $(DATA) - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gfig/gfig-examples/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -183,61 +175,74 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-gfigdataDATA - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-gfigdataDATA - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-gfigdataDATA +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-gfigdataDATA +uninstall: uninstall-am +all-am: Makefile $(DATA) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(gfigdatadir) + $(mkinstalldirs) $(DESTDIR)$(gfigdatadir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-generic +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am -clean: clean-generic mostlyclean +clean-am: clean-generic mostlyclean-am -distclean: distclean-generic clean - -rm -f config.status +clean: clean-am + +distclean-am: distclean-generic clean-am -rm -f libtool -maintainer-clean: maintainer-clean-generic distclean +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: uninstall-gfigdataDATA install-gfigdataDATA tags distdir info \ -dvi installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean: maintainer-clean-am + +.PHONY: uninstall-gfigdataDATA install-gfigdataDATA tags distdir info-am \ +info dvi-am dvi check check-am installcheck-am installcheck \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/gfig/gfig.c gimp-1.0.3/plug-ins/gfig/gfig.c --- gimp-1.0.2/plug-ins/gfig/gfig.c Thu Apr 23 19:18:41 1998 +++ gimp-1.0.3/plug-ins/gfig/gfig.c Mon Mar 29 11:39:39 1999 @@ -47,6 +47,7 @@ */ #include +#include #include #include #include @@ -1661,6 +1662,107 @@ gint transparent; } _GdkPixmapColor; +static gchar* +my_gdk_pixmap_skip_whitespaces (gchar *buffer) +{ + gint32 index = 0; + + while (buffer[index] != 0 && (buffer[index] == 0x20 || buffer[index] == 0x09)) + index++; + + return &buffer[index]; +} + +static gchar* +my_gdk_pixmap_skip_string (gchar *buffer) +{ + gint32 index = 0; + + while (buffer[index] != 0 && buffer[index] != 0x20 && buffer[index] != 0x09) + index++; + + return &buffer[index]; +} + +/* Xlib crashed ince at a color name lengths around 125 */ +#define MAX_COLOR_LEN 120 + +static gchar* +my_gdk_pixmap_extract_color (gchar *buffer) +{ + gint counter, numnames; + gchar *ptr = NULL, ch, temp[128]; + gchar color[MAX_COLOR_LEN], *retcol; + gint space; + + counter = 0; + while (ptr == NULL) + { + if (buffer[counter] == 'c') + { + ch = buffer[counter + 1]; + if (ch == 0x20 || ch == 0x09) + ptr = &buffer[counter + 1]; + } + else if (buffer[counter] == 0) + return NULL; + + counter++; + } + + ptr = my_gdk_pixmap_skip_whitespaces (ptr); + + if (ptr[0] == 0) + return NULL; + else if (ptr[0] == '#') + { + counter = 1; + while (ptr[counter] != 0 && + ((ptr[counter] >= '0' && ptr[counter] <= '9') || + (ptr[counter] >= 'a' && ptr[counter] <= 'f') || + (ptr[counter] >= 'A' && ptr[counter] <= 'F'))) + counter++; + + retcol = g_new (gchar, counter+1); + strncpy (retcol, ptr, counter); + + retcol[counter] = 0; + + return retcol; + } + + color[0] = 0; + numnames = 0; + + space = MAX_COLOR_LEN - 1; + while (space > 0) + { + sscanf (ptr, "%127s", temp); + + if (((gint)ptr[0] == 0) || + (strcmp ("s", temp) == 0) || (strcmp ("m", temp) == 0) || + (strcmp ("g", temp) == 0) || (strcmp ("g4", temp) == 0)) + { + break; + } + else + { + if (numnames > 0) + { + space -= 1; + strcat (color, " "); + } + strncat (color, temp, space); + space -= MIN (space, strlen (temp)); + ptr = my_gdk_pixmap_skip_string (ptr); + ptr = my_gdk_pixmap_skip_whitespaces (ptr); + numnames++; + } + } + + retcol = g_strdup (color); + return retcol; +} GdkPixmap* my_gdk_pixmap_create_from_xpm_d (GdkWindow *window, @@ -1704,7 +1806,7 @@ if (color_name != NULL) g_free (color_name); - color_name = (gchar *)gdk_pixmap_extract_color (&buffer[cpp]); + color_name = (gchar *)my_gdk_pixmap_extract_color (&buffer[cpp]); if (color_name != NULL) { @@ -3427,8 +3529,8 @@ list = gtk_list_new (); gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_SINGLE); - gtk_container_add (GTK_CONTAINER (scrolled_win), list); - gtk_widget_show (list); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win), + list); gtk_table_attach(GTK_TABLE(table), list_frame, 0, 4, 1, 5, GTK_FILL|GTK_EXPAND , GTK_FILL|GTK_EXPAND, 0, 0); /* Get brush list and insert in table */ @@ -4191,7 +4293,7 @@ gfig_gtk_list = list = gtk_list_new (); /* gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_MULTIPLE); */ gtk_list_set_selection_mode (GTK_LIST (list), GTK_SELECTION_BROWSE); - gtk_container_add (GTK_CONTAINER (scrolled_win), list); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win), list); gtk_widget_show (list); /* Load saved objects */ @@ -4257,44 +4359,6 @@ gtk_widget_set_sensitive(GTK_WIDGET(y_pos_label),enable); } -void -my_gtk_label_set2 (GtkLabel *label, - const char *str) -{ - gtk_label_set(label,str); - gtk_container_need_resize (GTK_CONTAINER (gtk_widget_get_toplevel (GTK_WIDGET(label)))); -} - -void -my_gtk_label_set (GtkLabel *label, - const char *str) -{ - char* p; - g_return_if_fail (label != NULL); - g_return_if_fail (GTK_IS_LABEL (label)); - g_return_if_fail (str != NULL); - if (label->label) - g_free (label->label); - label->label = g_strdup (str); - if (label->row) - g_slist_free (label->row); - label->row = NULL; - label->row = g_slist_append (label->row, label->label); - p = label->label; - while ((p = strchr(p, '\n'))) - label->row = g_slist_append (label->row, ++p); - if (GTK_WIDGET_VISIBLE (label)) - { - gdk_window_clear_area (GTK_WIDGET (label)->window, - GTK_WIDGET (label)->allocation.x, - GTK_WIDGET (label)->allocation.y, - GTK_WIDGET (label)->allocation.width, - GTK_WIDGET (label)->allocation.height); - gtk_widget_draw(GTK_WIDGET(label),NULL); - } -} - - static void gfig_pos_update_labels(gpointer data) { @@ -4308,14 +4372,14 @@ else sprintf(buf," X: %.3d ",x_pos_val); - my_gtk_label_set(GTK_LABEL(x_pos_label),buf); + gtk_label_set_text(GTK_LABEL(x_pos_label),buf); if(y_pos_val < 0) sprintf(buf," Y:%.3d ",y_pos_val); else sprintf(buf," Y: %.3d ",y_pos_val); - my_gtk_label_set(GTK_LABEL(y_pos_label),buf); + gtk_label_set_text(GTK_LABEL(y_pos_label),buf); } static void @@ -4345,7 +4409,7 @@ static gchar buf[256]; sprintf(buf,"%6d",sz); - my_gtk_label_set(GTK_LABEL(obj_size_label),buf); + gtk_label_set(GTK_LABEL(obj_size_label),buf); } static GtkWidget * diff -ruN gimp-1.0.2/plug-ins/gfli/Makefile.in gimp-1.0.3/plug-ins/gfli/Makefile.in --- gimp-1.0.2/plug-ins/gfli/Makefile.in Wed Oct 14 20:23:04 1998 +++ gimp-1.0.3/plug-ins/gfli/Makefile.in Mon Mar 29 13:13:36 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,24 +122,17 @@ pluginlib_PROGRAMS = gfli -gfli_SOURCES = \ - fli.h \ - fli.c \ - gfli.c - -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la +gfli_SOURCES = fli.h fli.c gfli.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la + gfli_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -153,24 +149,24 @@ gfli_LDADD = $(LDADD) gfli_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gfli_SOURCES) OBJECTS = $(gfli_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gfli/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -192,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -248,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -277,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done fli.o: fli.c fli.h gfli.o: gfli.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h fli.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/gicon/Makefile.in gimp-1.0.3/plug-ins/gicon/Makefile.in --- gimp-1.0.2/plug-ins/gicon/Makefile.in Wed Oct 14 20:23:09 1998 +++ gimp-1.0.3/plug-ins/gicon/Makefile.in Mon Mar 29 13:13:37 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = gicon -gicon_SOURCES = \ - gicon.c +gicon_SOURCES = gicon.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la gicon_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ gicon_LDADD = $(LDADD) gicon_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gicon_SOURCES) OBJECTS = $(gicon_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gicon/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done gicon.o: gicon.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/gif/Makefile.in gimp-1.0.3/plug-ins/gif/Makefile.in --- gimp-1.0.2/plug-ins/gif/Makefile.in Wed Oct 14 20:23:14 1998 +++ gimp-1.0.3/plug-ins/gif/Makefile.in Mon Mar 29 13:13:38 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = gif -gif_SOURCES = \ - gif.c +gif_SOURCES = gif.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la gif_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ gif_LDADD = $(LDADD) gif_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gif_SOURCES) OBJECTS = $(gif_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gif/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done gif.o: gif.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/glasstile/Makefile.in gimp-1.0.3/plug-ins/glasstile/Makefile.in --- gimp-1.0.2/plug-ins/glasstile/Makefile.in Wed Oct 14 20:23:20 1998 +++ gimp-1.0.3/plug-ins/glasstile/Makefile.in Mon Mar 29 13:13:39 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = glasstile -glasstile_SOURCES = \ - glasstile.c +glasstile_SOURCES = glasstile.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la glasstile_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ glasstile_LDADD = $(LDADD) glasstile_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(glasstile_SOURCES) OBJECTS = $(glasstile_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/glasstile/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done glasstile.o: glasstile.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/gpc/Makefile.in gimp-1.0.3/plug-ins/gpc/Makefile.in --- gimp-1.0.2/plug-ins/gpc/Makefile.in Wed Oct 14 20:19:05 1998 +++ gimp-1.0.3/plug-ins/gpc/Makefile.in Mon Mar 29 13:12:39 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,28 +122,23 @@ pluginlib_LIBRARIES = libgpc.a -libgpc_a_SOURCES = \ - gpc.c gpc.h +libgpc_a_SOURCES = gpc.c gpc.h + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la libgpc_a_DEPENDENCIES = $(DEPS) -EXTRA_DIST=gpc.3 gpc.man +EXTRA_DIST = gpc.3 gpc.man -man_MANS=gpc.3 +man_MANS = gpc.3 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = @@ -155,9 +153,10 @@ libgpc_a_OBJECTS = gpc.o AR = ar CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ man3dir = $(mandir)/man3 MANS = $(man_MANS) @@ -168,15 +167,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(libgpc_a_SOURCES) OBJECTS = $(libgpc_a_OBJECTS) -all: Makefile $(LIBRARIES) $(MANS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gpc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -196,7 +194,7 @@ install-pluginlibLIBRARIES: $(pluginlib_LIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) - list='$(pluginlib_LIBRARIES)'; for p in $$list; do \ + @list='$(pluginlib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pluginlibdir)/$$p"; \ $(INSTALL_DATA) $$p $(DESTDIR)$(pluginlibdir)/$$p; \ @@ -293,16 +291,20 @@ done install-man: $(MANS) @$(NORMAL_INSTALL) - $(MAKE) install-man3 + $(MAKE) $(AM_MAKEFLAGS) install-man3 uninstall-man: @$(NORMAL_UNINSTALL) - $(MAKE) uninstall-man3 + $(MAKE) $(AM_MAKEFLAGS) uninstall-man3 tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -330,69 +332,80 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done gpc.o: gpc.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibLIBRARIES install-man - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibLIBRARIES uninstall-man - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibLIBRARIES install-man +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibLIBRARIES uninstall-man +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) $(MANS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibLIBRARIES clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibLIBRARIES distclean-compile \ +distclean-am: distclean-pluginlibLIBRARIES distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibLIBRARIES \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibLIBRARIES distclean-pluginlibLIBRARIES \ clean-pluginlibLIBRARIES maintainer-clean-pluginlibLIBRARIES \ uninstall-pluginlibLIBRARIES install-pluginlibLIBRARIES \ @@ -400,10 +413,12 @@ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool install-man3 uninstall-man3 \ install-man uninstall-man tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info dvi installcheck \ -install-exec install-data install uninstall all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ +check-am installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean .PHONY: files diff -ruN gimp-1.0.2/plug-ins/gqbist/Makefile.in gimp-1.0.3/plug-ins/gqbist/Makefile.in --- gimp-1.0.2/plug-ins/gqbist/Makefile.in Wed Oct 14 20:23:27 1998 +++ gimp-1.0.3/plug-ins/gqbist/Makefile.in Mon Mar 29 13:13:40 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = gqbist -gqbist_SOURCES = \ - gqbist.c +gqbist_SOURCES = gqbist.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la gqbist_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ gqbist_LDADD = $(LDADD) gqbist_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gqbist_SOURCES) OBJECTS = $(gqbist_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gqbist/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done gqbist.o: gqbist.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/gradmap/Makefile.in gimp-1.0.3/plug-ins/gradmap/Makefile.in --- gimp-1.0.2/plug-ins/gradmap/Makefile.in Wed Oct 14 20:23:41 1998 +++ gimp-1.0.3/plug-ins/gradmap/Makefile.in Mon Mar 29 13:13:41 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = gradmap -gradmap_SOURCES = \ - gradmap.c +gradmap_SOURCES = gradmap.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la gradmap_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ gradmap_LDADD = $(LDADD) gradmap_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gradmap_SOURCES) OBJECTS = $(gradmap_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gradmap/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done gradmap.o: gradmap.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/grid/Makefile.in gimp-1.0.3/plug-ins/grid/Makefile.in --- gimp-1.0.2/plug-ins/grid/Makefile.in Wed Oct 14 20:23:52 1998 +++ gimp-1.0.3/plug-ins/grid/Makefile.in Mon Mar 29 13:13:42 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = grid -grid_SOURCES = \ - grid.c +grid_SOURCES = grid.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la grid_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ grid_LDADD = $(LDADD) grid_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(grid_SOURCES) OBJECTS = $(grid_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/grid/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done grid.o: grid.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/gtm/Makefile.in gimp-1.0.3/plug-ins/gtm/Makefile.in --- gimp-1.0.2/plug-ins/gtm/Makefile.in Wed Oct 14 20:24:01 1998 +++ gimp-1.0.3/plug-ins/gtm/Makefile.in Mon Mar 29 13:13:43 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = gtm -gtm_SOURCES = \ - gtm.c +gtm_SOURCES = gtm.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la gtm_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ gtm_LDADD = $(LDADD) gtm_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gtm_SOURCES) OBJECTS = $(gtm_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gtm/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done gtm.o: gtm.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/gz/Makefile.in gimp-1.0.3/plug-ins/gz/Makefile.in --- gimp-1.0.2/plug-ins/gz/Makefile.in Wed Oct 14 20:24:08 1998 +++ gimp-1.0.3/plug-ins/gz/Makefile.in Mon Mar 29 13:13:44 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = gz -gz_SOURCES = \ - gz.c +gz_SOURCES = gz.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la gz_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ gz_LDADD = $(LDADD) gz_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(gz_SOURCES) OBJECTS = $(gz_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gz/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done gz.o: gz.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/header/Makefile.in gimp-1.0.3/plug-ins/header/Makefile.in --- gimp-1.0.2/plug-ins/header/Makefile.in Wed Oct 14 20:24:15 1998 +++ gimp-1.0.3/plug-ins/header/Makefile.in Mon Mar 29 13:13:45 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = header -header_SOURCES = \ - header.c +header_SOURCES = header.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la header_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ header_LDADD = $(LDADD) header_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(header_SOURCES) OBJECTS = $(header_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/header/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done header.o: header.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/hot/Makefile.am gimp-1.0.3/plug-ins/hot/Makefile.am --- gimp-1.0.2/plug-ins/hot/Makefile.am Sun Aug 30 16:25:53 1998 +++ gimp-1.0.3/plug-ins/hot/Makefile.am Thu Jan 21 16:20:41 1999 @@ -5,7 +5,7 @@ pluginlib_PROGRAMS = hot hot_SOURCES = \ - hot.c $(top_srcdir)/plug-ins/megawidget/megawidget.h + hot.c INCLUDES = \ $(X_CFLAGS) \ diff -ruN gimp-1.0.2/plug-ins/hot/Makefile.in gimp-1.0.3/plug-ins/hot/Makefile.in --- gimp-1.0.2/plug-ins/hot/Makefile.in Wed Oct 14 20:24:22 1998 +++ gimp-1.0.3/plug-ins/hot/Makefile.in Mon Mar 29 13:13:46 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,24 +122,17 @@ pluginlib_PROGRAMS = hot -hot_SOURCES = \ - hot.c $(top_srcdir)/plug-ins/megawidget/megawidget.h +hot_SOURCES = hot.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la hot_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -153,24 +149,24 @@ hot_LDADD = $(LDADD) hot_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(hot_SOURCES) OBJECTS = $(hot_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/hot/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -192,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -248,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -277,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done hot.o: hot.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h \ ../../plug-ins/megawidget/megawidget.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/hot/hot.c gimp-1.0.3/plug-ins/hot/hot.c --- gimp-1.0.2/plug-ins/hot/hot.c Sun Mar 22 12:44:22 1998 +++ gimp-1.0.3/plug-ins/hot/hot.c Mon Mar 29 11:39:44 1999 @@ -1,7 +1,7 @@ /* * file: hot/hot.c * - * $Id: hot.c,v 1.7 1998/03/22 20:44:22 adrian Exp $ + * $Id: hot.c,v 1.7.6.1 1999/03/29 19:39:44 yosh Exp $ */ /* @@ -64,6 +64,7 @@ * */ #include +#include #include #include #include diff -ruN gimp-1.0.2/plug-ins/hrz/Makefile.in gimp-1.0.3/plug-ins/hrz/Makefile.in --- gimp-1.0.2/plug-ins/hrz/Makefile.in Wed Oct 14 20:24:28 1998 +++ gimp-1.0.3/plug-ins/hrz/Makefile.in Mon Mar 29 13:13:47 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = hrz -hrz_SOURCES = \ - hrz.c +hrz_SOURCES = hrz.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la hrz_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ hrz_LDADD = $(LDADD) hrz_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(hrz_SOURCES) OBJECTS = $(hrz_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/hrz/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done hrz.o: hrz.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/ifscompose/Makefile.in gimp-1.0.3/plug-ins/ifscompose/Makefile.in --- gimp-1.0.2/plug-ins/ifscompose/Makefile.in Wed Oct 14 20:24:35 1998 +++ gimp-1.0.3/plug-ins/ifscompose/Makefile.in Mon Mar 29 13:13:48 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = ifscompose -ifscompose_SOURCES = \ - ifscompose.c ifscompose.h ifscompose_utils.c +ifscompose_SOURCES = ifscompose.c ifscompose.h ifscompose_utils.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la ifscompose_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ ifscompose_LDADD = $(LDADD) ifscompose_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(ifscompose_SOURCES) OBJECTS = $(ifscompose_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/ifscompose/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,9 +277,13 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done ifscompose.o: ifscompose.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ @@ -286,71 +292,80 @@ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ ifscompose.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/ifscompose/ifscompose.c gimp-1.0.3/plug-ins/ifscompose/ifscompose.c --- gimp-1.0.2/plug-ins/ifscompose/ifscompose.c Sun Apr 12 22:42:23 1998 +++ gimp-1.0.3/plug-ins/ifscompose/ifscompose.c Thu Mar 11 18:17:06 1999 @@ -521,7 +521,7 @@ GTK_FILL, GTK_FILL, 4, 0); gtk_widget_show(label); - ifsD->scale_pair = value_pair_create(&ifsD->current_vals.scale, 0.0,1.0, + ifsD->scale_pair = value_pair_create(&ifsD->current_vals.scale, 0.0,1.0, FALSE, VALUE_PAIR_DOUBLE); gtk_table_attach(GTK_TABLE(table), ifsD->scale_pair->entry,3,4,0,1, GTK_FILL,GTK_FILL,4,0); @@ -1052,7 +1052,7 @@ gtk_main (); gtk_object_unref (GTK_OBJECT (ifsDesign->op_menu)); - + if (dlg) gtk_widget_destroy (dlg); @@ -1104,16 +1104,15 @@ design_op_menu_create(GtkWidget *window) { GtkWidget *menu_item; - GtkAcceleratorTable *accelerator_table; + GtkAccelGroup *accel_group; ifsDesign->op_menu = gtk_menu_new(); gtk_object_ref (GTK_OBJECT (ifsDesign->op_menu)); gtk_object_sink (GTK_OBJECT (ifsDesign->op_menu)); - accelerator_table = gtk_accelerator_table_new(); - gtk_menu_set_accelerator_table(GTK_MENU(ifsDesign->op_menu), - accelerator_table); - gtk_window_add_accelerator_table(GTK_WINDOW(window),accelerator_table); + accel_group = gtk_accel_group_new(); + gtk_menu_set_accel_group(GTK_MENU(ifsDesign->op_menu), accel_group); + gtk_window_add_accel_group(GTK_WINDOW(window),accel_group); menu_item = gtk_menu_item_new_with_label("Move"); gtk_menu_append(GTK_MENU(ifsDesign->op_menu),menu_item); @@ -1121,9 +1120,11 @@ gtk_signal_connect(GTK_OBJECT(menu_item),"activate", (GtkSignalFunc)design_op_update_callback, (gpointer)((long)OP_TRANSLATE)); - gtk_widget_install_accelerator(menu_item, - accelerator_table, - "activate",'M',0); + gtk_widget_add_accelerator(menu_item, + "activate", + accel_group, + 'M', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); menu_item = gtk_menu_item_new_with_label("Rotate/Scale"); gtk_menu_append(GTK_MENU(ifsDesign->op_menu),menu_item); @@ -1131,9 +1132,11 @@ gtk_signal_connect(GTK_OBJECT(menu_item),"activate", (GtkSignalFunc)design_op_update_callback, (gpointer)((long)OP_ROTATE)); - gtk_widget_install_accelerator(menu_item, - accelerator_table, - "activate",'R',0); + gtk_widget_add_accelerator(menu_item, + "activate", + accel_group, + 'R', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); menu_item = gtk_menu_item_new_with_label("Stretch"); gtk_menu_append(GTK_MENU(ifsDesign->op_menu),menu_item); @@ -1141,10 +1144,11 @@ gtk_signal_connect(GTK_OBJECT(menu_item),"activate", (GtkSignalFunc)design_op_update_callback, (gpointer)((long)OP_STRETCH)); - gtk_widget_install_accelerator(menu_item, - accelerator_table, - "activate",'S',0); - + gtk_widget_add_accelerator(menu_item, + "activate", + accel_group, + 'S', 0, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); /* A separator */ menu_item = gtk_menu_item_new(); gtk_menu_append(GTK_MENU(ifsDesign->op_menu),menu_item); @@ -1156,9 +1160,11 @@ gtk_signal_connect(GTK_OBJECT(menu_item),"activate", (GtkSignalFunc)design_area_select_all_callback, NULL); - gtk_widget_install_accelerator(menu_item, - accelerator_table, - "activate",'A',GDK_CONTROL_MASK); + gtk_widget_add_accelerator(menu_item, + "activate", + accel_group, + 'A', GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); menu_item = gtk_menu_item_new_with_label("Recompute Center"); gtk_menu_append(GTK_MENU(ifsDesign->op_menu),menu_item); @@ -1166,9 +1172,11 @@ gtk_signal_connect(GTK_OBJECT(menu_item),"activate", (GtkSignalFunc)recompute_center_cb, NULL); - gtk_widget_install_accelerator(menu_item, - accelerator_table, - "activate",'R',GDK_MOD1_MASK); + gtk_widget_add_accelerator(menu_item, + "activate", + accel_group, + 'R', GDK_MOD1_MASK, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); menu_item = gtk_menu_item_new_with_label("Undo"); gtk_menu_append(GTK_MENU(ifsDesign->op_menu),menu_item); @@ -1176,9 +1184,11 @@ gtk_signal_connect(GTK_OBJECT(menu_item),"activate", (GtkSignalFunc)undo, NULL); - gtk_widget_install_accelerator(menu_item, - accelerator_table, - "activate",'Z',GDK_CONTROL_MASK); + gtk_widget_add_accelerator(menu_item, + "activate", + accel_group, + 'Z', GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); menu_item = gtk_menu_item_new_with_label("Redo"); gtk_menu_append(GTK_MENU(ifsDesign->op_menu),menu_item); @@ -1186,9 +1196,11 @@ gtk_signal_connect(GTK_OBJECT(menu_item),"activate", (GtkSignalFunc)redo, NULL); - gtk_widget_install_accelerator(menu_item, - accelerator_table, - "activate",'R',GDK_CONTROL_MASK); + gtk_widget_add_accelerator(menu_item, + "activate", + accel_group, + 'R', GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); } static void @@ -1845,7 +1857,7 @@ { AffElement *elem; /* initialize */ - + elem = NULL; if (!undo_ring[(undo_start+undo_cur)%UNDO_LEVELS].elements[el]) @@ -2343,7 +2355,7 @@ gtk_object_unref (GTK_OBJECT (value_pair->scale)); gtk_object_unref (value_pair->adjustment); } - + static void design_op_callback (GtkWidget *widget, gpointer data) { diff -ruN gimp-1.0.2/plug-ins/illusion/Makefile.in gimp-1.0.3/plug-ins/illusion/Makefile.in --- gimp-1.0.2/plug-ins/illusion/Makefile.in Wed Oct 14 20:24:40 1998 +++ gimp-1.0.3/plug-ins/illusion/Makefile.in Mon Mar 29 13:13:49 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = illusion -illusion_SOURCES = \ - illusion.c +illusion_SOURCES = illusion.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la illusion_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ illusion_LDADD = $(LDADD) illusion_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(illusion_SOURCES) OBJECTS = $(illusion_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/illusion/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done illusion.o: illusion.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/iwarp/Makefile.in gimp-1.0.3/plug-ins/iwarp/Makefile.in --- gimp-1.0.2/plug-ins/iwarp/Makefile.in Wed Oct 14 20:24:46 1998 +++ gimp-1.0.3/plug-ins/iwarp/Makefile.in Mon Mar 29 13:13:50 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = iwarp -iwarp_SOURCES = \ - iwarp.c +iwarp_SOURCES = iwarp.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la iwarp_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ iwarp_LDADD = $(LDADD) iwarp_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(iwarp_SOURCES) OBJECTS = $(iwarp_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/iwarp/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done iwarp.o: iwarp.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/jpeg/Makefile.in gimp-1.0.3/plug-ins/jpeg/Makefile.in --- gimp-1.0.2/plug-ins/jpeg/Makefile.in Wed Oct 14 20:19:29 1998 +++ gimp-1.0.3/plug-ins/jpeg/Makefile.in Mon Mar 29 13:12:45 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,23 +122,17 @@ pluginlib_PROGRAMS = jpeg -jpeg_SOURCES = \ - jpeg.c +jpeg_SOURCES = jpeg.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) @LIBJPEG_LIB@ + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBJPEG_LIB@ - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la jpeg_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -152,24 +149,24 @@ jpeg_LDADD = $(LDADD) jpeg_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(jpeg_SOURCES) OBJECTS = $(jpeg_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/jpeg/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -191,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -247,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -276,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done jpeg.o: jpeg.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/laplace/Makefile.in gimp-1.0.3/plug-ins/laplace/Makefile.in --- gimp-1.0.2/plug-ins/laplace/Makefile.in Wed Oct 14 20:24:51 1998 +++ gimp-1.0.3/plug-ins/laplace/Makefile.in Mon Mar 29 13:13:51 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = laplace -laplace_SOURCES = \ - laplace.c +laplace_SOURCES = laplace.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la laplace_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ laplace_LDADD = $(LDADD) laplace_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(laplace_SOURCES) OBJECTS = $(laplace_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/laplace/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done laplace.o: laplace.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/libgck/ChangeLog gimp-1.0.3/plug-ins/libgck/ChangeLog --- gimp-1.0.2/plug-ins/libgck/ChangeLog Thu Mar 19 18:39:35 1998 +++ gimp-1.0.3/plug-ins/libgck/ChangeLog Mon Mar 15 10:25:27 1999 @@ -1,3 +1,6 @@ +Mon Mar 15 13:08:43 1999 Owen Taylor + +* gtk_scrolled_window_add_with_viewport() change GCK changes (post 0.02) ======================= diff -ruN gimp-1.0.2/plug-ins/libgck/Makefile.in gimp-1.0.3/plug-ins/libgck/Makefile.in --- gimp-1.0.2/plug-ins/libgck/Makefile.in Wed Oct 14 20:18:49 1998 +++ gimp-1.0.3/plug-ins/libgck/Makefile.in Mon Mar 29 13:12:36 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -129,11 +132,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: all-recursive all-am - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/libgck/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -154,41 +156,65 @@ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) tags); \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ done; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ @@ -213,84 +239,90 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ done +info-am: info: info-recursive +dvi-am: dvi: dvi-recursive -check: all-am - $(MAKE) check-recursive +check-am: all-am +check: check-recursive +installcheck-am: installcheck: installcheck-recursive -all-am: Makefile - +install-exec-am: install-exec: install-exec-recursive - @$(NORMAL_INSTALL) +install-data-am: install-data: install-data-recursive - @$(NORMAL_INSTALL) +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive - @: - +uninstall-am: uninstall: uninstall-recursive - +all-am: Makefile +all-redirect: all-recursive install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive +installdirs-am: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-tags mostlyclean-generic +mostlyclean: mostlyclean-recursive + clean-am: clean-tags clean-generic mostlyclean-am +clean: clean-recursive + distclean-am: distclean-tags distclean-generic clean-am + -rm -f libtool + +distclean: distclean-recursive maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ distclean-am - -mostlyclean: mostlyclean-recursive mostlyclean-am - -clean: clean-recursive clean-am - -distclean: distclean-recursive distclean-am - -rm -f config.status - -rm -f libtool - -maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-recursive + .PHONY: install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ uninstalldirs-recursive all-recursive check-recursive \ installcheck-recursive info-recursive dvi-recursive \ mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck all-am install-exec install-data install uninstall all \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/libgck/gck/Makefile.in gimp-1.0.3/plug-ins/libgck/gck/Makefile.in --- gimp-1.0.2/plug-ins/libgck/gck/Makefile.in Wed Oct 14 20:18:53 1998 +++ gimp-1.0.3/plug-ins/libgck/gck/Makefile.in Mon Mar 29 13:12:37 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,30 +122,16 @@ lib_LTLIBRARIES = libgck.la -libgck_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 +libgck_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 + libgck_la_LDFLAGS = -version-info $(GIMP_MAJOR_VERSION):$(GIMP_MINOR_VERSION):0 -INCLUDES = \ - -I.. \ - -I$(srcdir)/.. \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) +INCLUDES = -I.. -I$(srcdir)/.. $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = @@ -157,9 +146,10 @@ libgck_la_OBJECTS = gckcolor.lo gcklistbox.lo gckmath.lo gckui.lo \ gckvector.lo CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ HEADERS = $(gckinclude_HEADERS) DIST_COMMON = Makefile.am Makefile.in @@ -168,15 +158,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(libgck_la_SOURCES) OBJECTS = $(libgck_la_OBJECTS) -all: Makefile $(LTLIBRARIES) $(HEADERS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/libgck/gck/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -198,8 +187,8 @@ $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ + echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done @@ -268,8 +257,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -297,82 +290,95 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -gckcolor.lo gckcolor.o: gckcolor.c ../gck/gck.h ../gck/gckcommon.h \ +gckcolor.lo gckcolor.o : gckcolor.c ../gck/gck.h ../gck/gckcommon.h \ ../gck/gcktypes.h ../gck/gckcolor.h ../gck/gckmath.h \ ../gck/gckvector.h ../gck/gckui.h ../gck/gcklistbox.h -gcklistbox.lo gcklistbox.o: gcklistbox.c ../gck/gck.h ../gck/gckcommon.h \ - ../gck/gcktypes.h ../gck/gckcolor.h ../gck/gckmath.h \ - ../gck/gckvector.h ../gck/gckui.h ../gck/gcklistbox.h -gckmath.lo gckmath.o: gckmath.c gck.h ../gck/gckcommon.h \ +gcklistbox.lo gcklistbox.o : gcklistbox.c ../gck/gck.h \ + ../gck/gckcommon.h ../gck/gcktypes.h ../gck/gckcolor.h \ + ../gck/gckmath.h ../gck/gckvector.h ../gck/gckui.h \ + ../gck/gcklistbox.h +gckmath.lo gckmath.o : gckmath.c gck.h ../gck/gckcommon.h \ ../gck/gcktypes.h ../gck/gckcolor.h ../gck/gck.h \ ../gck/gckmath.h ../gck/gckvector.h ../gck/gckui.h \ ../gck/gcklistbox.h -gckui.lo gckui.o: gckui.c ../gck/gckui.h ../gck/gck.h ../gck/gckcommon.h \ - ../gck/gcktypes.h ../gck/gckcolor.h ../gck/gckmath.h \ - ../gck/gckvector.h ../gck/gcklistbox.h -gckvector.lo gckvector.o: gckvector.c ../gck/gck.h ../gck/gckcommon.h \ +gckui.lo gckui.o : gckui.c ../gck/gckui.h ../gck/gck.h \ + ../gck/gckcommon.h ../gck/gcktypes.h ../gck/gckcolor.h \ + ../gck/gckmath.h ../gck/gckvector.h ../gck/gcklistbox.h +gckvector.lo gckvector.o : gckvector.c ../gck/gck.h ../gck/gckcommon.h \ ../gck/gcktypes.h ../gck/gckcolor.h ../gck/gckmath.h \ ../gck/gckvector.h ../gck/gckui.h ../gck/gcklistbox.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: install-libLTLIBRARIES - @$(NORMAL_INSTALL) - -install-data: install-gckincludeHEADERS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-libLTLIBRARIES uninstall-gckincludeHEADERS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: install-libLTLIBRARIES +install-exec: install-exec-am + +install-data-am: install-gckincludeHEADERS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-libLTLIBRARIES uninstall-gckincludeHEADERS +uninstall: uninstall-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(libdir) $(DATADIR)$(gckincludedir) + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(gckincludedir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-libLTLIBRARIES mostlyclean-compile \ +mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ + clean-generic mostlyclean-am -distclean: distclean-libLTLIBRARIES distclean-compile distclean-libtool \ - distclean-tags distclean-generic clean - -rm -f config.status +clean: clean-am + +distclean-am: distclean-libLTLIBRARIES distclean-compile \ + distclean-libtool distclean-tags distclean-generic \ + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-libLTLIBRARIES \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ @@ -380,10 +386,12 @@ mostlyclean-libtool distclean-libtool clean-libtool \ maintainer-clean-libtool uninstall-gckincludeHEADERS \ install-gckincludeHEADERS tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info dvi installcheck \ -install-exec install-data install uninstall all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ +check-am installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean .PHONY: files diff -ruN gimp-1.0.2/plug-ins/libgck/gck/gckcolor.c gimp-1.0.3/plug-ins/libgck/gck/gckcolor.c --- gimp-1.0.2/plug-ins/libgck/gck/gckcolor.c Sun Apr 12 22:42:33 1998 +++ gimp-1.0.3/plug-ins/libgck/gck/gckcolor.c Sun Nov 8 18:26:41 1998 @@ -2963,7 +2963,7 @@ /* Copy samples from top row to block */ /* ================================== */ - for (xtt = 0, xt = x * sub_pixel_size; xtt < (sub_pixel_size + 1); xtt++, xt++) + for (xtt = 0, xt = (x - x1) * sub_pixel_size; xtt < (sub_pixel_size + 1); xtt++, xt++) block[0][xtt] = top_row[xt]; /* Render pixel on (x, y) */ @@ -2977,9 +2977,9 @@ /* Copy block information to rows */ /* ============================== */ - top_row[(x + 1) * sub_pixel_size] = block[0][sub_pixel_size]; + top_row[(x - x1 + 1) * sub_pixel_size] = block[0][sub_pixel_size]; - for (xtt = 0, xt = x * sub_pixel_size; xtt < (sub_pixel_size + 1); xtt++, xt++) + for (xtt = 0, xt = (x - x1) * sub_pixel_size; xtt < (sub_pixel_size + 1); xtt++, xt++) bot_row[xt] = block[sub_pixel_size][xtt]; /* Swap first and last columns */ diff -ruN gimp-1.0.2/plug-ins/libgck/gck/gcklistbox.c gimp-1.0.3/plug-ins/libgck/gck/gcklistbox.c --- gimp-1.0.2/plug-ins/libgck/gck/gcklistbox.c Sun Apr 12 22:42:37 1998 +++ gimp-1.0.3/plug-ins/libgck/gck/gcklistbox.c Mon Mar 15 10:25:32 1999 @@ -844,7 +844,7 @@ listbox->list=gtk_list_new(); gtk_list_set_selection_mode(GTK_LIST(listbox->list),selection_mode); - gtk_container_add(GTK_CONTAINER(listbox->widget),listbox->list); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(listbox->widget),listbox->list); gtk_object_set_data(GTK_OBJECT(listbox->list),"_GckListBox",(gpointer)listbox); gtk_widget_show(listbox->list); diff -ruN gimp-1.0.2/plug-ins/libgck/gck/gcktypes.h gimp-1.0.3/plug-ins/libgck/gck/gcktypes.h --- gimp-1.0.2/plug-ins/libgck/gck/gcktypes.h Sun Apr 12 22:42:41 1998 +++ gimp-1.0.3/plug-ins/libgck/gck/gcktypes.h Sun Mar 14 11:23:17 1999 @@ -119,7 +119,7 @@ { GtkWidget *widget; GtkStyle *style; - GtkAcceleratorTable *accelerator_table; + GtkAccelGroup *accelerator_group; GckVisualInfo *visinfo; } GckApplicationWindow; diff -ruN gimp-1.0.2/plug-ins/libgck/gck/gckui.c gimp-1.0.3/plug-ins/libgck/gck/gckui.c --- gimp-1.0.2/plug-ins/libgck/gck/gckui.c Sun Apr 12 22:42:42 1998 +++ gimp-1.0.3/plug-ins/libgck/gck/gckui.c Sun Mar 14 11:23:18 1999 @@ -134,9 +134,9 @@ /* Create application accelerator table */ /* ==================================== */ - - appwin->accelerator_table = gtk_accelerator_table_new(); - gtk_window_add_accelerator_table(GTK_WINDOW(appwin->widget),appwin->accelerator_table); + + appwin->accelerator_group = gtk_accel_group_new(); + gtk_window_add_accel_group(GTK_WINDOW(appwin->widget),appwin->accelerator_group); g_function_leave("gck_application_window_new"); return (appwin); @@ -194,7 +194,7 @@ dialog->okbutton=NULL; dialog->cancelbutton=NULL; dialog->helpbutton=NULL; - + if (ActionPos==GCK_TOP || ActionPos==GCK_BOTTOM) mainbox= gck_vbox_new(dialog->widget,FALSE,FALSE,FALSE,0,0,2); else @@ -281,13 +281,13 @@ GtkWidget *gck_vseparator_new(GtkWidget *container) { GtkWidget *separator; - + g_function_enter("gck_vseparator_new"); separator=gtk_vseparator_new(); if (container!=NULL) gtk_container_add(GTK_CONTAINER(container),separator); - + if (_GckAutoShowFlag==TRUE) gtk_widget_show(separator); @@ -302,13 +302,13 @@ GtkWidget *gck_hseparator_new(GtkWidget *container) { GtkWidget *separator; - + g_function_enter("gck_hseparator_new"); separator=gtk_hseparator_new(); if (container!=NULL) gtk_container_add(GTK_CONTAINER(container),separator); - + if (_GckAutoShowFlag==TRUE) gtk_widget_show(separator); g_function_leave("gck_hseparator_new"); @@ -379,7 +379,7 @@ return (label); } -GtkWidget *gck_label_aligned_new(char *name, GtkWidget * container, +GtkWidget *gck_label_aligned_new(char *name, GtkWidget * container, gdouble xalign, gdouble yalign) { GtkWidget *label; @@ -415,7 +415,7 @@ { GtkWidget *drawingarea; gint container_type; - + g_function_enter("gck_drawing_area_new"); drawingarea = gtk_drawing_area_new(); @@ -434,7 +434,7 @@ else gtk_container_add(GTK_CONTAINER(container), drawingarea); } - + if (_GckAutoShowFlag == TRUE) gtk_widget_show(drawingarea); @@ -594,14 +594,14 @@ hbox = gtk_hbox_new(FALSE, 0); if (container!=NULL) - { + { container_type=GTK_WIDGET_TYPE(container); if (container_type == gtk_vbox_get_type() || container_type == gtk_hbox_get_type()) gtk_box_pack_start(GTK_BOX(container), hbox, FALSE, FALSE, 0); else gtk_container_add(GTK_CONTAINER(container), hbox); } - + gtk_container_border_width(GTK_CONTAINER(hbox), 2); gtk_widget_show(hbox); @@ -625,9 +625,9 @@ if (_GckAutoShowFlag == TRUE && (container!=NULL || hbox!=NULL)) gtk_widget_show(entry); - + gtk_object_set_data(GTK_OBJECT(entry),"EntryLabel",(gpointer)label); - + g_function_leave("gck_entryfield_text_new"); return (entry); @@ -662,7 +662,7 @@ g_function_enter("gck_pushbutton_new"); button = gtk_button_new(); - + if (container!=NULL) { container_type=GTK_WIDGET_TYPE(container); @@ -702,7 +702,7 @@ g_function_enter("gck_pushbutton_pixmap_new"); button = gtk_button_new(); - + if (container!=NULL) { container_type=GTK_WIDGET_TYPE(container); @@ -730,7 +730,7 @@ gtk_widget_show(button); g_function_leave("gck_pushbutton_pixmap_new"); - return (button); + return (button); } GtkWidget *gck_togglebutton_pixmap_new(char *name, @@ -746,7 +746,7 @@ g_function_enter("gck_togglebutton_pixmap_new"); button = gtk_toggle_button_new(); - + if (container!=NULL) { container_type=GTK_WIDGET_TYPE(container); @@ -774,7 +774,7 @@ gtk_widget_show(button); g_function_leave("gck_togglebutton_pixmap_new"); - return (button); + return (button); } /********************************/ @@ -820,7 +820,7 @@ /* Create radio-button template */ /********************************/ -GtkWidget *gck_radiobutton_new(char *name, +GtkWidget *gck_radiobutton_new(char *name, GtkWidget *container, GtkWidget *previous, GtkSignalFunc status_changed_func) @@ -833,7 +833,7 @@ if (previous!=NULL) group=gtk_radio_button_group(GTK_RADIO_BUTTON(previous)); - + if (name==NULL) button = gtk_radio_button_new(group); else @@ -858,7 +858,7 @@ return (button); } -GtkWidget *gck_radiobutton_pixmap_new(char *name, +GtkWidget *gck_radiobutton_pixmap_new(char *name, GdkPixmap *pixm, GdkBitmap *mask, GtkWidget *container, @@ -872,7 +872,7 @@ if (previous != NULL) group=gtk_radio_button_group(GTK_RADIO_BUTTON(previous)); - + button = gtk_radio_button_new(group); gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(button),FALSE); @@ -920,7 +920,7 @@ g_function_enter("gck_vbox_new"); vbox = gtk_vbox_new(homogenous, spacing); - + if (container!=NULL) { container_type=GTK_WIDGET_TYPE(container); @@ -978,7 +978,7 @@ GtkWidget *gck_option_menu_new(char *name, GtkWidget *container, gint expand, gint fill, gint padding, - char *item_labels[], + char *item_labels[], GtkSignalFunc item_selected_func, gpointer data) { @@ -1036,7 +1036,7 @@ /******************/ GtkWidget *gck_menu_bar_new(GtkWidget *container,GckMenuItem menu_items[], - GtkAcceleratorTable *acc_table) + GtkAccelGroup *acc_group) { GtkWidget *menubar,*menu_item; gint container_type; @@ -1060,20 +1060,20 @@ { menu_item = gtk_menu_item_new_with_label(menu_items->label); gtk_container_add(GTK_CONTAINER(menubar),menu_item); - + gtk_object_set_data(GTK_OBJECT(menu_item),"_GckMenuItem",(gpointer)menu_items); - + if (menu_items->item_selected_func!=NULL) gtk_signal_connect(GTK_OBJECT(menu_item),"activate", (GtkSignalFunc)menu_items->item_selected_func,(gpointer)menu_item); - + if (menu_items->subitems!=NULL) gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), - gck_menu_new(menu_items->subitems,acc_table)); - + gck_menu_new(menu_items->subitems,acc_group)); + gtk_widget_show(menu_item); menu_items->widget = menu_item; - + menu_items++; } } @@ -1089,7 +1089,7 @@ /* Create menu */ /***************/ -GtkWidget *gck_menu_new(GckMenuItem *menu_items,GtkAcceleratorTable *acc_table) +GtkWidget *gck_menu_new(GckMenuItem *menu_items,GtkAccelGroup *acc_group) { GtkWidget *menu,*menu_item; gint i=0; @@ -1097,19 +1097,21 @@ g_function_enter("gck_menu_new"); menu = gtk_menu_new(); - + while (menu_items[i].label!=NULL) { if (menu_items[i].label[0] == '-') menu_item = gtk_menu_item_new(); - else + else { menu_item = gtk_menu_item_new_with_label(menu_items[i].label); - if (menu_items->accelerator_key && acc_table) - gtk_widget_install_accelerator(menu_item,acc_table, - menu_items[i].label, - menu_items[i].accelerator_key, - menu_items[i].accelerator_mods); + if (menu_items->accelerator_key && acc_group) + gtk_widget_add_accelerator(menu_item, + menu_items[i].label, + acc_group, + menu_items[i].accelerator_key, + menu_items[i].accelerator_mods, + GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED); gtk_object_set_data(GTK_OBJECT(menu_item),"_GckMenuItem",(gpointer)&menu_items[i]); @@ -1122,7 +1124,7 @@ if (menu_items[i].subitems!=NULL) gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), - gck_menu_new(menu_items[i].subitems,acc_table)); + gck_menu_new(menu_items[i].subitems,acc_group)); gtk_widget_show(menu_item); menu_items[i].widget = menu_item; diff -ruN gimp-1.0.2/plug-ins/libgck/gck/gckui.h gimp-1.0.3/plug-ins/libgck/gck/gckui.h --- gimp-1.0.2/plug-ins/libgck/gck/gckui.h Sun Apr 12 22:42:43 1998 +++ gimp-1.0.3/plug-ins/libgck/gck/gckui.h Sun Mar 14 11:23:19 1999 @@ -103,7 +103,7 @@ GtkWidget *previous, GtkSignalFunc status_changed_func); -GtkWidget *gck_radiobutton_pixmap_new (char *name, +GtkWidget *gck_radiobutton_pixmap_new (char *name, GdkPixmap *pixm, GdkBitmap *mask, GtkWidget *container, @@ -126,10 +126,10 @@ GtkWidget *gck_menu_bar_new (GtkWidget *container, GckMenuItem menu_items[], - GtkAcceleratorTable *acc_table); + GtkAccelGroup *acc_group); GtkWidget *gck_menu_new (GckMenuItem *menu_items, - GtkAcceleratorTable *acc_table); + GtkAccelGroup *acc_group); GtkWidget *gck_option_menu_new (char *name,GtkWidget *container, gint expand,gint fill, diff -ruN gimp-1.0.2/plug-ins/mail/Makefile.in gimp-1.0.3/plug-ins/mail/Makefile.in --- gimp-1.0.2/plug-ins/mail/Makefile.in Wed Oct 14 20:24:57 1998 +++ gimp-1.0.3/plug-ins/mail/Makefile.in Mon Mar 29 13:13:52 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,25 +122,20 @@ pluginlib_PROGRAMS = mail -mail_SOURCES = \ - mail.c +mail_SOURCES = mail.c -CPPFLAGS = \ - @MAILER@ -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la +CPPFLAGS = @MAILER@ + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la + mail_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -153,24 +151,24 @@ mail_LDADD = $(LDADD) mail_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(mail_SOURCES) OBJECTS = $(mail_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/mail/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -192,15 +190,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -248,8 +246,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -277,78 +279,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done mail.o: mail.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/max_rgb/Makefile.in gimp-1.0.3/plug-ins/max_rgb/Makefile.in --- gimp-1.0.2/plug-ins/max_rgb/Makefile.in Wed Oct 14 20:25:02 1998 +++ gimp-1.0.3/plug-ins/max_rgb/Makefile.in Mon Mar 29 13:13:53 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = max_rgb -max_rgb_SOURCES = \ - max_rgb.c +max_rgb_SOURCES = max_rgb.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la max_rgb_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ max_rgb_LDADD = $(LDADD) max_rgb_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(max_rgb_SOURCES) OBJECTS = $(max_rgb_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/max_rgb/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done max_rgb.o: max_rgb.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/maze/Makefile.in gimp-1.0.3/plug-ins/maze/Makefile.in --- gimp-1.0.2/plug-ins/maze/Makefile.in Wed Oct 14 20:25:08 1998 +++ gimp-1.0.3/plug-ins/maze/Makefile.in Mon Mar 29 13:13:54 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = maze -maze_SOURCES = \ - maze.c maze.h maze_face.c algorithms.c handy.c +maze_SOURCES = maze.c maze.h maze_face.c algorithms.c handy.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la maze_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ maze_LDADD = $(LDADD) maze_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(maze_SOURCES) OBJECTS = $(maze_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/maze/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,9 +277,13 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done algorithms.o: algorithms.c maze.h ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ @@ -290,71 +296,80 @@ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ ../../libgimp/gimpui.h ../../libgimp/gimpmenu.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/maze/algorithms.c gimp-1.0.3/plug-ins/maze/algorithms.c --- gimp-1.0.2/plug-ins/maze/algorithms.c Sun May 17 17:33:09 1998 +++ gimp-1.0.3/plug-ins/maze/algorithms.c Mon Mar 29 11:39:46 1999 @@ -37,6 +37,7 @@ * */ +#include #include "maze.h" #include "libgimp/gimp.h" #include "libgimp/gimpui.h" diff -ruN gimp-1.0.2/plug-ins/maze/maze_face.c gimp-1.0.3/plug-ins/maze/maze_face.c --- gimp-1.0.2/plug-ins/maze/maze_face.c Sun May 17 17:33:11 1998 +++ gimp-1.0.3/plug-ins/maze/maze_face.c Mon Mar 29 11:39:47 1999 @@ -23,10 +23,8 @@ * */ -#ifdef MAZE_DEBUG #include #include -#endif /* MAZE_DEBUG */ #include "maze.h" #include "libgimp/gimp.h" diff -ruN gimp-1.0.2/plug-ins/mblur/Makefile.in gimp-1.0.3/plug-ins/mblur/Makefile.in --- gimp-1.0.2/plug-ins/mblur/Makefile.in Wed Oct 14 20:25:13 1998 +++ gimp-1.0.3/plug-ins/mblur/Makefile.in Mon Mar 29 13:13:55 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = mblur -mblur_SOURCES = \ - mblur.c +mblur_SOURCES = mblur.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la mblur_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ mblur_LDADD = $(LDADD) mblur_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(mblur_SOURCES) OBJECTS = $(mblur_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/mblur/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done mblur.o: mblur.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/mblur/mblur.c gimp-1.0.3/plug-ins/mblur/mblur.c --- gimp-1.0.2/plug-ins/mblur/mblur.c Sun Apr 12 22:42:52 1998 +++ gimp-1.0.3/plug-ins/mblur/mblur.c Mon Mar 29 11:39:50 1999 @@ -44,6 +44,8 @@ * Smash all bugs :-) */ +#include +#include #include #include diff -ruN gimp-1.0.2/plug-ins/megawidget/Makefile.in gimp-1.0.3/plug-ins/megawidget/Makefile.in --- gimp-1.0.2/plug-ins/megawidget/Makefile.in Wed Oct 14 20:19:00 1998 +++ gimp-1.0.3/plug-ins/megawidget/Makefile.in Mon Mar 29 13:12:38 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_LIBRARIES = libmegawidget.a -libmegawidget_a_SOURCES = \ - megawidget.c megawidget.h +libmegawidget_a_SOURCES = megawidget.c megawidget.h + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la libmegawidget_aDEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ libmegawidget_a_OBJECTS = megawidget.o AR = ar CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(libmegawidget_a_SOURCES) OBJECTS = $(libmegawidget_a_OBJECTS) -all: Makefile $(LIBRARIES) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/megawidget/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -188,7 +186,7 @@ install-pluginlibLIBRARIES: $(pluginlib_LIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) - list='$(pluginlib_LIBRARIES)'; for p in $$list; do \ + @list='$(pluginlib_LIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pluginlibdir)/$$p"; \ $(INSTALL_DATA) $$p $(DESTDIR)$(pluginlibdir)/$$p; \ @@ -254,8 +252,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -283,79 +285,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done megawidget.o: megawidget.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ megawidget.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibLIBRARIES - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibLIBRARIES - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibLIBRARIES +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibLIBRARIES +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibLIBRARIES mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibLIBRARIES clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibLIBRARIES distclean-compile \ +distclean-am: distclean-pluginlibLIBRARIES distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibLIBRARIES \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibLIBRARIES distclean-pluginlibLIBRARIES \ clean-pluginlibLIBRARIES maintainer-clean-pluginlibLIBRARIES \ uninstall-pluginlibLIBRARIES install-pluginlibLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/megawidget/megawidget.c gimp-1.0.3/plug-ins/megawidget/megawidget.c --- gimp-1.0.2/plug-ins/megawidget/megawidget.c Sun Mar 22 12:44:28 1998 +++ gimp-1.0.3/plug-ins/megawidget/megawidget.c Mon Mar 29 11:39:53 1999 @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: megawidget.c,v 1.4 1998/03/22 20:44:28 adrian Exp $ + * $Id: megawidget.c,v 1.4.6.1 1999/03/29 19:39:53 yosh Exp $ */ /* Functions added by Xavier Bouchoux (Xavier.Bouchoux@ensimag.imag.fr) @@ -39,6 +39,8 @@ */ +#include +#include #include #include diff -ruN gimp-1.0.2/plug-ins/mosaic/Makefile.in gimp-1.0.3/plug-ins/mosaic/Makefile.in --- gimp-1.0.2/plug-ins/mosaic/Makefile.in Wed Oct 14 20:25:19 1998 +++ gimp-1.0.3/plug-ins/mosaic/Makefile.in Mon Mar 29 13:13:56 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = mosaic -mosaic_SOURCES = \ - mosaic.c mosaic_logo.h +mosaic_SOURCES = mosaic.c mosaic_logo.h + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la mosaic_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ mosaic_LDADD = $(LDADD) mosaic_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(mosaic_SOURCES) OBJECTS = $(mosaic_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/mosaic/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done mosaic.o: mosaic.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h mosaic_logo.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/mosaic/mosaic.c gimp-1.0.3/plug-ins/mosaic/mosaic.c --- gimp-1.0.2/plug-ins/mosaic/mosaic.c Tue May 26 01:46:33 1998 +++ gimp-1.0.3/plug-ins/mosaic/mosaic.c Sun Nov 8 18:26:42 1998 @@ -20,6 +20,7 @@ * what appears to be a mosaic, composed of small primitives, * each of constant color and of an approximate size. * Copyright (C) 1996 Spencer Kimball + * Speedups by Elliot Lee */ #include @@ -826,7 +827,6 @@ gint bytes; gint width, height; gint i, j; - gdouble gradient; guchar *gr, * dh, * dv; gint hmax, vmax; gint row, rows; @@ -887,23 +887,19 @@ for (i = 0; i < height; i++) { - for (j = 0; j < width; j++) + for (j = 0; j < width; j++, dh++, dv++, gr++) { - hmax = dh[j] - 128; - vmax = dv[j] - 128; - /* Find the gradient */ - gradient = sqrt (SQR (hmax) + SQR (vmax)); - if (!j || !i || (j == width - 1) || (i == height - 1)) - gr[j] = MAG_THRESHOLD; - else - gr[j] = (guchar) gradient; - } + *gr = MAG_THRESHOLD; + else { + hmax = *dh - 128; + vmax = *dv - 128; + + *gr = (guchar)sqrt (SQR (hmax) + SQR (hmax)); + } - dh += width; - dv += width; - gr += width; + } } } @@ -912,10 +908,9 @@ find_max_gradient (GPixelRgn *src_rgn, GPixelRgn *dest_rgn) { - guchar *s, *d; + guchar *s, *d, *s_iter, *s_end; gpointer pr; gint i, j; - gint b; gint val; gint max; @@ -931,14 +926,25 @@ for (j = 0; j < src_rgn->w; j++) { max = 0; +#ifndef SLOW_CODE +#define ABSVAL(x) ((x) >= 0 ? (x) : -(x)) + + for(s_iter = s, s_end = s + src_rgn->bpp; + s_iter < s_end; s_iter++) { + val = *s; + if(ABSVAL(val) > ABSVAL(max)) + max = val; + } + *d++ = max; +#else for (b = 0; b < src_rgn->bpp; b++) { val = (gint) s[b] - 128; if (abs (val) > abs (max)) max = val; } - *d++ = (max + 128); +#endif s += src_rgn->bpp; } @@ -993,7 +999,12 @@ src = data; dest = data + length; +#ifdef UNOPTIMIZED_CODE length = 3; /* static for speed */ +#else + /* badhack :) */ +# define length 3 +#endif /* initialize */ curve = curve_array + length; @@ -1188,6 +1199,10 @@ free (buf); free (data); +#ifndef UNOPTIMIZED_CODE + /* end bad hack */ +#undef length +#endif } /* @@ -2105,8 +2120,8 @@ gint min_x, min_y; gint max_x, max_y; gint size_x, size_y; - gint * max_scanlines; - gint * min_scanlines; + gint * max_scanlines, *max_scanlines_iter; + gint * min_scanlines, *min_scanlines_iter; gint * vals; gint val; gint pixel; @@ -2118,6 +2133,8 @@ gint supersample; gint supersample2; gint x1, y1, x2, y2; + Vertex *pts_tmp; + const int poly_npts = poly->npts; /* Determine antialiasing */ if (mvals.antialiasing) @@ -2132,15 +2149,29 @@ gimp_drawable_mask_bounds (drawable->id, &x1, &y1, &x2, &y2); bytes = drawable->bpp; - for (i = 0; i < poly->npts; i++) - { - xs = (gint) ((i) ? poly->pts[i-1].x : poly->pts[poly->npts-1].x); - ys = (gint) ((i) ? poly->pts[i-1].y : poly->pts[poly->npts-1].y); - xe = (gint) poly->pts[i].x; - ye = (gint) poly->pts[i].y; - calc_spec_vec (vecs+i, xs, ys, xe, ye); - } + /* begin loop */ + if(poly_npts) { + pts_tmp = poly->pts; + xs = (gint) pts_tmp[poly_npts-1].x; + ys = (gint) pts_tmp[poly_npts-1].y; + xe = (gint) pts_tmp->x; + ye = (gint) pts_tmp->y; + + calc_spec_vec (vecs, xs, ys, xe, ye); + + for (i = 1; i < poly_npts; i++) + { + xs = (gint) (pts_tmp->x); + ys = (gint) (pts_tmp->y); + pts_tmp++; + xe = (gint) pts_tmp->x; + ye = (gint) pts_tmp->y; + + calc_spec_vec (vecs+i, xs, ys, xe, ye); + } + } + /* end loop */ polygon_extents (poly, &dmin_x, &dmin_y, &dmax_x, &dmax_y); min_x = (gint) dmin_x; @@ -2151,43 +2182,62 @@ size_y = (max_y - min_y) * supersample; size_x = (max_x - min_x) * supersample; - min_scanlines = (gint *) malloc (sizeof (gint) * size_y); - max_scanlines = (gint *) malloc (sizeof (gint) * size_y); + min_scanlines = min_scanlines_iter = (gint *) malloc (sizeof (gint) * size_y); + max_scanlines = max_scanlines_iter = (gint *) malloc (sizeof (gint) * size_y); for (i = 0; i < size_y; i++) { min_scanlines[i] = max_x * supersample; max_scanlines[i] = min_x * supersample; } - for (i = 0; i < poly->npts; i++) - { - xs = (gint) ((i) ? poly->pts[i-1].x : poly->pts[poly->npts-1].x); - ys = (gint) ((i) ? poly->pts[i-1].y : poly->pts[poly->npts-1].y); - xe = (gint) poly->pts[i].x; - ye = (gint) poly->pts[i].y; + /* begin loop */ + if(poly_npts) { + pts_tmp = poly->pts; + xs = (gint) pts_tmp[poly_npts-1].x; + ys = (gint) pts_tmp[poly_npts-1].y; + xe = (gint) pts_tmp->x; + ye = (gint) pts_tmp->y; + + xs *= supersample; + ys *= supersample; + xe *= supersample; + ye *= supersample; - xs *= supersample; - ys *= supersample; - xe *= supersample; - ye *= supersample; + convert_segment (xs, ys, xe, ye, min_y * supersample, + min_scanlines, max_scanlines); - convert_segment (xs, ys, xe, ye, min_y * supersample, - min_scanlines, max_scanlines); - } + for (i = 1; i < poly_npts; i++) + { + xs = (gint) pts_tmp->x; + ys = (gint) pts_tmp->y; + pts_tmp++; + xe = (gint) pts_tmp->x; + ye = (gint) pts_tmp->y; + + xs *= supersample; + ys *= supersample; + xe *= supersample; + ye *= supersample; + + convert_segment (xs, ys, xe, ye, min_y * supersample, + min_scanlines, max_scanlines); + } + } + /* end loop */ gimp_pixel_rgn_init (&src_rgn, drawable, 0, 0, drawable->width, drawable->height, TRUE, TRUE); vals = (gint *) malloc (sizeof (gint) * size_x); - for (i = 0; i < size_y; i++) + for (i = 0; i < size_y; i++, min_scanlines_iter++, max_scanlines_iter++) { if (! (i % supersample)) memset (vals, 0, sizeof (gint) * size_x); yy = (gdouble) i / (gdouble) supersample + min_y; - for (j = min_scanlines[i]; j < max_scanlines[i]; j++) + for (j = *min_scanlines_iter; j < *max_scanlines_iter; j++) { x = j - min_x * supersample; vals[x] += 255; @@ -2212,15 +2262,13 @@ if (val > 0) { + xx = (gdouble) j / (gdouble) supersample + min_x; - contrib = calc_spec_contrib (vecs, poly->npts, xx, yy); + contrib = calc_spec_contrib (vecs, poly_npts, xx, yy); for (b = 0; b < bytes; b++) { - if (contrib < 0.0) - pixel = col[b] + (gint) ((col[b] - back[b]) * contrib); - else - pixel = col[b] + (gint) ((fore[b] - col[b]) * contrib); + pixel = col[b] + (gint) (((contrib < 0.0)?(col[b] - back[b]):(fore[b] - col[b])) * contrib); buf[b] = ((pixel * val) + (back[b] * (255 - val))) / 255; } diff -ruN gimp-1.0.2/plug-ins/mpeg/Makefile.in gimp-1.0.3/plug-ins/mpeg/Makefile.in --- gimp-1.0.2/plug-ins/mpeg/Makefile.in Wed Oct 14 20:19:33 1998 +++ gimp-1.0.3/plug-ins/mpeg/Makefile.in Mon Mar 29 13:12:46 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,23 +122,17 @@ pluginlib_PROGRAMS = mpeg -mpeg_SOURCES = \ - mpeg.c +mpeg_SOURCES = mpeg.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) @LIBMPEG_LIB@ + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBMPEG_LIB@ - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la mpeg_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -152,24 +149,24 @@ mpeg_LDADD = $(LDADD) mpeg_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(mpeg_SOURCES) OBJECTS = $(mpeg_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/mpeg/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -191,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -247,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -276,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done mpeg.o: mpeg.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/nlfilt/Makefile.am gimp-1.0.3/plug-ins/nlfilt/Makefile.am --- gimp-1.0.2/plug-ins/nlfilt/Makefile.am Sun Aug 30 16:26:26 1998 +++ gimp-1.0.3/plug-ins/nlfilt/Makefile.am Thu Jan 21 16:20:42 1999 @@ -5,7 +5,7 @@ pluginlib_PROGRAMS = nlfilt nlfilt_SOURCES = \ - nlfilt.c $(top_srcdir)/plug-ins/megawidget/megawidget.h + nlfilt.c INCLUDES = \ $(X_CFLAGS) \ diff -ruN gimp-1.0.2/plug-ins/nlfilt/Makefile.in gimp-1.0.3/plug-ins/nlfilt/Makefile.in --- gimp-1.0.2/plug-ins/nlfilt/Makefile.in Wed Oct 14 20:25:24 1998 +++ gimp-1.0.3/plug-ins/nlfilt/Makefile.in Mon Mar 29 13:13:57 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,24 +122,17 @@ pluginlib_PROGRAMS = nlfilt -nlfilt_SOURCES = \ - nlfilt.c $(top_srcdir)/plug-ins/megawidget/megawidget.h +nlfilt_SOURCES = nlfilt.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la nlfilt_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -153,24 +149,24 @@ nlfilt_LDADD = $(LDADD) nlfilt_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(nlfilt_SOURCES) OBJECTS = $(nlfilt_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/nlfilt/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -192,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -248,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -277,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done nlfilt.o: nlfilt.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h \ ../../plug-ins/megawidget/megawidget.h ../../config.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/nlfilt/nlfilt.c gimp-1.0.3/plug-ins/nlfilt/nlfilt.c --- gimp-1.0.2/plug-ins/nlfilt/nlfilt.c Mon Jul 13 23:20:14 1998 +++ gimp-1.0.3/plug-ins/nlfilt/nlfilt.c Mon Mar 29 11:39:55 1999 @@ -23,11 +23,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: nlfilt.c,v 1.7.4.2 1998/07/14 06:20:14 yosh Exp $ + * $Id: nlfilt.c,v 1.7.4.2.2.1 1999/03/29 19:39:55 yosh Exp $ */ /* add any necessary includes */ +#include #include #include #include diff -ruN gimp-1.0.2/plug-ins/noisify/Makefile.in gimp-1.0.3/plug-ins/noisify/Makefile.in --- gimp-1.0.2/plug-ins/noisify/Makefile.in Wed Oct 14 20:25:29 1998 +++ gimp-1.0.3/plug-ins/noisify/Makefile.in Mon Mar 29 13:13:58 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = noisify -noisify_SOURCES = \ - noisify.c +noisify_SOURCES = noisify.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la noisify_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ noisify_LDADD = $(LDADD) noisify_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(noisify_SOURCES) OBJECTS = $(noisify_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/noisify/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done noisify.o: noisify.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/normalize/Makefile.in gimp-1.0.3/plug-ins/normalize/Makefile.in --- gimp-1.0.2/plug-ins/normalize/Makefile.in Wed Oct 14 20:25:35 1998 +++ gimp-1.0.3/plug-ins/normalize/Makefile.in Mon Mar 29 13:13:59 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = normalize -normalize_SOURCES = \ - normalize.c +normalize_SOURCES = normalize.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la normalize_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ normalize_LDADD = $(LDADD) normalize_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(normalize_SOURCES) OBJECTS = $(normalize_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/normalize/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done normalize.o: normalize.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/nova/Makefile.in gimp-1.0.3/plug-ins/nova/Makefile.in --- gimp-1.0.2/plug-ins/nova/Makefile.in Wed Oct 14 20:25:40 1998 +++ gimp-1.0.3/plug-ins/nova/Makefile.in Mon Mar 29 13:14:00 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = nova -nova_SOURCES = \ - nova.c +nova_SOURCES = nova.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la nova_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ nova_LDADD = $(LDADD) nova_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(nova_SOURCES) OBJECTS = $(nova_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/nova/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done nova.o: nova.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/oilify/Makefile.in gimp-1.0.3/plug-ins/oilify/Makefile.in --- gimp-1.0.2/plug-ins/oilify/Makefile.in Wed Oct 14 20:25:45 1998 +++ gimp-1.0.3/plug-ins/oilify/Makefile.in Mon Mar 29 13:14:01 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = oilify -oilify_SOURCES = \ - oilify.c +oilify_SOURCES = oilify.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la oilify_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ oilify_LDADD = $(LDADD) oilify_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(oilify_SOURCES) OBJECTS = $(oilify_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/oilify/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done oilify.o: oilify.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/oilify/oilify.c gimp-1.0.3/plug-ins/oilify/oilify.c --- gimp-1.0.2/plug-ins/oilify/oilify.c Sun Apr 26 15:12:57 1998 +++ gimp-1.0.3/plug-ins/oilify/oilify.c Mon Mar 29 11:39:58 1999 @@ -18,9 +18,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: oilify.c,v 1.6 1998/04/26 22:12:57 yosh Exp $ + * $Id: oilify.c,v 1.6.4.1 1999/03/29 19:39:58 yosh Exp $ */ +#include #include #include #include "gtk/gtk.h" diff -ruN gimp-1.0.2/plug-ins/pagecurl/Makefile.in gimp-1.0.3/plug-ins/pagecurl/Makefile.in --- gimp-1.0.2/plug-ins/pagecurl/Makefile.in Wed Oct 14 20:25:51 1998 +++ gimp-1.0.3/plug-ins/pagecurl/Makefile.in Mon Mar 29 13:14:02 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = pagecurl -pagecurl_SOURCES = \ - pagecurl.c curl0.xpm curl1.xpm curl2.xpm curl3.xpm curl4.xpm curl5.xpm curl6.xpm curl7.xpm +pagecurl_SOURCES = pagecurl.c curl0.xpm curl1.xpm curl2.xpm curl3.xpm curl4.xpm curl5.xpm curl6.xpm curl7.xpm + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la pagecurl_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ pagecurl_LDADD = $(LDADD) pagecurl_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(pagecurl_SOURCES) OBJECTS = $(pagecurl_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/pagecurl/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done pagecurl.o: pagecurl.c curl0.xpm curl1.xpm curl2.xpm curl3.xpm curl4.xpm \ curl5.xpm curl6.xpm curl7.xpm ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/palette/Makefile.in gimp-1.0.3/plug-ins/palette/Makefile.in --- gimp-1.0.2/plug-ins/palette/Makefile.in Wed Oct 14 20:25:57 1998 +++ gimp-1.0.3/plug-ins/palette/Makefile.in Mon Mar 29 13:14:03 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = palette -palette_SOURCES = \ - palette.c +palette_SOURCES = palette.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la palette_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ palette_LDADD = $(LDADD) palette_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(palette_SOURCES) OBJECTS = $(palette_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/palette/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done palette.o: palette.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/papertile/Makefile.in gimp-1.0.3/plug-ins/papertile/Makefile.in --- gimp-1.0.2/plug-ins/papertile/Makefile.in Wed Oct 14 20:26:02 1998 +++ gimp-1.0.3/plug-ins/papertile/Makefile.in Mon Mar 29 13:14:04 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = papertile -papertile_SOURCES = \ - papertile.c +papertile_SOURCES = papertile.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la papertile_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ papertile_LDADD = $(LDADD) papertile_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(papertile_SOURCES) OBJECTS = $(papertile_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/papertile/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done papertile.o: papertile.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/papertile/papertile.c gimp-1.0.3/plug-ins/papertile/papertile.c --- gimp-1.0.2/plug-ins/papertile/papertile.c Sun Apr 12 22:43:03 1998 +++ gimp-1.0.3/plug-ins/papertile/papertile.c Mon Mar 29 11:40:04 1999 @@ -21,6 +21,7 @@ *******************************************************************************/ +#include #include #include #include diff -ruN gimp-1.0.2/plug-ins/pat/Makefile.in gimp-1.0.3/plug-ins/pat/Makefile.in --- gimp-1.0.2/plug-ins/pat/Makefile.in Wed Oct 14 20:26:07 1998 +++ gimp-1.0.3/plug-ins/pat/Makefile.in Mon Mar 29 13:14:05 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = pat -pat_SOURCES = \ - pat.c +pat_SOURCES = pat.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la pat_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ pat_LDADD = $(LDADD) pat_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(pat_SOURCES) OBJECTS = $(pat_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/pat/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done pat.o: pat.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../app/pattern_header.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/pcx/Makefile.in gimp-1.0.3/plug-ins/pcx/Makefile.in --- gimp-1.0.2/plug-ins/pcx/Makefile.in Wed Oct 14 20:26:12 1998 +++ gimp-1.0.3/plug-ins/pcx/Makefile.in Mon Mar 29 13:14:07 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = pcx -pcx_SOURCES = \ - pcx.c +pcx_SOURCES = pcx.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la pcx_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ pcx_LDADD = $(LDADD) pcx_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(pcx_SOURCES) OBJECTS = $(pcx_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/pcx/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done pcx.o: pcx.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/pix/Makefile.in gimp-1.0.3/plug-ins/pix/Makefile.in --- gimp-1.0.2/plug-ins/pix/Makefile.in Wed Oct 14 20:26:18 1998 +++ gimp-1.0.3/plug-ins/pix/Makefile.in Mon Mar 29 13:14:08 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = pix -pix_SOURCES = \ - pix.c +pix_SOURCES = pix.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la pix_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ pix_LDADD = $(LDADD) pix_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(pix_SOURCES) OBJECTS = $(pix_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/pix/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done pix.o: pix.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/pixelize/Makefile.in gimp-1.0.3/plug-ins/pixelize/Makefile.in --- gimp-1.0.2/plug-ins/pixelize/Makefile.in Wed Oct 14 20:26:25 1998 +++ gimp-1.0.3/plug-ins/pixelize/Makefile.in Mon Mar 29 13:14:08 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = pixelize -pixelize_SOURCES = \ - pixelize.c +pixelize_SOURCES = pixelize.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la pixelize_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ pixelize_LDADD = $(LDADD) pixelize_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(pixelize_SOURCES) OBJECTS = $(pixelize_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/pixelize/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done pixelize.o: pixelize.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ ../../libgimp/gimpmenu.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/plasma/Makefile.in gimp-1.0.3/plug-ins/plasma/Makefile.in --- gimp-1.0.2/plug-ins/plasma/Makefile.in Wed Oct 14 20:26:31 1998 +++ gimp-1.0.3/plug-ins/plasma/Makefile.in Mon Mar 29 13:14:09 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = plasma -plasma_SOURCES = \ - plasma.c +plasma_SOURCES = plasma.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la plasma_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ plasma_LDADD = $(LDADD) plasma_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(plasma_SOURCES) OBJECTS = $(plasma_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/plasma/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done plasma.o: plasma.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ ../../libgimp/gimpmenu.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/png/Makefile.in gimp-1.0.3/plug-ins/png/Makefile.in --- gimp-1.0.2/plug-ins/png/Makefile.in Wed Oct 14 20:19:37 1998 +++ gimp-1.0.3/plug-ins/png/Makefile.in Mon Mar 29 13:12:47 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,24 +122,17 @@ pluginlib_PROGRAMS = png -png_SOURCES = \ - png.c +png_SOURCES = png.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) @LIBPNG_LIB@ -lm + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBPNG_LIB@ \ - -lm - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la png_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -153,24 +149,24 @@ png_LDADD = $(LDADD) png_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(png_SOURCES) OBJECTS = $(png_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/png/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -192,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -248,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -277,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done png.o: png.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/png/png.c gimp-1.0.3/plug-ins/png/png.c --- gimp-1.0.2/plug-ins/png/png.c Sat Jun 6 16:28:13 1998 +++ gimp-1.0.3/plug-ins/png/png.c Sat Jan 2 15:50:31 1999 @@ -1,5 +1,5 @@ /* - * "$Id: png.c,v 1.7.2.1 1998/06/06 23:28:13 yosh Exp $" + * "$Id: png.c,v 1.7.2.4 1999/01/02 23:50:31 yosh Exp $" * * Portable Network Graphics (PNG) plug-in for The GIMP -- an image * manipulation program @@ -37,6 +37,49 @@ * Revision History: * * $Log: png.c,v $ + * Revision 1.7.2.4 1999/01/02 23:50:31 yosh + * Doh, thinko. + * + * -Yosh + * + * Revision 1.7.2.3 1999/01/02 23:11:53 yosh + * * ltconfig: cases for Unixware 2.1.2 (from Geoff Clare) + * and BSD/OS 4.0 (from Chris P. Ross) + * + * * app/Makefile.am + * * plug-ins/script-fu/scripts/Makefile.am: use -DREGEX_MALLOC, + * seems to be more portable + * + * * plug-ins/png/png.c: use a default gamma of 2.2 when gamma + * correction isn't enabled + * + * -Yosh + * + * Revision 1.7.2.2 1998/11/09 02:26:44 yosh + * * Makefile.am + * * configure.in: check for GTK+ 1.0.3 or higher, we use stuff + * from it. Add a convenience configure option for me. + * + * * gimptool.in: sync with 1.1 + * + * * tile_swap.c: ok, a further attempt to get rid of a bunch o' + * dialogs + * + * * docs/Makefile.am + * * docs/white-paper/Makefile.am: helpers for make dist + * + * * libgimp/gimp.c: match header declaration + * + * * checkerboard.c: avoid a FP exception in psychobilly mode + * + * * plug-ins/cubism/cubism.c + * * plug-ins/mosaic/mosaic.c: speedups from 1.1 + * + * * plug-ins/png/png.c: bugfix for indexed image, default to level 6 + * compression + * + * -Yosh + * * Revision 1.7.2.1 1998/06/06 23:28:13 yosh * * updated despeckle, png, sgi, and sharpen * @@ -121,6 +164,7 @@ #define PLUG_IN_VERSION "1.1.6 - 17 May 1998" #define SCALE_WIDTH 125 +#define DEFAULT_GAMMA 2.20 /* * Structures... @@ -163,7 +207,7 @@ PngSaveVals pngvals = { FALSE, - 9 + 6 }; int runme = FALSE; @@ -418,13 +462,20 @@ png_read_info(pp, info); - if (info->bit_depth < 8) + /* + * I have no idea why this used to be the way it was, luckily + * most people don't use 2bit or 4bit indexed images with PNG + */ + + if (info->bit_depth < 8) { png_set_packing(pp); - png_set_expand(pp); + if (info->color_type != PNG_COLOR_TYPE_PALETTE) { + png_set_expand(pp); - if (info->valid & PNG_INFO_sBIT) - png_set_shift(pp, &(info->sig_bit)); + if (info->valid & PNG_INFO_sBIT) + png_set_shift(pp, &(info->sig_bit)); + } } else if (info->bit_depth == 16) png_set_strip_16(pp); @@ -594,7 +645,7 @@ guchar **pixels, /* Pixel rows */ *pixel; /* Pixel data */ char progress[255]; /* Title for progress display... */ - + gdouble gamma; /* * Setup the PNG data structures... @@ -652,10 +703,12 @@ png_set_compression_level(pp, pngvals.compression_level); + gamma = gimp_gamma(); + info->width = drawable->width; info->height = drawable->height; info->bit_depth = 8; - info->gamma = gimp_gamma(); + info->gamma = 1.0 / (gamma != 1.00 ? gamma : DEFAULT_GAMMA); info->sig_bit.red = 8; info->sig_bit.green = 8; info->sig_bit.blue = 8; @@ -912,5 +965,5 @@ } /* - * End of "$Id: png.c,v 1.7.2.1 1998/06/06 23:28:13 yosh Exp $". + * End of "$Id: png.c,v 1.7.2.4 1999/01/02 23:50:31 yosh Exp $". */ diff -ruN gimp-1.0.2/plug-ins/pnm/Makefile.in gimp-1.0.3/plug-ins/pnm/Makefile.in --- gimp-1.0.2/plug-ins/pnm/Makefile.in Wed Oct 14 20:26:36 1998 +++ gimp-1.0.3/plug-ins/pnm/Makefile.in Mon Mar 29 13:14:10 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = pnm -pnm_SOURCES = \ - pnm.c +pnm_SOURCES = pnm.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la pnm_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ pnm_LDADD = $(LDADD) pnm_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(pnm_SOURCES) OBJECTS = $(pnm_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/pnm/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done pnm.o: pnm.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/polar/Makefile.in gimp-1.0.3/plug-ins/polar/Makefile.in --- gimp-1.0.2/plug-ins/polar/Makefile.in Wed Oct 14 20:26:42 1998 +++ gimp-1.0.3/plug-ins/polar/Makefile.in Mon Mar 29 13:14:12 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = polar -polar_SOURCES = \ - polar.c +polar_SOURCES = polar.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la polar_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ polar_LDADD = $(LDADD) polar_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(polar_SOURCES) OBJECTS = $(polar_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/polar/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done polar.o: polar.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/polar/polar.c gimp-1.0.3/plug-ins/polar/polar.c --- gimp-1.0.2/plug-ins/polar/polar.c Sun Apr 12 22:43:10 1998 +++ gimp-1.0.3/plug-ins/polar/polar.c Mon Mar 29 11:40:09 1999 @@ -55,6 +55,7 @@ * - Daniel Dunbar */ +#include #include #include #include diff -ruN gimp-1.0.2/plug-ins/print/Makefile.in gimp-1.0.3/plug-ins/print/Makefile.in --- gimp-1.0.2/plug-ins/print/Makefile.in Wed Oct 14 20:26:52 1998 +++ gimp-1.0.3/plug-ins/print/Makefile.in Mon Mar 29 13:14:13 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,28 +122,20 @@ pluginlib_PROGRAMS = print -print_SOURCES = \ - print-escp2.c print-pcl.c print-ps.c print-util.c print.c print.h +print_SOURCES = print-escp2.c print-pcl.c print-ps.c print-util.c print.c print.h + + +CPPFLAGS = @LP_DEF@ @LPSTAT_DEF@ @LPR_DEF@ @LPC_DEF@ + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -CPPFLAGS = \ - @LP_DEF@ \ - @LPSTAT_DEF@ \ - @LPR_DEF@ \ - @LPC_DEF@ - -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la print_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -157,24 +152,24 @@ print_LDADD = $(LDADD) print_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(print_SOURCES) OBJECTS = $(print_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/print/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -196,15 +191,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -252,8 +247,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -281,9 +280,13 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done print-escp2.o: print-escp2.c print.h ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h @@ -296,71 +299,80 @@ print.o: print.c print.h ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/ps/Makefile.in gimp-1.0.3/plug-ins/ps/Makefile.in --- gimp-1.0.2/plug-ins/ps/Makefile.in Wed Oct 14 20:27:01 1998 +++ gimp-1.0.3/plug-ins/ps/Makefile.in Mon Mar 29 13:14:14 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = ps -ps_SOURCES = \ - ps.c +ps_SOURCES = ps.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la ps_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ ps_LDADD = $(LDADD) ps_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(ps_SOURCES) OBJECTS = $(ps_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/ps/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done ps.o: ps.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../config.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/ps/ps.c gimp-1.0.3/plug-ins/ps/ps.c --- gimp-1.0.2/plug-ins/ps/ps.c Sat Sep 26 08:30:38 1998 +++ gimp-1.0.3/plug-ins/ps/ps.c Sun Jan 3 14:39:44 1999 @@ -2,8 +2,8 @@ * Copyright (C) 1995 Spencer Kimball and Peter Mattis * PostScript file plugin * PostScript writing and GhostScript interfacing code - * Copyright (C) 1997 Peter Kirchgessner - * (email: pkirchg@aol.com, WWW: http://members.aol.com/pkirchg) + * Copyright (C) 1997-98 Peter Kirchgessner + * (email: peter@kirchgessner.net, WWW: http://www.kirchgessner.net) * * Added controls for TextAlphaBits and GraphicsAlphaBits * George White @@ -38,10 +38,12 @@ * V 1.03, nn, 20-Dec-97: Initialize some variables * V 1.04, PK, 20-Dec-97: Add Encapsulated PostScript output and preview * V 1.05, PK, 21-Sep-98: Write b/w-images (indexed) using image-operator + * V 1.06, PK, 22-Dec-98: Fix problem with writing color PS files. + * Ghostview may hang when displaying the files. */ -#define VERSIO 1.05 -static char dversio[] = "v1.05 26-Sep-98"; -static char ident[] = "@(#) GIMP PostScript/PDF file-plugin v1.05 26-Sep-98"; +#define VERSIO 1.06 +static char dversio[] = "v1.06 22-Dec-98"; +static char ident[] = "@(#) GIMP PostScript/PDF file-plugin v1.06 22-Dec-98"; #include #include @@ -1386,7 +1388,7 @@ if (bpp == 1) fprintf (ofp, "/scanline %d string def\n", (width+7)/8); else - fprintf (ofp, "/scanline %d %d mul string def\n", width, bpp); + fprintf (ofp, "/scanline %d %d mul string def\n", width, bpp/8); fprintf (ofp, "%% Image geometry\n%d %d %d\n", width, height, (bpp == 1) ? 1 : 8); diff -ruN gimp-1.0.2/plug-ins/psd/Makefile.in gimp-1.0.3/plug-ins/psd/Makefile.in --- gimp-1.0.2/plug-ins/psd/Makefile.in Wed Oct 14 20:27:08 1998 +++ gimp-1.0.3/plug-ins/psd/Makefile.in Mon Mar 29 13:14:15 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = psd -psd_SOURCES = \ - psd.c +psd_SOURCES = psd.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la psd_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ psd_LDADD = $(LDADD) psd_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(psd_SOURCES) OBJECTS = $(psd_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/psd/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done psd.o: psd.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/randomize/Makefile.am gimp-1.0.3/plug-ins/randomize/Makefile.am --- gimp-1.0.2/plug-ins/randomize/Makefile.am Sun Aug 30 16:21:58 1998 +++ gimp-1.0.3/plug-ins/randomize/Makefile.am Thu Jan 21 16:20:44 1999 @@ -5,7 +5,7 @@ pluginlib_PROGRAMS = randomize randomize_SOURCES = \ - randomize.c $(top_srcdir)/plug-ins/gpc/gpc.h + randomize.c INCLUDES = \ $(X_CFLAGS) \ diff -ruN gimp-1.0.2/plug-ins/randomize/Makefile.in gimp-1.0.3/plug-ins/randomize/Makefile.in --- gimp-1.0.2/plug-ins/randomize/Makefile.in Wed Oct 14 20:27:14 1998 +++ gimp-1.0.3/plug-ins/randomize/Makefile.in Mon Mar 29 13:14:18 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,24 +122,17 @@ pluginlib_PROGRAMS = randomize -randomize_SOURCES = \ - randomize.c $(top_srcdir)/plug-ins/gpc/gpc.h +randomize_SOURCES = randomize.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/plug-ins/gpc/libgpc.a $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/plug-ins/gpc/libgpc.a $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/plug-ins/gpc/libgpc.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/gpc/libgpc.a \ - $(top_builddir)/libgimp/libgimp.la randomize_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -153,24 +149,24 @@ randomize_LDADD = $(LDADD) randomize_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(randomize_SOURCES) OBJECTS = $(randomize_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/randomize/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -192,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -248,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -277,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done randomize.o: randomize.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ ../../plug-ins/gpc/gpc.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/randomize/randomize.c gimp-1.0.3/plug-ins/randomize/randomize.c --- gimp-1.0.2/plug-ins/randomize/randomize.c Mon Jul 13 20:46:41 1998 +++ gimp-1.0.3/plug-ins/randomize/randomize.c Mon Mar 29 11:40:14 1999 @@ -123,6 +123,7 @@ * - split into multiple files ****************************************************************************/ +#include #include #include #include "libgimp/gimp.h" diff -ruN gimp-1.0.2/plug-ins/ripple/Makefile.in gimp-1.0.3/plug-ins/ripple/Makefile.in --- gimp-1.0.2/plug-ins/ripple/Makefile.in Wed Oct 14 20:27:20 1998 +++ gimp-1.0.3/plug-ins/ripple/Makefile.in Mon Mar 29 13:14:20 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = ripple -ripple_SOURCES = \ - ripple.c +ripple_SOURCES = ripple.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la ripple_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ ripple_LDADD = $(LDADD) ripple_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(ripple_SOURCES) OBJECTS = $(ripple_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/ripple/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done ripple.o: ripple.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/rotate/Makefile.in gimp-1.0.3/plug-ins/rotate/Makefile.in --- gimp-1.0.2/plug-ins/rotate/Makefile.in Wed Oct 14 20:27:25 1998 +++ gimp-1.0.3/plug-ins/rotate/Makefile.in Mon Mar 29 13:14:22 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = rotate -rotate_SOURCES = \ - rotate.c +rotate_SOURCES = rotate.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la rotate_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ rotate_LDADD = $(LDADD) rotate_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(rotate_SOURCES) OBJECTS = $(rotate_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/rotate/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done rotate.o: rotate.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/rotate/rotate.c gimp-1.0.3/plug-ins/rotate/rotate.c --- gimp-1.0.2/plug-ins/rotate/rotate.c Thu May 28 10:09:16 1998 +++ gimp-1.0.3/plug-ins/rotate/rotate.c Mon Mar 29 11:40:19 1999 @@ -50,6 +50,7 @@ * speedup (thanks to quartic for this suggestion). */ +#include #include #include diff -ruN gimp-1.0.2/plug-ins/rotators/Makefile.in gimp-1.0.3/plug-ins/rotators/Makefile.in --- gimp-1.0.2/plug-ins/rotators/Makefile.in Wed Oct 14 20:27:33 1998 +++ gimp-1.0.3/plug-ins/rotators/Makefile.in Mon Mar 29 13:14:24 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = rotators -rotators_SOURCES = \ - rotators.c +rotators_SOURCES = rotators.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la rotators_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ rotators_LDADD = $(LDADD) rotators_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(rotators_SOURCES) OBJECTS = $(rotators_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/rotators/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done rotators.o: rotators.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/scatter_hsv/Makefile.in gimp-1.0.3/plug-ins/scatter_hsv/Makefile.in --- gimp-1.0.2/plug-ins/scatter_hsv/Makefile.in Wed Oct 14 20:27:40 1998 +++ gimp-1.0.3/plug-ins/scatter_hsv/Makefile.in Mon Mar 29 13:14:26 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = scatter_hsv -scatter_hsv_SOURCES = \ - scatter_hsv.c +scatter_hsv_SOURCES = scatter_hsv.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la scatter_hsv_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ scatter_hsv_LDADD = $(LDADD) scatter_hsv_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(scatter_hsv_SOURCES) OBJECTS = $(scatter_hsv_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/scatter_hsv/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done scatter_hsv.o: scatter_hsv.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/screenshot/Makefile.in gimp-1.0.3/plug-ins/screenshot/Makefile.in --- gimp-1.0.2/plug-ins/screenshot/Makefile.in Wed Oct 14 20:27:49 1998 +++ gimp-1.0.3/plug-ins/screenshot/Makefile.in Mon Mar 29 13:14:29 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = screenshot -screenshot_SOURCES = \ - screenshot.c +screenshot_SOURCES = screenshot.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la screenshot_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ screenshot_LDADD = $(LDADD) screenshot_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(screenshot_SOURCES) OBJECTS = $(screenshot_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/screenshot/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done screenshot.o: screenshot.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/script-fu/Makefile.am gimp-1.0.3/plug-ins/script-fu/Makefile.am --- gimp-1.0.2/plug-ins/script-fu/Makefile.am Sun Aug 30 16:28:28 1998 +++ gimp-1.0.3/plug-ins/script-fu/Makefile.am Sat Jan 2 15:11:54 1999 @@ -46,6 +46,9 @@ script_fu_DEPENDENCIES = $(DEPS) +CPPFLAGS = \ + -DREGEX_MALLOC + .PHONY: files files: diff -ruN gimp-1.0.2/plug-ins/script-fu/Makefile.in gimp-1.0.3/plug-ins/script-fu/Makefile.in --- gimp-1.0.2/plug-ins/script-fu/Makefile.in Wed Oct 14 20:19:16 1998 +++ gimp-1.0.3/plug-ins/script-fu/Makefile.in Mon Mar 29 13:12:41 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -117,49 +120,28 @@ SUBDIRS = scripts -scriptdata = +scriptdata = pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = script-fu -script_fu_SOURCES = \ - interp_md5.c \ - interp_md5.h \ - interp_regex.c \ - interp_slib.c \ - interp_sliba.c \ - interp_trace.c \ - script-fu.c \ - script-fu-console.c \ - script-fu-console.h \ - script-fu-scripts.c \ - script-fu-scripts.h \ - script-fu-server.c \ - script-fu-server.h \ - script-fu-enums.h \ - siod.h \ - siodp.h \ - regex.h \ - regex.c - -INCLUDES = \ - $(X_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) - -DEPS = \ - $(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la +script_fu_SOURCES = interp_md5.c interp_md5.h interp_regex.c interp_slib.c interp_sliba.c interp_trace.c script-fu.c script-fu-console.c script-fu-console.h script-fu-scripts.c script-fu-scripts.h script-fu-server.c script-fu-server.h script-fu-enums.h siod.h siodp.h regex.h regex.c + + +INCLUDES = $(X_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) + + +DEPS = $(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la + script_fu_DEPENDENCIES = $(DEPS) + +CPPFLAGS = -DREGEX_MALLOC + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = @@ -167,7 +149,6 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. -CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ script_fu_OBJECTS = interp_md5.o interp_regex.o interp_slib.o \ @@ -176,24 +157,24 @@ script_fu_LDADD = $(LDADD) script_fu_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(script_fu_SOURCES) OBJECTS = $(script_fu_OBJECTS) -all: all-recursive all-am - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/script-fu/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -215,15 +196,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -281,41 +262,65 @@ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) tags); \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ done; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ @@ -340,17 +345,23 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ done interp_md5.o: interp_md5.c interp_md5.h interp_regex.o: interp_regex.c regex.h siod.h @@ -374,76 +385,70 @@ script-fu-console.h script-fu-scripts.h script-fu-enums.h \ script-fu-server.h +info-am: info: info-recursive +dvi-am: dvi: dvi-recursive -check: all-am - $(MAKE) check-recursive +check-am: all-am +check: check-recursive +installcheck-am: installcheck: installcheck-recursive -all-am: Makefile $(PROGRAMS) +install-exec-am: +install-exec: install-exec-recursive install-data-am: install-pluginlibPROGRAMS +install-data: install-data-recursive +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-recursive uninstall-am: uninstall-pluginlibPROGRAMS - -install-exec: install-exec-recursive - @$(NORMAL_INSTALL) - -install-data: install-data-recursive install-data-am - @$(NORMAL_INSTALL) - -install: install-recursive install-data-am - @: - -uninstall: uninstall-recursive uninstall-am - +uninstall: uninstall-recursive +all-am: Makefile $(PROGRAMS) +all-redirect: all-recursive install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) +installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic +mostlyclean: mostlyclean-recursive + clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ clean-tags clean-generic mostlyclean-am +clean: clean-recursive + distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ clean-am + -rm -f libtool + +distclean: distclean-recursive maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ distclean-am - -mostlyclean: mostlyclean-recursive mostlyclean-am - -clean: clean-recursive clean-am - -distclean: distclean-recursive distclean-am - -rm -f config.status - -rm -f libtool - -maintainer-clean: maintainer-clean-recursive maintainer-clean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-recursive + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ @@ -455,11 +460,12 @@ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck all-am install-data-am uninstall-am install-exec \ -install-data install uninstall all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean .PHONY: files diff -ruN gimp-1.0.2/plug-ins/script-fu/regex.c gimp-1.0.3/plug-ins/script-fu/regex.c --- gimp-1.0.2/plug-ins/script-fu/regex.c Thu May 28 02:03:51 1998 +++ gimp-1.0.3/plug-ins/script-fu/regex.c Sat Jan 2 15:11:55 1999 @@ -1207,7 +1207,7 @@ #define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code) \ do { \ - char *destination; \ + /* char *destination; */ \ /* Must be int, so when we don't save any registers, the arithmetic \ of 0 + -1 isn't done as unsigned. */ \ /* Can't be int, since there is not a shred of a guarantee that int \ diff -ruN gimp-1.0.2/plug-ins/script-fu/script-fu-server.c gimp-1.0.3/plug-ins/script-fu/script-fu-server.c --- gimp-1.0.2/plug-ins/script-fu/script-fu-server.c Sun Apr 12 22:43:33 1998 +++ gimp-1.0.3/plug-ins/script-fu/script-fu-server.c Fri Mar 26 22:15:57 1999 @@ -115,7 +115,6 @@ static gint execute_command (SFCommand *cmd); static gint read_from_client (gint filedes); static gint make_socket (guint port); -static guint clientname_hash (gpointer key); static void server_log (gchar *format, ...); static void server_quit (void); @@ -296,7 +295,7 @@ SFCommand *cmd; /* Set up the clientname hash table */ - clientname_ht = g_hash_table_new (clientname_hash, NULL); + clientname_ht = g_hash_table_new (g_direct_hash, NULL); /* Setup up the server log file */ if (logfile) @@ -502,23 +501,15 @@ return sock; } -static guint -clientname_hash (gpointer key) -{ - return (int) key; -} - static void server_log (gchar *format, ...) { - va_list args, args2; + va_list args; char *buf; va_start (args, format); - va_start (args2, format); - buf = g_vsprintf (format, &args, &args2); + buf = g_strdup_vprintf (format, args); va_end (args); - va_end (args2); fputs (buf, server_log_file); if (server_log_file != stdout) diff -ruN gimp-1.0.2/plug-ins/script-fu/scripts/Makefile.am gimp-1.0.3/plug-ins/script-fu/scripts/Makefile.am --- gimp-1.0.2/plug-ins/script-fu/scripts/Makefile.am Tue May 19 05:02:13 1998 +++ gimp-1.0.3/plug-ins/script-fu/scripts/Makefile.am Thu Jan 21 16:20:46 1999 @@ -97,7 +97,6 @@ weave.scm \ xach-effect.scm -EXTRA_DATA = EXTRA_DIST = $(scriptdata_DATA) files: diff -ruN gimp-1.0.2/plug-ins/script-fu/scripts/Makefile.in gimp-1.0.3/plug-ins/script-fu/scripts/Makefile.in --- gimp-1.0.2/plug-ins/script-fu/scripts/Makefile.in Wed Oct 14 20:19:20 1998 +++ gimp-1.0.3/plug-ins/script-fu/scripts/Makefile.in Mon Mar 29 13:12:42 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -117,102 +120,9 @@ scriptdatadir = $(gimpdatadir)/scripts -scriptdata_DATA = \ - 3d-outline.scm \ - 3dTruchet.scm \ - add-bevel.scm \ - addborder.scm \ - alien-glow-arrow.scm \ - alien-glow-bar.scm \ - alien-glow-bullet.scm \ - alien-glow-button.scm \ - alien-glow-logo.scm \ - asc2img.scm \ - basic1-logo.scm \ - basic2-logo.scm \ - beavis.jpg \ - beveled-button.scm \ - beveled-pattern-arrow.scm \ - beveled-pattern-bullet.scm \ - beveled-pattern-button.scm \ - beveled-pattern-heading.scm \ - beveled-pattern-hrule.scm \ - blend-anim.scm \ - blended-logo.scm \ - bovinated-logo.scm \ - camo.scm \ - carve-it.scm \ - carved-logo.scm \ - chalk.scm \ - chip-away.scm \ - chrome-it.scm \ - chrome-logo.scm \ - circuit.scm \ - clothify.scm \ - coffee.scm \ - color-cycling.scm \ - comic-logo.scm \ - coolmetal-logo.scm \ - copy-visible.scm \ - crystal-logo.scm \ - distress_selection.scm \ - drop-shadow.scm \ - egg.scm \ - erase-rows.scm \ - fade-outline.scm \ - flatland.scm \ - font-map.scm \ - frosty-logo.scm \ - fuzzyborder.scm \ - gimp-headers.scm \ - gimp-labels.scm \ - glossy.scm \ - glowing-logo.scm \ - gradient-bevel-logo.scm \ - gradient-example.scm \ - grid-system.scm \ - hsv-graph.scm \ - i26-gunya2.scm \ - image-structure.scm \ - land.scm \ - lava.scm \ - line-nova.scm \ - old_photo.scm \ - mkbrush.scm \ - neon-logo.scm \ - perspective-shadow.scm \ - predator.scm \ - rendermap.scm \ - ripply-anim.scm \ - round-corners.scm \ - select_to_brush.scm \ - select_to_image.scm \ - selection-round.scm \ - slide.scm \ - sota-chrome-logo.scm \ - sphere.scm \ - spinning_globe.scm \ - starburst-logo.scm \ - starscape-logo.scm \ - swirltile.scm \ - swirly-pattern.scm \ - t-o-p-logo.scm \ - text-circle.scm \ - texture.jpg \ - texture1.jpg \ - texture2.jpg \ - texture3.jpg \ - textured-logo.scm \ - title-header.scm \ - tileblur.scm \ - trochoid.scm \ - truchet.scm \ - unsharp-mask.scm \ - waves-anim.scm \ - weave.scm \ - xach-effect.scm +scriptdata_DATA = 3d-outline.scm 3dTruchet.scm add-bevel.scm addborder.scm alien-glow-arrow.scm alien-glow-bar.scm alien-glow-bullet.scm alien-glow-button.scm alien-glow-logo.scm asc2img.scm basic1-logo.scm basic2-logo.scm beavis.jpg beveled-button.scm beveled-pattern-arrow.scm beveled-pattern-bullet.scm beveled-pattern-button.scm beveled-pattern-heading.scm beveled-pattern-hrule.scm blend-anim.scm blended-logo.scm bovinated-logo.scm camo.scm carve-it.scm carved-logo.scm chalk.scm chip-away.scm chrome-it.scm chrome-logo.scm circuit.scm clothify.scm coffee.scm color-cycling.scm comic-logo.scm coolmetal-logo.scm copy-visible.scm crystal-logo.scm distress_selection.scm drop-shadow.scm egg.scm erase-rows.scm fade-outline.scm flatland.scm font-map.scm frosty-logo.scm fuzzyborder.scm gimp-headers.scm gimp-labels.scm glossy.scm glowing-logo.scm gradient-bevel-logo.scm gradient-example.scm grid-system.scm hsv-graph.scm i26-gunya2.scm image-structure.scm land.scm lava.scm line-nova.scm old_photo.scm mkbrush.scm neon-logo.scm perspective-shadow.scm predator.scm rendermap.scm ripply-anim.scm round-corners.scm select_to_brush.scm select_to_image.scm selection-round.scm slide.scm sota-chrome-logo.scm sphere.scm spinning_globe.scm starburst-logo.scm starscape-logo.scm swirltile.scm swirly-pattern.scm t-o-p-logo.scm text-circle.scm texture.jpg texture1.jpg texture2.jpg texture3.jpg textured-logo.scm title-header.scm tileblur.scm trochoid.scm truchet.scm unsharp-mask.scm waves-anim.scm weave.scm xach-effect.scm + -EXTRA_DATA = EXTRA_DIST = $(scriptdata_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -225,11 +135,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: Makefile $(DATA) - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/script-fu/scripts/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -266,61 +175,74 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-scriptdataDATA - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-scriptdataDATA - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-scriptdataDATA +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-scriptdataDATA +uninstall: uninstall-am +all-am: Makefile $(DATA) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(scriptdatadir) + $(mkinstalldirs) $(DESTDIR)$(scriptdatadir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-generic +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am -clean: clean-generic mostlyclean +clean-am: clean-generic mostlyclean-am -distclean: distclean-generic clean - -rm -f config.status +clean: clean-am + +distclean-am: distclean-generic clean-am -rm -f libtool -maintainer-clean: maintainer-clean-generic distclean +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: uninstall-scriptdataDATA install-scriptdataDATA tags distdir \ -info dvi installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +info-am info dvi-am dvi check check-am installcheck-am installcheck \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/semiflatten/Makefile.in gimp-1.0.3/plug-ins/semiflatten/Makefile.in --- gimp-1.0.2/plug-ins/semiflatten/Makefile.in Wed Oct 14 20:27:57 1998 +++ gimp-1.0.3/plug-ins/semiflatten/Makefile.in Mon Mar 29 13:14:31 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = semiflatten -semiflatten_SOURCES = \ - semiflatten.c +semiflatten_SOURCES = semiflatten.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la semiflatten_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ semiflatten_LDADD = $(LDADD) semiflatten_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(semiflatten_SOURCES) OBJECTS = $(semiflatten_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/semiflatten/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done semiflatten.o: semiflatten.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/sgi/Makefile.in gimp-1.0.3/plug-ins/sgi/Makefile.in --- gimp-1.0.2/plug-ins/sgi/Makefile.in Wed Oct 14 20:28:04 1998 +++ gimp-1.0.3/plug-ins/sgi/Makefile.in Mon Mar 29 13:14:33 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = sgi -sgi_SOURCES = \ - sgi.c sgi.h sgilib.c +sgi_SOURCES = sgi.c sgi.h sgilib.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la sgi_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ sgi_LDADD = $(LDADD) sgi_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(sgi_SOURCES) OBJECTS = $(sgi_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/sgi/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done sgi.o: sgi.c sgi.h ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h sgilib.o: sgilib.c sgi.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/sharpen/Makefile.in gimp-1.0.3/plug-ins/sharpen/Makefile.in --- gimp-1.0.2/plug-ins/sharpen/Makefile.in Wed Oct 14 20:28:09 1998 +++ gimp-1.0.3/plug-ins/sharpen/Makefile.in Mon Mar 29 13:14:35 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = sharpen -sharpen_SOURCES = \ - sharpen.c +sharpen_SOURCES = sharpen.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la sharpen_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ sharpen_LDADD = $(LDADD) sharpen_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(sharpen_SOURCES) OBJECTS = $(sharpen_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/sharpen/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done sharpen.o: sharpen.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h ../../libgimp/gimpui.h \ ../../libgimp/gimpmenu.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/shift/Makefile.in gimp-1.0.3/plug-ins/shift/Makefile.in --- gimp-1.0.2/plug-ins/shift/Makefile.in Wed Oct 14 20:28:16 1998 +++ gimp-1.0.3/plug-ins/shift/Makefile.in Mon Mar 29 13:14:36 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = shift -shift_SOURCES = \ - shift.c +shift_SOURCES = shift.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la shift_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ shift_LDADD = $(LDADD) shift_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(shift_SOURCES) OBJECTS = $(shift_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/shift/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done shift.o: shift.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/sinus/Makefile.am gimp-1.0.3/plug-ins/sinus/Makefile.am --- gimp-1.0.2/plug-ins/sinus/Makefile.am Sun Aug 30 16:29:07 1998 +++ gimp-1.0.3/plug-ins/sinus/Makefile.am Thu Jan 21 16:20:48 1999 @@ -5,7 +5,7 @@ pluginlib_PROGRAMS = sinus sinus_SOURCES = \ - sinus.c sinus_logo.h $(top_srcdir)/plug-ins/megawidget/megawidget.h + sinus.c sinus_logo.h INCLUDES = \ $(X_CFLAGS) \ diff -ruN gimp-1.0.2/plug-ins/sinus/Makefile.in gimp-1.0.3/plug-ins/sinus/Makefile.in --- gimp-1.0.2/plug-ins/sinus/Makefile.in Wed Oct 14 20:28:22 1998 +++ gimp-1.0.3/plug-ins/sinus/Makefile.in Mon Mar 29 13:14:38 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,24 +122,17 @@ pluginlib_PROGRAMS = sinus -sinus_SOURCES = \ - sinus.c sinus_logo.h $(top_srcdir)/plug-ins/megawidget/megawidget.h +sinus_SOURCES = sinus.c sinus_logo.h + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la sinus_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -153,24 +149,24 @@ sinus_LDADD = $(LDADD) sinus_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(sinus_SOURCES) OBJECTS = $(sinus_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/sinus/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -192,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -248,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -277,80 +277,93 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done sinus.o: sinus.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h \ ../../plug-ins/megawidget/megawidget.h ../../config.h \ sinus_logo.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/smooth_palette/Makefile.in gimp-1.0.3/plug-ins/smooth_palette/Makefile.in --- gimp-1.0.2/plug-ins/smooth_palette/Makefile.in Wed Oct 14 20:28:27 1998 +++ gimp-1.0.3/plug-ins/smooth_palette/Makefile.in Mon Mar 29 13:14:39 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = smooth_palette -smooth_palette_SOURCES = \ - smooth_palette.c +smooth_palette_SOURCES = smooth_palette.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la smooth_palette_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ smooth_palette_LDADD = $(LDADD) smooth_palette_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(smooth_palette_SOURCES) OBJECTS = $(smooth_palette_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/smooth_palette/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done smooth_palette.o: smooth_palette.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/snoise/Makefile.in gimp-1.0.3/plug-ins/snoise/Makefile.in --- gimp-1.0.2/plug-ins/snoise/Makefile.in Wed Oct 14 20:28:32 1998 +++ gimp-1.0.3/plug-ins/snoise/Makefile.in Mon Mar 29 13:14:40 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = snoise -snoise_SOURCES = \ - snoise.c +snoise_SOURCES = snoise.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la snoise_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ snoise_LDADD = $(LDADD) snoise_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(snoise_SOURCES) OBJECTS = $(snoise_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/snoise/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done snoise.o: snoise.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/snoise/snoise.c gimp-1.0.3/plug-ins/snoise/snoise.c --- gimp-1.0.2/plug-ins/snoise/snoise.c Mon Apr 13 01:49:22 1998 +++ gimp-1.0.3/plug-ins/snoise/snoise.c Mon Mar 29 11:40:24 1999 @@ -62,6 +62,7 @@ #include #include +#include #include #include "gtk/gtk.h" diff -ruN gimp-1.0.2/plug-ins/snp/Makefile.in gimp-1.0.3/plug-ins/snp/Makefile.in --- gimp-1.0.2/plug-ins/snp/Makefile.in Wed Oct 14 20:28:38 1998 +++ gimp-1.0.3/plug-ins/snp/Makefile.in Mon Mar 29 13:14:41 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = snp -snp_SOURCES = \ - snp.c +snp_SOURCES = snp.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la snp_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ snp_LDADD = $(LDADD) snp_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(snp_SOURCES) OBJECTS = $(snp_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/snp/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done snp.o: snp.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/sobel/Makefile.in gimp-1.0.3/plug-ins/sobel/Makefile.in --- gimp-1.0.2/plug-ins/sobel/Makefile.in Wed Oct 14 20:28:44 1998 +++ gimp-1.0.3/plug-ins/sobel/Makefile.in Mon Mar 29 13:14:44 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = sobel -sobel_SOURCES = \ - sobel.c +sobel_SOURCES = sobel.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la sobel_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ sobel_LDADD = $(LDADD) sobel_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(sobel_SOURCES) OBJECTS = $(sobel_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/sobel/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done sobel.o: sobel.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/sparkle/Makefile.in gimp-1.0.3/plug-ins/sparkle/Makefile.in --- gimp-1.0.2/plug-ins/sparkle/Makefile.in Wed Oct 14 20:28:51 1998 +++ gimp-1.0.3/plug-ins/sparkle/Makefile.in Mon Mar 29 13:14:45 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = sparkle -sparkle_SOURCES = \ - sparkle.c +sparkle_SOURCES = sparkle.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la sparkle_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ sparkle_LDADD = $(LDADD) sparkle_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(sparkle_SOURCES) OBJECTS = $(sparkle_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/sparkle/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done sparkle.o: sparkle.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/spread/Makefile.in gimp-1.0.3/plug-ins/spread/Makefile.in --- gimp-1.0.2/plug-ins/spread/Makefile.in Wed Oct 14 20:28:58 1998 +++ gimp-1.0.3/plug-ins/spread/Makefile.in Mon Mar 29 13:14:46 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = spread -spread_SOURCES = \ - spread.c +spread_SOURCES = spread.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la spread_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ spread_LDADD = $(LDADD) spread_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(spread_SOURCES) OBJECTS = $(spread_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/spread/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done spread.o: spread.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/struc/Makefile.in gimp-1.0.3/plug-ins/struc/Makefile.in --- gimp-1.0.2/plug-ins/struc/Makefile.in Wed Oct 14 20:29:09 1998 +++ gimp-1.0.3/plug-ins/struc/Makefile.in Mon Mar 29 13:14:47 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = struc -struc_SOURCES = \ - struc.c struc.h +struc_SOURCES = struc.c struc.h + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la struc_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ struc_LDADD = $(LDADD) struc_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(struc_SOURCES) OBJECTS = $(struc_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/struc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done struc.o: struc.c struc.h ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/sunras/Makefile.in gimp-1.0.3/plug-ins/sunras/Makefile.in --- gimp-1.0.2/plug-ins/sunras/Makefile.in Wed Oct 14 20:29:17 1998 +++ gimp-1.0.3/plug-ins/sunras/Makefile.in Mon Mar 29 13:14:48 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = sunras -sunras_SOURCES = \ - sunras.c +sunras_SOURCES = sunras.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la sunras_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ sunras_LDADD = $(LDADD) sunras_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(sunras_SOURCES) OBJECTS = $(sunras_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/sunras/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done sunras.o: sunras.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/tga/Makefile.in gimp-1.0.3/plug-ins/tga/Makefile.in --- gimp-1.0.2/plug-ins/tga/Makefile.in Wed Oct 14 20:29:23 1998 +++ gimp-1.0.3/plug-ins/tga/Makefile.in Mon Mar 29 13:14:49 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = tga -tga_SOURCES = \ - tga.c +tga_SOURCES = tga.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la tga_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ tga_LDADD = $(LDADD) tga_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(tga_SOURCES) OBJECTS = $(tga_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/tga/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done tga.o: tga.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/threshold_alpha/Makefile.in gimp-1.0.3/plug-ins/threshold_alpha/Makefile.in --- gimp-1.0.2/plug-ins/threshold_alpha/Makefile.in Wed Oct 14 20:29:27 1998 +++ gimp-1.0.3/plug-ins/threshold_alpha/Makefile.in Mon Mar 29 13:14:51 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = threshold_alpha -threshold_alpha_SOURCES = \ - threshold_alpha.c +threshold_alpha_SOURCES = threshold_alpha.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la threshold_alpha_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ threshold_alpha_LDADD = $(LDADD) threshold_alpha_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(threshold_alpha_SOURCES) OBJECTS = $(threshold_alpha_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/threshold_alpha/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done threshold_alpha.o: threshold_alpha.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/tiff/Makefile.in gimp-1.0.3/plug-ins/tiff/Makefile.in --- gimp-1.0.2/plug-ins/tiff/Makefile.in Wed Oct 14 20:19:41 1998 +++ gimp-1.0.3/plug-ins/tiff/Makefile.in Mon Mar 29 13:12:48 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,23 +122,17 @@ pluginlib_PROGRAMS = tiff -tiff_SOURCES = \ - tiff.c +tiff_SOURCES = tiff.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) @LIBTIFF_LIB@ + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBTIFF_LIB@ - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la tiff_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -152,24 +149,24 @@ tiff_LDADD = $(LDADD) tiff_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(tiff_SOURCES) OBJECTS = $(tiff_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/tiff/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -191,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -247,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -276,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done tiff.o: tiff.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/tiff/tiff.c gimp-1.0.3/plug-ins/tiff/tiff.c --- gimp-1.0.2/plug-ins/tiff/tiff.c Sun Oct 11 13:48:09 1998 +++ gimp-1.0.3/plug-ins/tiff/tiff.c Thu Jan 21 16:20:27 1999 @@ -36,6 +36,7 @@ #include "gtk/gtk.h" #include "libgimp/gimp.h" + typedef struct { gint compression; @@ -47,6 +48,14 @@ gint run; } TiffSaveInterface; +typedef struct { + gint32 ID; + GDrawable *drawable; + GPixelRgn pixel_rgn; + guchar *pixels; + guchar *pixel; +} channel_data; + /* Declare some local functions. */ static void query (void); @@ -56,6 +65,18 @@ int *nreturn_vals, GParam **return_vals); static gint32 load_image (char *filename); +static void load_separate (TIFF *tif, GDrawable *drawable, + channel_data *channel, + unsigned short bps, unsigned short photomet, + int rows, int cols, int alpha, int extra); +static void load_8bit (TIFF *tif, GDrawable *drawable, + channel_data *channel, + unsigned short bps, unsigned short photomet, + int rows, int cols, int alpha, int extra); +static void load_default (TIFF *tif, GDrawable *drawable, + channel_data *channel, + unsigned short bps, unsigned short photomet, + int rows, int cols, int alpha, int extra); static gint save_image (char *filename, gint32 image, gint32 drawable); @@ -68,7 +89,10 @@ gpointer data); static void save_toggle_update (GtkWidget *widget, gpointer data); +static void comment_entry_callback (GtkWidget *widget, + gpointer data); +#define DEFAULT_COMMENT "Created with The GIMP" GPlugInInfo PLUG_IN_INFO = { @@ -89,6 +113,7 @@ FALSE /* run */ }; +static char *image_comment= NULL; MAIN () @@ -149,6 +174,9 @@ gimp_register_save_handler ("file_tiff_save", "tif,tiff", ""); } + + + static void run (char *name, int nparams, @@ -159,6 +187,9 @@ static GParam values[2]; GRunModeType run_mode; GStatusType status = STATUS_SUCCESS; +#ifdef GIMP_HAVE_PARASITES + Parasite *parasite; +#endif /* GIMP_HAVE_PARASITES */ gint32 image; run_mode = param[0].data.d_int32; @@ -186,16 +217,41 @@ } else if (strcmp (name, "file_tiff_save") == 0) { + +/* Do this right this time, if POSSIBLE query for parasites, otherwise + or if there isn't one, choose the DEFAULT_COMMENT */ + +#ifdef GIMP_HAVE_PARASITES + int image = param[1].data.d_int32; + + parasite = gimp_image_find_parasite(image, "gimp-comment"); + if (parasite) + image_comment = g_strdup(parasite->data); + parasite_free(parasite); +#endif /* GIMP_HAVE_PARASITES */ + + if (!image_comment) image_comment = g_strdup(DEFAULT_COMMENT); + switch (run_mode) { case RUN_INTERACTIVE: + { /* Possibly retrieve data */ gimp_get_data ("file_tiff_save", &tsvals); +#ifdef GIMP_HAVE_PARASITES + parasite = gimp_image_find_parasite(image, "tiff-save-options"); + if (parasite) + { + tsvals.compression = ((TiffSaveVals *)parasite->data)->compression; + tsvals.fillorder = ((TiffSaveVals *)parasite->data)->fillorder; + } + parasite_free(parasite); +#endif /* GIMP_HAVE_PARASITES */ /* First acquire information with a dialog */ if (! save_dialog ()) return; - break; + } break; case RUN_NONINTERACTIVE: /* Make sure all the arguments are there! */ @@ -220,7 +276,18 @@ case RUN_WITH_LAST_VALS: /* Possibly retrieve data */ + { gimp_get_data ("file_tiff_save", &tsvals); +#ifdef GIMP_HAVE_PARASITES + parasite = gimp_image_find_parasite(image, "tiff-save-options"); + if (parasite) + { + tsvals.compression = ((TiffSaveVals *)parasite->data)->compression; + tsvals.fillorder = ((TiffSaveVals *)parasite->data)->fillorder; + } + parasite_free(parasite); +#endif /* GIMP_HAVE_PARASITES */ + } break; default: @@ -242,39 +309,31 @@ static gint32 load_image (char *filename) { TIFF *tif; - unsigned short bps, spp, photomet; - int cols, rows, maxval, alpha; + unsigned short bps, spp, photomet, planar; + int cols, rows, alpha; int image, layer, tile_height; unsigned short *redmap, *greenmap, *bluemap; guchar cmap[768]; int image_type= 0, layer_type= 0; unsigned short extra, *extra_types; - int col, row, start, i, j; - unsigned char sample; - int bitsleft; - int gray_val, red_val, green_val, blue_val, alpha_val; + int i, j; - guchar *source, *s, *dest, *d; GDrawable *drawable; - GPixelRgn pixel_rgn; char *name; guchar colors[3]= {0, 0, 0}; - typedef struct { - gint32 ID; - GDrawable *drawable; - GPixelRgn pixel_rgn; - guchar *pixels; - guchar *pixel; - } channel_data; - channel_data *channel= NULL; + TiffSaveVals save_vals; +#ifdef GIMP_HAVE_PARASITES + Parasite *parasite; +#endif /* GIMP_HAVE_PARASITES */ + guint16 tmp; tif = TIFFOpen (filename, "r"); if (!tif) { - g_message("TIFF Can't open \n%s", filename); + g_message("TIFF Can't open %s\n", filename); gimp_quit (); } @@ -287,10 +346,12 @@ bps = 1; if (bps > 8) { - g_message("TIFF Can't handle samples wider than 8-bit"); + g_message("TIFF Can't handle samples wider than 8-bit\n"); gimp_quit(); } + if (!TIFFGetField (tif, TIFFTAG_PLANARCONFIG, &planar)) + planar = PLANARCONFIG_SEPARATE; if (!TIFFGetField (tif, TIFFTAG_SAMPLESPERPIXEL, &spp)) spp = 1; if (!TIFFGetField (tif, TIFFTAG_EXTRASAMPLES, &extra, &extra_types)) @@ -307,27 +368,30 @@ } if (!TIFFGetField (tif, TIFFTAG_PHOTOMETRIC, &photomet)) { - g_message("TIFF Can't get photometric"); - gimp_quit (); + g_message("TIFF Can't get photometric\nassuming min-is-black"); + /* old AppleScan software misses out the photometric tag (and + * incidentally assumes min-is-white, but xv assumes min-is-black, + * so we follow xv's lead. It's not much hardship to invert the + * image later). */ + photomet = PHOTOMETRIC_MINISBLACK; } /* test if the extrasample represents an associated alpha channel... */ if (extra > 0 && (extra_types[0] == EXTRASAMPLE_ASSOCALPHA)) { alpha = 1; + --extra; } else { alpha = 0; } - if (photomet == PHOTOMETRIC_RGB && spp > extra + 3) { - extra= spp - 3; + if (photomet == PHOTOMETRIC_RGB && spp > 3 + extra) { alpha= 1; - } else if (photomet != PHOTOMETRIC_RGB && spp > extra + 1) { - extra= spp - 1; + extra= spp - 4; + } else if (photomet != PHOTOMETRIC_RGB && spp > 1 + extra) { alpha= 1; + extra= spp - 2; } - maxval = (1 << bps) - 1; - switch (photomet) { case PHOTOMETRIC_MINISBLACK: case PHOTOMETRIC_MINISWHITE: @@ -360,6 +424,110 @@ } gimp_image_set_filename (image, filename); + /* attach a parasite containing the compression/fillorder */ + if (!TIFFGetField (tif, TIFFTAG_COMPRESSION, &tmp)) + save_vals.compression = COMPRESSION_NONE; + else + save_vals.compression = tmp; + if (!TIFFGetField (tif, TIFFTAG_FILLORDER, &tmp)) + save_vals.fillorder = FILLORDER_LSB2MSB; + else + save_vals.fillorder = tmp; +#ifdef GIMP_HAVE_PARASITES + parasite = parasite_new("tiff-save-options", 0, + sizeof(save_vals), &save_vals); + gimp_image_attach_parasite(image, parasite); + parasite_free(parasite); +#endif /* GIMP_HAVE_PARASITES */ + + + /* Attach a parasite containing the image description. Pretend to + * be a gimp comment so other plugins will use this description as + * an image comment where appropriate. */ +#ifdef GIMP_HAVE_PARASITES + { + char *img_desc; + + if (TIFFGetField (tif, TIFFTAG_IMAGEDESCRIPTION, &img_desc)) + { + int len; + + len = strlen(img_desc) + 1; + len = MIN(len, 241); + img_desc[len-1] = '\000'; + + parasite = parasite_new("gimp-comment", PARASITE_PERSISTENT, + len, img_desc); + gimp_image_attach_parasite(image, parasite); + parasite_free(parasite); + } + } +#endif /* GIMP_HAVE_PARASITES */ + + /* any resolution info in the file? */ +#ifdef GIMP_HAVE_RESOLUTION_INFO + { + float xres=0.0, yres=0.0; + unsigned short units; + + if (TIFFGetField (tif, TIFFTAG_XRESOLUTION, &xres)) { + if (TIFFGetField (tif, TIFFTAG_YRESOLUTION, &yres)) { + + if (TIFFGetField (tif, TIFFTAG_RESOLUTIONUNIT, &units)) { + switch(units) { + case RESUNIT_NONE: + /* ImageMagick writes files with this silly resunit */ + g_message("TIFF warning: resolution units meaningless, " + "forcing 72 dpi\n"); + xres = 72.0; + yres = 72.0; + break; + + case RESUNIT_INCH: + break; + + case RESUNIT_CENTIMETER: + xres *= 2.54; + yres *= 2.54; + break; + + default: + g_message("TIFF file error: unknown resolution unit type %d, " + "assuming dpi\n", units); + } + } else { /* no res unit tag */ + /* old AppleScan software produces these */ + g_message("TIFF warning: resolution specified without\n" + "any units tag, assuming dpi\n"); + } + } else { /* xres but no yres */ + g_message("TIFF warning: no y resolution info, assuming same as x\n"); + yres = xres; + } + + /* sanity check, since division by zero later could be embarrassing */ + if (xres < 1e-5 || yres < 1e-5) { + g_message("TIFF: image resolution is zero: forcing 72 dpi\n"); + xres = 72.0; + yres = 72.0; + } + + /* now set the new image's resolution info */ + gimp_image_set_resolution (image, xres, yres); + } + + /* no x res tag => we assume we have no resolution info, so we + * don't care. Older versions of this plugin used to write files + * with no resolution tags at all. */ + + /* TODO: haven't caught the case where yres tag is present, but + not xres. This is left as an exercise for the reader - they + should feel free to shoot the author of the broken program + that produced the damaged TIFF file in the first place. */ + } +#endif /* GIMP_HAVE_RESOLUTION_INFO */ + + /* Install colormap for INDEXED images only */ if (image_type == INDEXED) { if (!TIFFGetField (tif, TIFFTAG_COLORMAP, &redmap, &greenmap, &bluemap)) { @@ -367,12 +535,12 @@ gimp_quit (); } - for (i = 0, j = 0; i <= maxval; i++) { + for (i = 0, j = 0; i < (1 << bps); i++) { cmap[j++] = redmap[i] >> 8; cmap[j++] = greenmap[i] >> 8; cmap[j++] = bluemap[i] >> 8; } - gimp_image_set_cmap (image, cmap, maxval + 1); + gimp_image_set_cmap (image, cmap, (1 << bps)); } layer = gimp_layer_new (image, "Background", cols, rows, layer_type, @@ -380,25 +548,153 @@ gimp_image_add_layer (image, layer, 0); drawable = gimp_drawable_get (layer); - source= g_new (guchar, TIFFScanlineSize (tif)); tile_height = gimp_tile_height (); + + if (extra > 0) { + channel = g_new (channel_data, extra); + + /* Add alpha channels as appropriate */ + for (i= 0; i < extra; ++i) { + channel[i].ID= gimp_channel_new(image, "TIFF Channel", cols, rows, + 100.0, colors); + gimp_image_add_channel(image, channel[i].ID, 0); + channel[i].drawable= gimp_drawable_get (channel[i].ID); + channel[i].pixels= g_new(guchar, tile_height * cols); + + gimp_pixel_rgn_init (&(channel[i].pixel_rgn), channel[i].drawable, 0, 0, + cols, rows, TRUE, FALSE); + } + } + + if (planar == PLANARCONFIG_SEPARATE) { + load_separate(tif, drawable, channel, bps, photomet, + rows, cols, alpha, extra); + } else if (bps == 8) { + load_8bit(tif, drawable, channel, bps, photomet, rows, cols, alpha, extra); + } else { + load_default(tif, drawable, channel, bps, photomet, + rows, cols, alpha, extra); + } + + gimp_drawable_flush (drawable); + gimp_drawable_detach (drawable); + + for (i= 0; i < extra; ++i) { + gimp_drawable_flush (channel[i].drawable); + gimp_drawable_detach (channel[i].drawable); + } + + return image; +} + +static void +load_8bit(TIFF *tif, GDrawable *drawable, + channel_data *channel, + unsigned short bps, unsigned short photomet, + int rows, int cols, int alpha, int extra) +{ + guchar *source, *dest, *s, *d; + GPixelRgn pixel_rgn; + int gray_val, red_val, green_val, blue_val, alpha_val; + int col, row, start, i; + int tile_height = gimp_tile_height (); + + source= g_new (guchar, TIFFScanlineSize (tif)); dest = g_new (guchar, tile_height * cols * drawable->bpp); gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0, cols, rows, TRUE, FALSE); - if (extra - alpha > 0) - channel = g_new (channel_data, extra - alpha); + for (start= 0, row = 0; row < rows; ++row) { + d= dest + cols * (row % tile_height) * drawable->bpp; - /* Add alpha channels as appropriate */ - for (i= 0; alpha + i < extra; ++i) { - channel[i].ID= gimp_channel_new(image, "TIFF Channel", cols, rows, - 100.0, colors); - gimp_image_add_channel(image, channel[i].ID, 0); - channel[i].drawable= gimp_drawable_get (channel[i].ID); - channel[i].pixels= g_new(guchar, tile_height * cols); + if (TIFFReadScanline (tif, source, row, 0) < 0) { + g_message("TIFF Bad data read on line %d\n", row); + gimp_quit (); + } + + for (i= 0; i < extra; ++i) { + channel[i].pixel= channel[i].pixels + cols * (row % tile_height); + } + + s= source; + + for (col = 0; col < cols; col++) { + switch (photomet) { + case PHOTOMETRIC_MINISBLACK: + if (alpha) { + gray_val= *s++; + alpha_val= *s++; + if (alpha_val) + *d++ = gray_val * 255 / alpha_val; + else + *d++ = 0; + *d++ = alpha_val; + } else { + *d++ = *s++; + } + break; - gimp_pixel_rgn_init (&(channel[i].pixel_rgn), channel[i].drawable, 0, 0, - cols, rows, TRUE, FALSE); + case PHOTOMETRIC_MINISWHITE: + if (alpha) { + gray_val= *s++; + alpha_val= *s++; + if (alpha_val) + *d++ = ((255 - gray_val) * 255) / alpha_val; + else + *d++ = 0; + *d++ = alpha_val; + } else { + *d++ = ~(*s++); + } + break; + + case PHOTOMETRIC_PALETTE: + *d++= *s++; + if (alpha) *d++= *s++; + break; + + case PHOTOMETRIC_RGB: + if (alpha) { + red_val= *s++; + green_val= *s++; + blue_val= *s++; + alpha_val= *s++; + if (alpha_val) { + *d++ = (red_val * 255) / alpha_val; + *d++ = (green_val * 255) / alpha_val; + *d++ = (blue_val * 255) / alpha_val; + } else { + *d++ = 0; + *d++ = 0; + *d++ = 0; + } + *d++ = alpha_val; + } else { + *d++ = *s++; + *d++ = *s++; + *d++ = *s++; + } + break; + + default: + /* This case was handled earlier */ + g_assert_not_reached(); + } + for (i= 0; i < extra; ++i) { + *channel[i].pixel++ = *s++; + } + } + + if (((row + 1) % tile_height) == 0 || row + 1 == rows) { + gimp_pixel_rgn_set_rect (&pixel_rgn, dest, 0, start, cols, 1+row-start); + for (i= 0; alpha + i < extra; ++i) { + gimp_pixel_rgn_set_rect(&(channel[i].pixel_rgn), channel[i].pixels, + 0, start, cols, 1+row-start); + } + gimp_progress_update ((double) row / (double) rows); + start= row + 1; + } } +} /* Step through all <= 8-bit samples in an image */ @@ -413,121 +709,109 @@ var = ( *s >> bitsleft ) & maxval; \ } +static void +load_default(TIFF *tif, GDrawable *drawable, + channel_data *channel, + unsigned short bps, unsigned short photomet, + int rows, int cols, int alpha, int extra) +{ + guchar *source, *dest, *s, *d; + GPixelRgn pixel_rgn; + int gray_val, red_val, green_val, blue_val, alpha_val; + int col, row, start, i; + int bitsleft, maxval = (1 << bps) - 1; + int tile_height = gimp_tile_height (); + + source= g_new (guchar, TIFFScanlineSize (tif)); + dest = g_new (guchar, tile_height * cols * drawable->bpp); + gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0, cols, rows, TRUE, FALSE); + for (start= 0, row = 0; row < rows; ++row) { d= dest + cols * (row % tile_height) * drawable->bpp; - /* Special cases: Scanline is compatible with GIMP storage */ - if (extra == 0 && bps == 8) { - if (TIFFReadScanline (tif, d, row, 0) < 0) { - g_message("TIFF Bad data read on line %d", row); - gimp_quit (); - } - - /* Or read in and process each sample -- slower */ - } else { - if (TIFFReadScanline (tif, source, row, 0) < 0) { - g_message("TIFF Bad data read on line %d\n", row); - gimp_quit (); - } + if (TIFFReadScanline (tif, source, row, 0) < 0) { + g_message("TIFF Bad data read on line %d\n", row); + gimp_quit (); + } - for (i= 0; alpha + i < extra; ++i) { - channel[i].pixel= channel[i].pixels + cols * (row % tile_height); - } + for (i= 0; i < extra; ++i) { + channel[i].pixel= channel[i].pixels + cols * (row % tile_height); + } - /* Set s/bitleft ready to use NEXTSAMPLE macro */ + /* Set s/bitsleft ready to use NEXTSAMPLE macro */ - s= source; - bitsleft= 8; + s= source; + bitsleft= 8; + for (col = 0; col < cols; col++) { switch (photomet) { case PHOTOMETRIC_MINISBLACK: - for (col = 0; col < cols; col++) { - NEXTSAMPLE(gray_val); - if (alpha) { - NEXTSAMPLE(alpha_val); - if (alpha_val) - *d++ = (gray_val * 65025) / (alpha_val * maxval); - else - *d++ = 0; - *d++ = alpha_val; - } else { - *d++ = (gray_val * 255) / maxval; - } - for (i= 0; alpha + i < extra; ++i) { - NEXTSAMPLE(sample); - *channel[i].pixel++ = sample; - } - } - break; + NEXTSAMPLE(gray_val); + if (alpha) { + NEXTSAMPLE(alpha_val); + if (alpha_val) + *d++ = (gray_val * 65025) / (alpha_val * maxval); + else + *d++ = 0; + *d++ = alpha_val; + } else { + *d++ = (gray_val * 255) / maxval; + } + break; case PHOTOMETRIC_MINISWHITE: - for (col = 0; col < cols; col++) { - NEXTSAMPLE(gray_val); - if (alpha) { - NEXTSAMPLE(alpha_val); - if (alpha_val) - *d++ = ((maxval - gray_val) * 65025) / (alpha_val * maxval); - else - *d++ = 0; - *d++ = alpha_val; - } else { - *d++ = ((maxval - gray_val) * 255) / maxval; - } - for (i= 0; alpha + i < extra; ++i) { - NEXTSAMPLE(sample); - *channel[i].pixel++ = sample; - } + NEXTSAMPLE(gray_val); + if (alpha) { + NEXTSAMPLE(alpha_val); + if (alpha_val) + *d++ = ((maxval - gray_val) * 65025) / (alpha_val * maxval); + else + *d++ = 0; + *d++ = alpha_val; + } else { + *d++ = ((maxval - gray_val) * 255) / maxval; } break; case PHOTOMETRIC_PALETTE: - for (col = 0; col < cols; col++) { + NEXTSAMPLE(*d++); + if (alpha) { NEXTSAMPLE(*d++); - if (alpha) { - NEXTSAMPLE(*d++); - } - for (i= 0; alpha + i < extra; ++i) { - NEXTSAMPLE(sample); - *channel[i].pixel++ = sample; - } } break; case PHOTOMETRIC_RGB: - for (col = 0; col < cols; col++) { - NEXTSAMPLE(red_val) - NEXTSAMPLE(green_val) - NEXTSAMPLE(blue_val) - if (alpha) { - NEXTSAMPLE(alpha_val) - if (alpha_val) { - *d++ = (red_val * 255) / alpha_val; - *d++ = (green_val * 255) / alpha_val; - *d++ = (blue_val * 255) / alpha_val; - } else { - *d++ = 0; - *d++ = 0; - *d++ = 0; - } - *d++ = alpha_val; - } else { - *d++ = red_val; - *d++ = green_val; - *d++ = blue_val; + NEXTSAMPLE(red_val) + NEXTSAMPLE(green_val) + NEXTSAMPLE(blue_val) + if (alpha) { + NEXTSAMPLE(alpha_val) + if (alpha_val) { + *d++ = (red_val * 255) / alpha_val; + *d++ = (green_val * 255) / alpha_val; + *d++ = (blue_val * 255) / alpha_val; + } else { + *d++ = 0; + *d++ = 0; + *d++ = 0; } - for (i= 0; alpha + i < extra; ++i) { - NEXTSAMPLE(sample); - *channel[i].pixel++ = sample; - } - } + *d++ = alpha_val; + } else { + *d++ = red_val; + *d++ = green_val; + *d++ = blue_val; + } break; default: /* This case was handled earlier */ g_assert_not_reached(); } + for (i= 0; i < extra; ++i) { + NEXTSAMPLE(alpha_val); + *channel[i].pixel++ = alpha_val; + } } - if (((row + 1) % tile_height) == 0 || row + 1 == rows) { gimp_pixel_rgn_set_rect (&pixel_rgn, dest, 0, start, cols, 1+row-start); @@ -539,11 +823,155 @@ start= row + 1; } } +} - gimp_drawable_flush (drawable); - gimp_drawable_detach (drawable); +static void +load_separate(TIFF *tif, GDrawable *drawable, + channel_data *channel, + unsigned short bps, unsigned short photomet, + int rows, int cols, int alpha, int extra) +{ + guchar *source, *dest, *s, *d; + GPixelRgn pixel_rgn; + int col, row, start; + int bitsleft, maxval = (1 << bps) - 1; + int tile_height = gimp_tile_height (); + + TIFFPrintDirectory(tif, stdout, 0); + if (photomet != PHOTOMETRIC_RGB) { + g_message("So far PLANARCONFIG_SEPARATE only supports RGB images"); + gimp_quit(); + } - return image; + source= g_new (guchar, TIFFScanlineSize (tif)); + dest = g_new (guchar, tile_height * cols * drawable->bpp); + gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0, cols, rows, TRUE, FALSE); + + /* RED channel */ + for (start= 0, row = 0; row < rows; ++row) { + d= dest + cols * (row % tile_height) * drawable->bpp; + + if (TIFFReadScanline (tif, source, row, 0) < 0) { + g_message("TIFF Bad data read on line %d\n", row); + gimp_quit (); + } + + /* Set s/bitsleft ready to use NEXTSAMPLE macro */ + + s= source; + bitsleft= 8; + + for (col = 0; col < cols; col++) { + NEXTSAMPLE(d[col * (3 + alpha)]) + } + + if (((row + 1) % tile_height) == 0 || row + 1 == rows) { + gimp_pixel_rgn_set_rect (&pixel_rgn, dest, 0, start, cols, 1+row-start); + gimp_progress_update ((double) row / (double) rows); + start= row + 1; + } + } + + /* GREEN channel */ + for (start= 0, row = 0; row < rows; ++row) { + d= dest + cols * (row % tile_height) * drawable->bpp; + + if ((row % tile_height) == 0) { + if (rows - row < tile_height) + gimp_pixel_rgn_get_rect(&pixel_rgn, dest, 0, start, cols, rows - row); + else + gimp_pixel_rgn_get_rect(&pixel_rgn, dest, 0, start, cols, tile_height); + gimp_progress_update ((double) row / (double) rows); + } + + if (TIFFReadScanline (tif, source, row, 1) < 0) { + g_message("TIFF Bad data read on line %d\n", row); + gimp_quit (); + } + + /* Set s/bitsleft ready to use NEXTSAMPLE macro */ + + s= source; + bitsleft= 8; + + for (col = 0; col < cols; col++) { + NEXTSAMPLE(d[col * (3 + alpha) + 1]) + } + + if (((row + 1) % tile_height) == 0 || row + 1 == rows) { + gimp_pixel_rgn_set_rect (&pixel_rgn, dest, 0, start, cols, 1+row-start); + gimp_progress_update ((double) row / (double) rows); + start= row + 1; + } + } + + /* BLUE channel */ + for (start= 0, row = 0; row < rows; ++row) { + d= dest + cols * (row % tile_height) * drawable->bpp; + + if ((row % tile_height) == 0) { + if (rows - row < tile_height) + gimp_pixel_rgn_get_rect(&pixel_rgn, dest, 0, start, cols, rows - row); + else + gimp_pixel_rgn_get_rect(&pixel_rgn, dest, 0, start, cols, tile_height); + gimp_progress_update ((double) row / (double) rows); + } + + if (TIFFReadScanline (tif, source, row, 2) < 0) { + g_message("TIFF Bad data read on line %d\n", row); + gimp_quit (); + } + + /* Set s/bitsleft ready to use NEXTSAMPLE macro */ + + s= source; + bitsleft= 8; + + for (col = 0; col < cols; col++) { + NEXTSAMPLE(d[col * (3 + alpha) + 2]) + } + + if (((row + 1) % tile_height) == 0 || row + 1 == rows) { + gimp_pixel_rgn_set_rect (&pixel_rgn, dest, 0, start, cols, 1+row-start); + gimp_progress_update ((double) row / (double) rows); + start= row + 1; + } + } + + /* ALPHA channel */ + if (alpha) { + for (start= 0, row = 0; row < rows; ++row) { + d= dest + cols * (row % tile_height) * drawable->bpp; + + if ((row % tile_height) == 0) { + if (rows - row < tile_height) + gimp_pixel_rgn_get_rect(&pixel_rgn, dest, 0, start, cols, rows - row); + else + gimp_pixel_rgn_get_rect(&pixel_rgn, dest, 0, start, cols, tile_height); + gimp_progress_update ((double) row / (double) rows); + } + + if (TIFFReadScanline (tif, source, row, 3) < 0) { + g_message("TIFF Bad data read on line %d\n", row); + gimp_quit (); + } + + /* Set s/bitsleft ready to use NEXTSAMPLE macro */ + + s= source; + bitsleft= 8; + + for (col = 0; col < cols; col++) { + NEXTSAMPLE(d[col * 4 + 3]) + } + + if (((row + 1) % tile_height) == 0 || row + 1 == rows) { + gimp_pixel_rgn_set_rect (&pixel_rgn, dest, 0, start, cols, 1+row-start); + gimp_progress_update ((double) row / (double) rows); + start= row + 1; + } + } + } } /* @@ -625,6 +1053,7 @@ switch (drawable_type) { case RGB_IMAGE: + predictor = 2; samplesperpixel = 3; bitspersample = 8; photometric = PHOTOMETRIC_RGB; @@ -639,6 +1068,7 @@ alpha = 0; break; case RGBA_IMAGE: + predictor = 2; samplesperpixel = 4; bitspersample = 8; photometric = PHOTOMETRIC_RGB; @@ -670,6 +1100,8 @@ break; case INDEXEDA_IMAGE: return 0; + default: + return 0; } if (rowsperstrip == 0) @@ -693,12 +1125,44 @@ TIFFSetField (tif, TIFFTAG_PHOTOMETRIC, photometric); TIFFSetField (tif, TIFFTAG_FILLORDER, fillorder); TIFFSetField (tif, TIFFTAG_DOCUMENTNAME, filename); - TIFFSetField (tif, TIFFTAG_IMAGEDESCRIPTION, "Created with The GIMP"); TIFFSetField (tif, TIFFTAG_SAMPLESPERPIXEL, samplesperpixel); TIFFSetField (tif, TIFFTAG_ROWSPERSTRIP, rowsperstrip); /* TIFFSetField( tif, TIFFTAG_STRIPBYTECOUNTS, rows / rowsperstrip ); */ TIFFSetField (tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); +#ifdef GIMP_HAVE_RESOLUTION_INFO + /* resolution fields */ + { + float xresolution; + float yresolution; + + gimp_image_get_resolution (image, &xresolution, &yresolution); + + if (xresolution > 1e-5 && yresolution > 1e-5) + { + TIFFSetField (tif, TIFFTAG_XRESOLUTION, xresolution); + TIFFSetField (tif, TIFFTAG_YRESOLUTION, yresolution); + TIFFSetField (tif, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH); + } + } +#endif /* GIMP_HAVE_RESOLUTION_INFO */ + + /* do we have a comment? If so, create a new parasite to hold it, + * and attach it to the image. The attach function automatically + * detaches a previous incarnation of the parasite. */ +#ifdef GIMP_HAVE_PARASITES + if (image_comment && *image_comment != '\000') + { + Parasite *parasite; + + TIFFSetField (tif, TIFFTAG_IMAGEDESCRIPTION, image_comment); + parasite = parasite_new ("gimp-comment", 1, + strlen(image_comment)+1, image_comment); + gimp_image_attach_parasite (image, parasite); + parasite_free (parasite); + } +#endif /* GIMP_HAVE_PARASITES */ + if (drawable_type == INDEXED_IMAGE) TIFFSetField (tif, TIFFTAG_COLORMAP, red, grn, blu); @@ -781,6 +1245,9 @@ GtkWidget *toggle; GtkWidget *frame; GtkWidget *toggle_vbox; + GtkWidget *hbox; + GtkWidget *label; + GtkWidget *entry; GSList *group; gchar **argv; gint argc; @@ -822,11 +1289,14 @@ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0); gtk_widget_show (button); + /* hbox for compression and fillorder settings */ + hbox = gtk_hbox_new (FALSE, 5); + /* compression */ frame = gtk_frame_new ("Compression"); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); gtk_container_border_width (GTK_CONTAINER (frame), 10); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, FALSE, 0); toggle_vbox = gtk_vbox_new (FALSE, 5); gtk_container_border_width (GTK_CONTAINER (toggle_vbox), 5); gtk_container_add (GTK_CONTAINER (frame), toggle_vbox); @@ -866,7 +1336,7 @@ frame = gtk_frame_new ("Fill Order"); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); gtk_container_border_width (GTK_CONTAINER (frame), 10); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, FALSE, 0); toggle_vbox = gtk_vbox_new (FALSE, 5); gtk_container_border_width (GTK_CONTAINER (toggle_vbox), 5); gtk_container_add (GTK_CONTAINER (frame), toggle_vbox); @@ -893,6 +1363,33 @@ gtk_widget_show (toggle_vbox); gtk_widget_show (frame); + + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show (hbox); + + + /* comment entry */ + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); + gtk_container_border_width (GTK_CONTAINER (frame), 10); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, FALSE, TRUE, 0); + + hbox = gtk_hbox_new (FALSE, 5); + label = gtk_label_new ("Comment: "); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); + entry = gtk_entry_new (); + gtk_widget_show (entry); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + gtk_entry_set_text (GTK_ENTRY (entry), image_comment); + gtk_signal_connect (GTK_OBJECT (entry), "changed", + (GtkSignalFunc) comment_entry_callback, + NULL); + + gtk_container_add (GTK_CONTAINER (frame), hbox); + gtk_widget_show (hbox); + gtk_widget_show (frame); + gtk_widget_show (dlg); gtk_main (); @@ -943,4 +1440,27 @@ *toggle_val = TRUE; else *toggle_val = FALSE; +} + +static void +comment_entry_callback (GtkWidget *widget, + gpointer data) +{ + int len; + char *text; + + text = gtk_entry_get_text (GTK_ENTRY (widget)); + len = strlen(text); + + /* Temporary kludge for overlength strings - just return */ + if (len > 240) + { + g_message ("TIFF save: Your comment string is too long.\n"); + return; + } + + g_free(image_comment); + image_comment = g_strdup(text); + + /* g_print ("COMMENT: %s\n", image_comment); */ } diff -ruN gimp-1.0.2/plug-ins/tile/Makefile.in gimp-1.0.3/plug-ins/tile/Makefile.in --- gimp-1.0.2/plug-ins/tile/Makefile.in Wed Oct 14 20:29:31 1998 +++ gimp-1.0.3/plug-ins/tile/Makefile.in Mon Mar 29 13:14:52 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = tile -tile_SOURCES = \ - tile.c +tile_SOURCES = tile.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la tile_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ tile_LDADD = $(LDADD) tile_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(tile_SOURCES) OBJECTS = $(tile_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/tile/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done tile.o: tile.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/tileit/Makefile.in gimp-1.0.3/plug-ins/tileit/Makefile.in --- gimp-1.0.2/plug-ins/tileit/Makefile.in Wed Oct 14 20:29:41 1998 +++ gimp-1.0.3/plug-ins/tileit/Makefile.in Mon Mar 29 13:14:53 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = tileit -tileit_SOURCES = \ - tileit.c +tileit_SOURCES = tileit.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la tileit_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ tileit_LDADD = $(LDADD) tileit_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(tileit_SOURCES) OBJECTS = $(tileit_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/tileit/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done tileit.o: tileit.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/tiler/Makefile.in gimp-1.0.3/plug-ins/tiler/Makefile.in --- gimp-1.0.2/plug-ins/tiler/Makefile.in Wed Oct 14 20:29:59 1998 +++ gimp-1.0.3/plug-ins/tiler/Makefile.in Mon Mar 29 13:14:53 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = tiler -tiler_SOURCES = \ - tiler.c +tiler_SOURCES = tiler.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la tiler_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ tiler_LDADD = $(LDADD) tiler_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(tiler_SOURCES) OBJECTS = $(tiler_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/tiler/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done tiler.o: tiler.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/url/Makefile.in gimp-1.0.3/plug-ins/url/Makefile.in --- gimp-1.0.2/plug-ins/url/Makefile.in Wed Oct 14 20:30:15 1998 +++ gimp-1.0.3/plug-ins/url/Makefile.in Mon Mar 29 13:14:54 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = url -url_SOURCES = \ - url.c +url_SOURCES = url.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la url_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ url_LDADD = $(LDADD) url_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(url_SOURCES) OBJECTS = $(url_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/url/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done url.o: url.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/video/Makefile.in gimp-1.0.3/plug-ins/video/Makefile.in --- gimp-1.0.2/plug-ins/video/Makefile.in Wed Oct 14 20:30:25 1998 +++ gimp-1.0.3/plug-ins/video/Makefile.in Mon Mar 29 13:14:56 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = video -video_SOURCES = \ - video.c +video_SOURCES = video.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la video_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ video_LDADD = $(LDADD) video_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(video_SOURCES) OBJECTS = $(video_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/video/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done video.o: video.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/vinvert/Makefile.in gimp-1.0.3/plug-ins/vinvert/Makefile.in --- gimp-1.0.2/plug-ins/vinvert/Makefile.in Wed Oct 14 20:30:37 1998 +++ gimp-1.0.3/plug-ins/vinvert/Makefile.in Mon Mar 29 13:14:57 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = vinvert -vinvert_SOURCES = \ - vinvert.c +vinvert_SOURCES = vinvert.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la vinvert_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ vinvert_LDADD = $(LDADD) vinvert_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(vinvert_SOURCES) OBJECTS = $(vinvert_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/vinvert/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done vinvert.o: vinvert.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/vpropagate/Makefile.in gimp-1.0.3/plug-ins/vpropagate/Makefile.in --- gimp-1.0.2/plug-ins/vpropagate/Makefile.in Wed Oct 14 20:30:45 1998 +++ gimp-1.0.3/plug-ins/vpropagate/Makefile.in Mon Mar 29 13:14:58 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = vpropagate -vpropagate_SOURCES = \ - vpropagate.c +vpropagate_SOURCES = vpropagate.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la vpropagate_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ vpropagate_LDADD = $(LDADD) vpropagate_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(vpropagate_SOURCES) OBJECTS = $(vpropagate_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/vpropagate/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done vpropagate.o: vpropagate.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/waves/Makefile.am gimp-1.0.3/plug-ins/waves/Makefile.am --- gimp-1.0.2/plug-ins/waves/Makefile.am Sun Aug 30 16:30:40 1998 +++ gimp-1.0.3/plug-ins/waves/Makefile.am Thu Jan 21 16:20:49 1999 @@ -5,7 +5,7 @@ pluginlib_PROGRAMS = waves waves_SOURCES = \ - waves.c $(top_srcdir)/plug-ins/megawidget/megawidget.h + waves.c INCLUDES = \ $(X_CFLAGS) \ diff -ruN gimp-1.0.2/plug-ins/waves/Makefile.in gimp-1.0.3/plug-ins/waves/Makefile.in --- gimp-1.0.2/plug-ins/waves/Makefile.in Wed Oct 14 20:30:52 1998 +++ gimp-1.0.3/plug-ins/waves/Makefile.in Mon Mar 29 13:14:58 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,24 +122,17 @@ pluginlib_PROGRAMS = waves -waves_SOURCES = \ - waves.c $(top_srcdir)/plug-ins/megawidget/megawidget.h +waves_SOURCES = waves.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/plug-ins/megawidget/libmegawidget.a $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ - $(top_builddir)/libgimp/libgimp.la waves_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -153,24 +149,24 @@ waves_LDADD = $(LDADD) waves_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(waves_SOURCES) OBJECTS = $(waves_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/waves/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -192,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -248,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -277,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done waves.o: waves.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h \ ../../plug-ins/megawidget/megawidget.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/webbrowser/Makefile.am gimp-1.0.3/plug-ins/webbrowser/Makefile.am --- gimp-1.0.2/plug-ins/webbrowser/Makefile.am Sun Aug 30 16:30:57 1998 +++ gimp-1.0.3/plug-ins/webbrowser/Makefile.am Thu Jan 21 16:20:50 1999 @@ -28,7 +28,6 @@ webbrowser_DEPENDENCIES = $(DEPS) -EXTRA_DATA = EXTRA_DIST = $(scriptdata_DATA) .PHONY: files diff -ruN gimp-1.0.2/plug-ins/webbrowser/Makefile.in gimp-1.0.3/plug-ins/webbrowser/Makefile.in --- gimp-1.0.2/plug-ins/webbrowser/Makefile.in Wed Oct 14 20:19:44 1998 +++ gimp-1.0.3/plug-ins/webbrowser/Makefile.in Mon Mar 29 13:12:49 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -123,27 +126,20 @@ pluginlib_PROGRAMS = webbrowser -webbrowser_SOURCES = \ - webbrowser.c +webbrowser_SOURCES = webbrowser.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) @LIBXMU_LIB@ + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBXMU_LIB@ - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la webbrowser_DEPENDENCIES = $(DEPS) -EXTRA_DATA = EXTRA_DIST = $(scriptdata_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -159,9 +155,10 @@ webbrowser_LDADD = $(LDADD) webbrowser_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DATA = $(scriptdata_DATA) DIST_COMMON = README Makefile.am Makefile.in @@ -170,15 +167,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(webbrowser_SOURCES) OBJECTS = $(webbrowser_OBJECTS) -all: Makefile $(PROGRAMS) $(DATA) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/webbrowser/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -200,15 +196,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -275,8 +271,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -304,69 +304,80 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done webbrowser.o: webbrowser.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS install-scriptdataDATA - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS uninstall-scriptdataDATA - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS install-scriptdataDATA +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS uninstall-scriptdataDATA +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) $(DATA) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) $(DATADIR)$(scriptdatadir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) $(DESTDIR)$(scriptdatadir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ @@ -374,8 +385,10 @@ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool uninstall-scriptdataDATA \ install-scriptdataDATA tags mostlyclean-tags distclean-tags clean-tags \ -maintainer-clean-tags distdir info dvi installcheck install-exec \ -install-data install uninstall all installdirs mostlyclean-generic \ +maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ distclean-generic clean-generic maintainer-clean-generic clean \ mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/whirlpinch/Makefile.in gimp-1.0.3/plug-ins/whirlpinch/Makefile.in --- gimp-1.0.2/plug-ins/whirlpinch/Makefile.in Wed Oct 14 20:31:02 1998 +++ gimp-1.0.3/plug-ins/whirlpinch/Makefile.in Mon Mar 29 13:14:59 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = whirlpinch -whirlpinch_SOURCES = \ - whirlpinch.c +whirlpinch_SOURCES = whirlpinch.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la whirlpinch_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ whirlpinch_LDADD = $(LDADD) whirlpinch_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(whirlpinch_SOURCES) OBJECTS = $(whirlpinch_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/whirlpinch/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done whirlpinch.o: whirlpinch.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/xd/Makefile.in gimp-1.0.3/plug-ins/xd/Makefile.in --- gimp-1.0.2/plug-ins/xd/Makefile.in Wed Oct 14 20:41:03 1998 +++ gimp-1.0.3/plug-ins/xd/Makefile.in Mon Mar 29 12:52:14 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,23 +122,17 @@ pluginlib_PROGRAMS = xd -xd_SOURCES = \ - xd.c +xd_SOURCES = xd.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) @LIBXDELTA_LIB@ + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) \ - @LIBXDELTA_LIB@ - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la xd_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -152,27 +149,28 @@ xd_LDADD = $(LDADD) xd_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best +DEP_FILES = .deps/xd.P SOURCES = $(xd_SOURCES) OBJECTS = $(xd_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/xd/Makefile +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/xd/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -191,20 +189,17 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -.c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< @@ -221,9 +216,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -247,8 +239,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -274,78 +270,130 @@ subdir = plug-ins/xd distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu plug-ins/xd/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -install: install-exec install-data all - @: +-include $(DEP_FILES) -uninstall: uninstall-pluginlibPROGRAMS +mostlyclean-depend: +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-depend clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean .PHONY: files diff -ruN gimp-1.0.2/plug-ins/xd/xd.c gimp-1.0.3/plug-ins/xd/xd.c --- gimp-1.0.2/plug-ins/xd/xd.c Sat May 30 00:32:37 1998 +++ gimp-1.0.3/plug-ins/xd/xd.c Mon Mar 15 10:25:37 1999 @@ -696,7 +696,7 @@ gtk_widget_show (button); plist = gtk_list_new (); - gtk_container_add (GTK_CONTAINER (listbox), plist); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (listbox), plist); gtk_list_set_selection_mode (GTK_LIST (plist), GTK_SELECTION_BROWSE); gtk_widget_show (plist); diff -ruN gimp-1.0.2/plug-ins/xpm/Makefile.in gimp-1.0.3/plug-ins/xpm/Makefile.in --- gimp-1.0.2/plug-ins/xpm/Makefile.in Wed Oct 14 20:19:48 1998 +++ gimp-1.0.3/plug-ins/xpm/Makefile.in Mon Mar 29 13:12:50 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,16 @@ pluginlib_PROGRAMS = xpm -xpm_SOURCES = \ - xpm.c +xpm_SOURCES = xpm.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la @LIBXPM_LIB@ $(X_LIBS) + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - @LIBXPM_LIB@ \ - $(X_LIBS) -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la xpm_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +148,24 @@ xpm_LDADD = $(LDADD) xpm_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(xpm_SOURCES) OBJECTS = $(xpm_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/xpm/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +187,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +243,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +276,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done xpm.o: xpm.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/xpm/xpm.c gimp-1.0.3/plug-ins/xpm/xpm.c --- gimp-1.0.2/plug-ins/xpm/xpm.c Sun Apr 12 22:44:10 1998 +++ gimp-1.0.3/plug-ins/xpm/xpm.c Mon Mar 29 11:40:28 1999 @@ -29,6 +29,7 @@ Previous...Inherited code from Ray Lehtiniemi, who inherited it from S & P. */ +#include #include #include #include diff -ruN gimp-1.0.2/plug-ins/xwd/Makefile.in gimp-1.0.3/plug-ins/xwd/Makefile.in --- gimp-1.0.2/plug-ins/xwd/Makefile.in Wed Oct 14 20:31:06 1998 +++ gimp-1.0.3/plug-ins/xwd/Makefile.in Mon Mar 29 13:15:00 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = xwd -xwd_SOURCES = \ - xwd.c +xwd_SOURCES = xwd.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la xwd_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ xwd_LDADD = $(LDADD) xwd_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(xwd_SOURCES) OBJECTS = $(xwd_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/xwd/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,78 +277,91 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done xwd.o: xwd.c ../../libgimp/gimp.h ../../libgimp/gimpfeatures.h \ ../../libgimp/gimpenums.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -ruN gimp-1.0.2/plug-ins/zealouscrop/Makefile.in gimp-1.0.3/plug-ins/zealouscrop/Makefile.in --- gimp-1.0.2/plug-ins/zealouscrop/Makefile.in Wed Oct 14 20:31:10 1998 +++ gimp-1.0.3/plug-ins/zealouscrop/Makefile.in Mon Mar 29 13:15:02 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ # PARTICULAR PURPOSE. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -32,7 +32,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -46,7 +46,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -60,9 +60,12 @@ host_alias = @host_alias@ host_triplet = @host@ AA = @AA@ +AS = @AS@ CC = @CC@ CPP = @CPP@ +DLLTOOL = @DLLTOOL@ EMACS = @EMACS@ +GIMPDOCS = @GIMPDOCS@ GIMP_MAJOR_VERSION = @GIMP_MAJOR_VERSION@ GIMP_MICRO_VERSION = @GIMP_MICRO_VERSION@ GIMP_MINOR_VERSION = @GIMP_MINOR_VERSION@ @@ -119,22 +122,17 @@ pluginlib_PROGRAMS = zealouscrop -zealouscrop_SOURCES = \ - zealouscrop.c +zealouscrop_SOURCES = zealouscrop.c + + +INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) + + +LDADD = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la $(X_LIBS) + + +DEPS = $(top_builddir)/libgimp/libgimpui.la $(top_builddir)/libgimp/libgimp.la -INCLUDES = \ - $(X_CFLAGS) \ - -I$(top_srcdir) \ - -I$(includedir) - -LDADD = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la \ - $(X_LIBS) - -DEPS = \ - $(top_builddir)/libgimp/libgimpui.la \ - $(top_builddir)/libgimp/libgimp.la zealouscrop_DEPENDENCIES = $(DEPS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -151,24 +149,24 @@ zealouscrop_LDADD = $(LDADD) zealouscrop_LDFLAGS = CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(zealouscrop_SOURCES) OBJECTS = $(zealouscrop_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/zealouscrop/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -190,15 +188,15 @@ $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) @list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-pluginlibPROGRAMS: @$(NORMAL_UNINSTALL) list='$(pluginlib_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(pluginlibdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -246,8 +244,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -275,79 +277,92 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done zealouscrop.o: zealouscrop.c ../../libgimp/gimp.h \ ../../libgimp/gimpfeatures.h ../../libgimp/gimpenums.h \ ../../config.h -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-pluginlibPROGRAMS - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-pluginlibPROGRAMS - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-pluginlibPROGRAMS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-pluginlibPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(pluginlibdir) + $(mkinstalldirs) $(DESTDIR)$(pluginlibdir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-pluginlibPROGRAMS mostlyclean-compile \ mostlyclean-libtool mostlyclean-tags \ mostlyclean-generic -clean: clean-pluginlibPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-pluginlibPROGRAMS clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am -distclean: distclean-pluginlibPROGRAMS distclean-compile \ +distclean-am: distclean-pluginlibPROGRAMS distclean-compile \ distclean-libtool distclean-tags distclean-generic \ - clean - -rm -f config.status + clean-am -rm -f libtool -maintainer-clean: maintainer-clean-pluginlibPROGRAMS \ +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-pluginlibPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-tags maintainer-clean-generic \ - distclean + distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-pluginlibPROGRAMS distclean-pluginlibPROGRAMS \ clean-pluginlibPROGRAMS maintainer-clean-pluginlibPROGRAMS \ uninstall-pluginlibPROGRAMS install-pluginlibPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean