From 9084ca41a5d73e4efce4b28958752a99554499b9 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Thu, 3 Apr 2003 15:09:24 +0000
Subject: [PATCH] more build fixes

---
 .cvsignore                   | 1 +
 Makefile                     | 3 ---
 build/Makefile.engines       | 5 ++---
 build/Makefile.kernel        | 4 ++--
 build/Makefile.plugins       | 8 ++++----
 build/Makefile.render        | 4 ++--
 engines/openbox/.cvsignore   | 1 +
 openbox/.cvsignore           | 1 +
 plugins/.cvsignore           | 2 ++
 plugins/placement/.cvsignore | 1 +
 10 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 7f824ae5..db808d81 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,4 @@ config.log
 config.guess
 autom4te.cache
 aclocal.m4
+.deps
diff --git a/Makefile b/Makefile
index b018e9f6..55aeecde 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,4 @@ distclean: clean
 	$(RM) configure Makefile.incl
 	$(RM) -r .deps/
 
-$(depdir):
-	@mkdir $@
-
 .PHONY: all clean distclean
diff --git a/build/Makefile.engines b/build/Makefile.engines
index 6da55546..25d6daf3 100644
--- a/build/Makefile.engines
+++ b/build/Makefile.engines
@@ -32,10 +32,9 @@ $(engines_ob_dir)/%.lo: $(engines_ob_srcdir)/%.c $(engines_ob_depdir)/%.d
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) \
 		$(engines_ob_CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
-$(engines_ob_depdir)/%.d: $(engines_ob_srcdir)/%.c $(depdir)
+$(engines_ob_depdir)/%.d: $(engines_ob_srcdir)/%.c
 	@echo Building dependancies for $<
-	@mkdir $(engines_depdir) 2> /dev/null || true
-	@mkdir $(dir $@) 2> /dev/null || true
+	$(INSTALL) -d $(dir $@)
 	@$(CC) $(engines_ob_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $<
 
 ## end engines_ob
diff --git a/build/Makefile.kernel b/build/Makefile.kernel
index 10a8268e..f45d4f4c 100644
--- a/build/Makefile.kernel
+++ b/build/Makefile.kernel
@@ -39,9 +39,9 @@ $(kernel_dir)/%.tab.c: $(kernel_srcdir)/%.y
 	cd kernel && \
 	$(BISON) -d $(notdir $<)
 
-$(kernel_depdir)/%.d: $(kernel_srcdir)/%.c $(depdir)
+$(kernel_depdir)/%.d: $(kernel_srcdir)/%.c
 	@echo Building dependancies for $<
-	@mkdir $(dir $@) 2> /dev/null || true
+	$(INSTALL) -d $(dir $@)
 	@$(CC) $(kernel_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.o) $<
 
 kernel-install:
diff --git a/build/Makefile.plugins b/build/Makefile.plugins
index aad5ec1e..138da8d2 100644
--- a/build/Makefile.plugins
+++ b/build/Makefile.plugins
@@ -46,7 +46,7 @@ $(plugins_resistance_dir)/%.lo: $(plugins_resistance_srcdir)/%.c $(plugins_resis
 
 $(plugins_resistance_depdir)/%.d: $(plugins_resistance_srcdir)/%.c $(depdir)
 	@echo Building dependancies for $<
-	@mkdir $(dir $@) 2> /dev/null || true
+	$(INSTALL) -d $(dir $@)
 	@$(CC) $(plugins_resistance_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $<
 
 ## end plugins_resistance
@@ -64,10 +64,10 @@ $(plugins_placement_dir)/%.lo: $(plugins_placement_srcdir)/%.c $(plugins_placeme
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) \
 		$(plugins_placement_CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
-$(plugins_placement_depdir)/%.d: $(plugins_placement_srcdir)/%.c $(depdir)
+$(plugins_placement_depdir)/%.d: $(plugins_placement_srcdir)/%.c
 	@echo Building dependancies for $<
-	@mkdir $(plugins_depdir) 2> /dev/null || true
-	@mkdir $(dir $@) 2> /dev/null || true
+	echo $(plugins_depdir)
+	$(INSTALL) -d $(dir $@)
 	@$(CC) $(plugins_placement_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $<
 
 ## end plugins_placement
diff --git a/build/Makefile.render b/build/Makefile.render
index 210ecdd9..b551e127 100644
--- a/build/Makefile.render
+++ b/build/Makefile.render
@@ -20,9 +20,9 @@ $(render_dir):
 $(render_dir)/%.o: $(render_srcdir)/%.c $(depdir)/%.d
 	$(CC) $(DEFS) $(render_CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
-$(render_depdir)/%.d: $(render_srcdir)/%.c $(render_depdir)
+$(render_depdir)/%.d: $(render_srcdir)/%.c
 	@echo Building dependancies for $<
-	@mkdir $(dir $@) 2> /dev/null || true
+	$(INSTALL) -d $(dir $@)
 	@$(CC) $(render_CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.o) $<
 
 render-install:
diff --git a/engines/openbox/.cvsignore b/engines/openbox/.cvsignore
index 99015b9e..a784068e 100644
--- a/engines/openbox/.cvsignore
+++ b/engines/openbox/.cvsignore
@@ -2,3 +2,4 @@ openbox.la
 obengine.lo
 obtheme.lo
 obrender.lo
+.libs
diff --git a/openbox/.cvsignore b/openbox/.cvsignore
index 736f5e94..9f07b9e0 100644
--- a/openbox/.cvsignore
+++ b/openbox/.cvsignore
@@ -2,3 +2,4 @@ openbox3
 lex.yy.c
 parse.tab.c
 parse.tab.h
+.libs
diff --git a/plugins/.cvsignore b/plugins/.cvsignore
index f5a96968..a9eba4f1 100644
--- a/plugins/.cvsignore
+++ b/plugins/.cvsignore
@@ -1 +1,3 @@
 resistance.la
+.libs
+resistance.lo
diff --git a/plugins/placement/.cvsignore b/plugins/placement/.cvsignore
index eee15c82..4be40fa9 100644
--- a/plugins/placement/.cvsignore
+++ b/plugins/placement/.cvsignore
@@ -1,3 +1,4 @@
 placement.la
 placement.lo
 history.lo
+.libs
-- 
2.39.2