update

1 files changed, 67 insertions, 16 deletions

diff --git a/util/Makefile.in b/util/Makefile.in
index 9c830c2..80fb2d5 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -131,6 +131,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/bsetroot.P
 SOURCES = $(bsetroot_SOURCES)
 OBJECTS = $(bsetroot_OBJECTS)
 
@@ -138,9 +139,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .cc .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-        cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps util/Makefile
+        cd $(top_srcdir) && $(AUTOMAKE) --gnu util/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
 
@@ -170,9 +171,6 @@ uninstall-binPROGRAMS:
           rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
         done
 
-.c.o:
-        $(COMPILE) -c $<
-
 .s.o:
         $(COMPILE) -c $<
 
@@ -189,9 +187,6 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-.c.lo:
-        $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 .s.lo:
         $(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
@@ -269,6 +264,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = util
 
 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 util/Makefile
         @for file in $(DISTFILES); do \
           d=$(srcdir); \
           if test -d $$d/$$file; then \
@@ -280,6 +280,56 @@ distdir: $(DISTFILES)
           fi; \
         done
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+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
+
+%.o: %.cc
+        @echo '$(CXXCOMPILE) -c $<'; \
+        $(CXXCOMPILE) -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: %.cc
+        @echo '$(LTCXXCOMPILE) -c $<'; \
+        $(LTCXXCOMPILE) -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:
@@ -318,27 +368,27 @@ distclean-generic:
 maintainer-clean-generic:
         -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-                mostlyclean-libtool mostlyclean-tags \
+                mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
                 mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-                clean-generic mostlyclean-am
+                clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-                distclean-tags distclean-generic clean-am \
-                distclean-local
+                distclean-tags distclean-depend distclean-generic \
+                clean-am distclean-local
         -rm -f libtool
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-binPROGRAMS \
                 maintainer-clean-compile maintainer-clean-libtool \
-                maintainer-clean-tags maintainer-clean-generic \
-                distclean-am
+                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."
 
@@ -350,8 +400,9 @@ mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \
 install-binSCRIPTS tags 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 \
+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 \