Latest fixes for released 0.51.0

WindowMaker/Icons/Makefile.in

@@ -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 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
+DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -46,7 +46,7 @@ AUTOMAKE = @AUTOMAKE@
 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@
@@ -68,6 +68,7 @@ GFXLIBS = @GFXLIBS@
 ICONEXT = @ICONEXT@
 INTLIBS = @INTLIBS@
 LD = @LD@
+LIBPL = @LIBPL@
 LIBTOOL = @LIBTOOL@
 LITE = @LITE@
 LN_S = @LN_S@
@@ -88,56 +89,8 @@ wprefsdir = @wprefsdir@
 
 defsdatadir = $(pkgdatadir)/Icons
 
-defsdata_DATA = \
-	BitchX.tiff\
-	DefaultAppIcon.tiff\
-	GNUstep.tiff\
-	GNUstep3D.tiff\
-	GNUstepGlow.tiff\
-	GNUterm.tiff\
-	clip.tiff\
-	clip2.tiff\
-	defaultAppIcon.tiff\
-	defaultterm.tiff\
-	draw.tiff\
-	linuxterm.tiff\
-	mixer.tiff\
-	notepad.tiff\
-	pdf.tiff\
-	ps.tiff\
-	real.tiff\
-	sgiterm.tiff\
-	sound.tiff\
-	staroffice2.tiff\
-	timer.tiff\
-	wilber.tiff\
-	write.tiff\
-	xdvi.tiff\
-	xv.tiff\
-	BitchX.xpm\
-	GNUstep.xpm\
-	GNUstep3D.xpm\
-	GNUstepGlow.xpm\
-	GNUterm.xpm\
-	clip.xpm\
-	clip2.xpm\
-	defaultAppIcon.xpm\
-	defaultterm.xpm\
-	draw.xpm\
-	linuxterm.xpm\
-	mixer.xpm\
-	notepad.xpm\
-	pdf.xpm\
-	ps.xpm\
-	real.xpm\
-	sgiterm.xpm\
-	sound.xpm\
-	staroffice2.xpm\
-	timer.xpm\
-	wilber.xpm\
-	write.xpm\
-	xdvi.xpm\
-	xv.xpm
+defsdata_DATA =  	BitchX.tiff 	DefaultAppIcon.tiff 	GNUstep.tiff 	GNUstep3D.tiff 	GNUstepGlow.tiff 	GNUterm.tiff 	clip.tiff 	clip2.tiff 	defaultAppIcon.tiff 	defaultterm.tiff 	draw.tiff 	linuxterm.tiff 	mixer.tiff 	notepad.tiff 	pdf.tiff 	ps.tiff 	real.tiff 	sgiterm.tiff 	sound.tiff 	staroffice2.tiff 	timer.tiff 	wilber.tiff 	write.tiff 	xdvi.tiff 	xv.tiff 	BitchX.xpm 	GNUstep.xpm 	GNUstep3D.xpm 	GNUstepGlow.xpm 	GNUterm.xpm 	clip.xpm 	clip2.xpm 	defaultAppIcon.xpm 	defaultterm.xpm 	draw.xpm 	linuxterm.xpm 	mixer.xpm 	notepad.xpm 	pdf.xpm 	ps.xpm 	real.xpm 	sgiterm.xpm 	sound.xpm 	staroffice2.xpm 	timer.xpm 	wilber.xpm 	write.xpm 	xdvi.xpm 	xv.xpm
+
 
 EXTRA_DIST = $(defsdata_DATA) 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -151,11 +104,10 @@ DIST_COMMON =  README Makefile.am Makefile.in
 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: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Icons/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -192,61 +144,74 @@ subdir = WindowMaker/Icons
 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)
+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: install-defsdataDATA
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-defsdataDATA
+install-data-am: install-defsdataDATA
+install-data: install-data-am
 
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-defsdataDATA
+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)$(defsdatadir)
+	$(mkinstalldirs)  $(DESTDIR)$(defsdatadir)
 
 
 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
 
-clean:  clean-generic mostlyclean
+mostlyclean: mostlyclean-am
 
-distclean:  distclean-generic clean
-	-rm -f config.status
+clean-am:  clean-generic mostlyclean-am
+
+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-defsdataDATA install-defsdataDATA 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-defsdataDATA install-defsdataDATA 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