more build system fixups

[chaz/openbox] / build / Makefile.incl.in

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)