more build system fixups

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

diff --git a/build/Makefile.incl.in b/build/Makefile.incl.in
index 1ada8e3c06ad783898e10149883d01b09a06bfc7..c87609c2e07e5554cd62f134b590ae462d6ba00b 100644 (file)
--- a/build/Makefile.incl.in
+++ b/build/Makefile.incl.in
@@ -1,3 +1,9 @@
+# @configure_input@
+
+CC = @CC@
+@SET_MAKE@
+MAKE += --no-print-directory
+
 CFLAGS = @CFLAGS@
 CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ \
   -DLOCALEDIR=\"$(localedir)\" \
@@ -8,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
@@ -24,9 +31,8 @@ INSTALL = @INSTALL@
 LIBTOOL = @LIBTOOL@
 
 srcdir = @srcdir@
-
-# non-recursive!
 top_builddir = .
+depdir = .deps
 
 prefix ?= @prefix@
 exec_prefix ?= @exec_prefix@
@@ -40,9 +46,7 @@ localedir = $(datadir)/locale
 enginedir = $(libdir)/openbox/engines
 plugindir = $(libdir)/openbox/plugins
 rcdir = $(datadir)/openbox
-themesdir = $(datadir)/openbox/themes
-
-depdir = .deps
+themedir = $(datadir)/openbox/themes
 
 COMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) 
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS)