--- plug-ins/megawidget/Makefile.am.orig	Mon Aug 31 07:41:38 1998
+++ plug-ins/megawidget/Makefile.am	Tue Sep 29 22:34:32 1998
@@ -1,11 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
 pluginlibdir = $(libdir)
+gimpincludedir = $(includedir)
 
 pluginlib_LIBRARIES = libmegawidget.a
 
 libmegawidget_a_SOURCES = \
-	megawidget.c megawidget.h
+	megawidget.c
+
+gimpinclude_HEADERS = \
+	megawidget.h
 
 INCLUDES = \
 	$(X_CFLAGS)			\
--- plug-ins/megawidget/Makefile.in.orig	Mon Sep 28 06:08:14 1998
+++ plug-ins/megawidget/Makefile.in	Tue Sep 29 22:34:43 1998
@@ -116,11 +116,15 @@
 patterndata = @patterndata@
 
 pluginlibdir = $(libdir)
+gimpincludedir = $(includedir)
 
 pluginlib_LIBRARIES = libmegawidget.a
 
 libmegawidget_a_SOURCES = \
-	megawidget.c megawidget.h
+	megawidget.c
+
+gimpinclude_HEADERS = \
+	megawidget.h
 
 INCLUDES = \
 	$(X_CFLAGS)			\
@@ -154,6 +158,8 @@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+HEADERS =  $(gimpinclude_HEADERS)
+
 DIST_COMMON =  Makefile.am Makefile.in
 
 
@@ -161,17 +167,18 @@
 
 TAR = tar
 GZIP = --best
+DEP_FILES =  .deps/megawidget.P
 SOURCES = $(libmegawidget_a_SOURCES)
 OBJECTS = $(libmegawidget_a_OBJECTS)
 
-all: Makefile $(LIBRARIES)
+all: Makefile $(LIBRARIES) $(HEADERS)
 
 .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/megawidget/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/megawidget/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
 
@@ -208,9 +215,6 @@
 	  rm -f $(DESTDIR)$(pluginlibdir)/$$p; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -227,9 +231,6 @@
 
 maintainer-clean-compile:
 
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 .s.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
@@ -251,6 +252,21 @@
 	$(AR) cru libmegawidget.a $(libmegawidget_a_OBJECTS) $(libmegawidget_a_LIBADD)
 	$(RANLIB) libmegawidget.a
 
+install-gimpincludeHEADERS: $(gimpinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(gimpincludedir)
+	@list='$(gimpinclude_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gimpincludedir)/$$p"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gimpincludedir)/$$p; \
+	done
+
+uninstall-gimpincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	list='$(gimpinclude_HEADERS)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(gimpincludedir)/$$p; \
+	done
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -281,6 +297,11 @@
 subdir = plug-ins/megawidget
 
 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/megawidget/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
@@ -288,6 +309,29 @@
 	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+
+maintainer-clean-depend:
+	-rm -rf .deps
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
+	  < .deps/$(*F).p > .deps/$(*F).P
+	@-rm -f .deps/$(*F).p
 info:
 dvi:
 check: all
@@ -296,18 +340,18 @@
 install-exec: 
 	@$(NORMAL_INSTALL)
 
-install-data: install-pluginlibLIBRARIES
+install-data: install-pluginlibLIBRARIES install-gimpincludeHEADERS
 	@$(NORMAL_INSTALL)
 
 install: install-exec install-data all
 	@:
 
-uninstall: uninstall-pluginlibLIBRARIES
+uninstall: uninstall-pluginlibLIBRARIES uninstall-gimpincludeHEADERS
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
-	$(mkinstalldirs)  $(DATADIR)$(pluginlibdir)
+	$(mkinstalldirs)  $(DATADIR)$(pluginlibdir) $(DATADIR)$(gimpincludedir)
 
 
 mostlyclean-generic:
@@ -325,22 +369,22 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-pluginlibLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
 		mostlyclean-generic
 
 clean:  clean-pluginlibLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean
+		clean-depend clean-generic mostlyclean
 
 distclean:  distclean-pluginlibLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean
+		distclean-libtool distclean-tags distclean-depend \
+		distclean-generic clean
 	-rm -f config.status
 	-rm -f libtool
 
 maintainer-clean:  maintainer-clean-pluginlibLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean
+		maintainer-clean-tags maintainer-clean-depend \
+		maintainer-clean-generic distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -349,8 +393,10 @@
 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 \
+clean-libtool maintainer-clean-libtool uninstall-gimpincludeHEADERS \
+install-gimpincludeHEADERS tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend 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
