more build system fixups

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

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) 

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 \

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

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

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

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

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 $@ $<

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])