X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=build%2FMakefile.incl.in;h=c420d82b4852c8fe858d048c12550e0a3379d40d;hb=64dac07d07f37ec965ccc0b5bc8c8c789247cff0;hp=1ada8e3c06ad783898e10149883d01b09a06bfc7;hpb=609a9925beef935217ca2cb24c6b5d5d64a6035e;p=chaz%2Fopenbox

diff --git a/build/Makefile.incl.in b/build/Makefile.incl.in
index 1ada8e3c..c420d82b 100644
--- 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
@@ -15,6 +22,10 @@ GLIB_LIBS = @GLIB_LIBS@ -DG_DISABLE_DEPRECATED
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@ -DG_DISABLE_DEPRECATED
 
+X_CFLAGS = @X_CFLAGS@
+X_LIBS = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
+XINERAMA_LIBS = @XINERAMA_LIBS@
+
 XFT_CFLAGS = @XFT_CFLAGS@
 XFT_LIBS = @XFT_LIBS@
 
@@ -24,9 +35,8 @@ INSTALL = @INSTALL@
 LIBTOOL = @LIBTOOL@
 
 srcdir = @srcdir@
-
-# non-recursive!
 top_builddir = .
+depdir = .deps
 
 prefix ?= @prefix@
 exec_prefix ?= @exec_prefix@
@@ -40,13 +50,11 @@ 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) 
 DEPCOMPILE = $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) 
-LINK = $(LIBTOOL) --mode=link $(CC)
+LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS)
 LTCLEAN = $(LIBTOOL) --mode=clean $(RM)
 LTRM = $(LIBTOOL) --mode=uninstall $(RM)