more build system fixups

diff --git a/build/Makefile.engines.openbox b/build/Makefile.engines.openbox
index b19a4f9bbf592801dbfee3012cd4c2879d004047..b5ed7293e92cbc10310f5232364baefc91b0aaca 100644 (file)
--- a/build/Makefile.engines.openbox
+++ b/build/Makefile.engines.openbox
@@ -5,7 +5,7 @@ theme = operation
 
 CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Engine-Openbox\" \
             -DDEFAULT_THEME=\"$(theme)\" -DTHEMEDIR=\"$(themedir)/openbox\"
-LDFLAGS = -module -avoid-version
+LDFLAGS += -module -avoid-version
 
 target = openbox.la
 sources = obengine.c obtheme.c obrender.c

diff --git a/build/Makefile.incl.in b/build/Makefile.incl.in
index b6da814f3eb497374d879cf2d90b8a4351c923a4..c87609c2e07e5554cd62f134b590ae462d6ba00b 100644 (file)
--- a/build/Makefile.incl.in
+++ b/build/Makefile.incl.in
@@ -1,4 +1,7 @@
+# @configure_input@
+
 CC = @CC@
+@SET_MAKE@
 MAKE += --no-print-directory
 
 CFLAGS = @CFLAGS@
@@ -11,6 +14,7 @@ CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ \
   -DBINARY=\"$(binary)\"
 DEFS = @DEFS@
 LIBS = @LIBS@
+LDFLAGS = @LDFLAGS@
 
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@ -DG_DISABLE_DEPRECATED
@@ -27,9 +31,8 @@ INSTALL = @INSTALL@
 LIBTOOL = @LIBTOOL@
 
 srcdir = @srcdir@
-
-# non-recursive!
 top_builddir = .
+depdir = .deps
 
 prefix ?= @prefix@
 exec_prefix ?= @exec_prefix@
@@ -45,8 +48,6 @@ plugindir = $(libdir)/openbox/plugins
 rcdir = $(datadir)/openbox
 themedir = $(datadir)/openbox/themes
 
-depdir = .deps
-
 COMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) 
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) 
 DEPCOMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) 

diff --git a/build/Makefile.kernel b/build/Makefile.kernel
index 71492d89ecfb9c1850a53783a755c9e7ffda3dbd..43aaddceccd2d2f84711a786db588da8ed3ba427 100644 (file)
--- a/build/Makefile.kernel
+++ b/build/Makefile.kernel
@@ -5,7 +5,7 @@ dir = kernel
 CPPFLAGS += $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(XFT_CFLAGS) \
             -DG_LOG_DOMAIN=\"Openbox\"
 LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS)
-LDFLAGS = -export-dynamic
+LDFLAGS += -export-dynamic
 
 target = openbox3
 sources = action.c client.c dispatch.c engine.c event.c \

diff --git a/build/Makefile.plugins.keyboard b/build/Makefile.plugins.keyboard
index 497ce797838533c47f3c102d62bf03e6e7cf9c1e..0aedf69687e84034aae7be74686922ee6cae5e1d 100644 (file)
--- a/build/Makefile.plugins.keyboard
+++ b/build/Makefile.plugins.keyboard
@@ -3,7 +3,7 @@ include build/Makefile.incl
 dir = plugins/keyboard
 
 CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Keyboard\"
-LDFLAGS = -module -avoid-version
+LDFLAGS += -module -avoid-version
 
 target = keyboard.la
 sources = keyboard.c tree.c translate.c keyparse.c

diff --git a/build/Makefile.plugins.mouse b/build/Makefile.plugins.mouse
index 63f0d389a30f9ba95f61b9e11178a7b1a03e8eed..da392d6d730346be6ac82d6e9fd2a1ad165bf544 100644 (file)
--- a/build/Makefile.plugins.mouse
+++ b/build/Makefile.plugins.mouse
@@ -3,7 +3,7 @@ include build/Makefile.incl
 dir = plugins/mouse
 
 CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Mouse\"
-LDFLAGS = -module -avoid-version
+LDFLAGS += -module -avoid-version
 
 target = mouse.la
 sources = mouse.c translate.c mouseparse.c

diff --git a/build/Makefile.plugins.placement b/build/Makefile.plugins.placement
index 248546fc41dcc3fe4a5070d68ccc8e4624810d58..06428a53af812245cf38ac12a9baccf0602f84fb 100644 (file)
--- a/build/Makefile.plugins.placement
+++ b/build/Makefile.plugins.placement
@@ -3,7 +3,7 @@ include build/Makefile.incl
 dir = plugins/placement
 
 CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Placement\"
-LDFLAGS = -module -avoid-version
+LDFLAGS += -module -avoid-version
 
 target = placement.la
 sources = history.c placement.c

diff --git a/build/Makefile.plugins.resistance b/build/Makefile.plugins.resistance
index 4f3922ab464ea892d41637854b4d2411f42d4535..b14054012804715f94b285048005ee10302eb41f 100644 (file)
--- a/build/Makefile.plugins.resistance
+++ b/build/Makefile.plugins.resistance
@@ -3,7 +3,7 @@ include build/Makefile.incl
 dir = plugins
 
 CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Plugin-Resistance\"
-LDFLAGS = -module -avoid-version
+LDFLAGS += -module -avoid-version
 
 target = resistance.la
 sources = resistance.c

diff --git a/build/Makefile.render b/build/Makefile.render
index de25d5e7a538a83cfc189b400b877cb42b7faa63..a16edeef62923d8d298a35b75a9a2efddbdd0add 100644 (file)
--- a/build/Makefile.render
+++ b/build/Makefile.render
@@ -17,7 +17,7 @@ depdir := $(depdir)/$(dir)
 all: $(target)
 
 $(target): $(objects)
-       $(LINK) -static -o $@ $^
+       $(LINK) -static -o $@ $^ $(LDFLAGS)
 
 $(dir)/%.o: $(srcdir)/%.c $(depdir)/%.d
        $(LTCOMPILE) -c -o $@ $<

diff --git a/configure.ac b/configure.ac
index a9281dc36f399adf902e438af47570a91512817a..0692209d3f826f089eb5e03a962cd3e7ed2b9bcc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,8 @@ OB_COMPILER_FLAGS
 AC_C_CONST
 AC_C_INLINE
 
+AC_PROG_MAKE_SET
+
 if test "$CVS" = "yes"; then
     AC_PATH_PROG([FLEX], [flex])
     test "$FLEX" || AC_MSG_ERROR([flex not found])