Merge with pekdon

1 files changed, 80 insertions, 20 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index d4bcb63..6f76edd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -119,7 +119,8 @@ CPPFLAGS = -Wall @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ @DEBUG@ @
 
 bin_PROGRAMS = fluxbox
 
-fluxbox_SOURCES = BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh                                                 Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh                                                 Icon.cc Icon.hh Image.cc Image.hh LinkedList.cc LinkedList.hh                                           Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh                                               Slit.cc Slit.hh Timer.cc Timer.hh Toolbar.cc Toolbar.hh                                                 Window.cc Window.hh Windowmenu.cc Windowmenu.hh                                                 Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh                                             fluxbox.cc fluxbox.hh bsd-snprintf.c bsd-snprintf.h                                             i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh                                           IconBar.cc IconBar.hh Theme.hh Theme.cc misc.hh misc.cc                                                 Rotated.hh                              
+fluxbox_SOURCES = BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh                                                 Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh                                                 Icon.cc Icon.hh Image.cc Image.hh LinkedList.cc LinkedList.hh                                           Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh                                               Slit.cc Slit.hh Timer.cc Timer.hh Toolbar.cc Toolbar.hh                                                 Window.cc Window.hh Windowmenu.cc Windowmenu.hh                                                 Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh                                             fluxbox.cc fluxbox.hh bsd-snprintf.c bsd-snprintf.h                                             i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh                                           IconBar.cc IconBar.hh Theme.hh Theme.cc misc.hh misc.cc
+
 
 MAINTAINERCLEANFILES = Makefile.in
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -160,6 +161,13 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/BaseDisplay.P .deps/Basemenu.P .deps/Clientmenu.P \
+.deps/Configmenu.P .deps/Icon.P .deps/IconBar.P .deps/Image.P \
+.deps/Keys.P .deps/LinkedList.P .deps/Netizen.P .deps/Rootmenu.P \
+.deps/Screen.P .deps/Slit.P .deps/Tab.P .deps/Theme.P .deps/Timer.P \
+.deps/Toolbar.P .deps/Window.P .deps/Windowmenu.P .deps/Workspace.P \
+.deps/Workspacemenu.P .deps/bsd-snprintf.P .deps/fluxbox.P .deps/i18n.P \
+.deps/main.P .deps/misc.P
 SOURCES = $(fluxbox_SOURCES)
 OBJECTS = $(fluxbox_OBJECTS)
 
@@ -167,9 +175,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 src/Makefile
+        cd $(top_srcdir) && $(AUTOMAKE) --gnu src/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
 
@@ -199,9 +207,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 $<
 
@@ -218,9 +223,6 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-.c.lo:
-        $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 .s.lo:
         $(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
@@ -279,6 +281,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = src
 
 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 src/Makefile
         @for file in $(DISTFILES); do \
           d=$(srcdir); \
           if test -d $$d/$$file; then \
@@ -290,6 +297,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:
@@ -328,26 +385,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-tags distclean-depend distclean-generic \
+                clean-am
         -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."
 
@@ -358,12 +416,14 @@ 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-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
+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
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.