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

diff --git a/build/Makefile.incl.in b/build/Makefile.incl.in
index b6da814f..c420d82b 100644
--- 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
@@ -18,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@
 
@@ -27,9 +35,8 @@ INSTALL = @INSTALL@
 LIBTOOL = @LIBTOOL@
 
 srcdir = @srcdir@
-
-# non-recursive!
 top_builddir = .
+depdir = .deps
 
 prefix ?= @prefix@
 exec_prefix ?= @exec_prefix@
@@ -45,11 +52,9 @@ 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) 
-LINK = $(LIBTOOL) --mode=link $(CC)
+LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS)
 LTCLEAN = $(LIBTOOL) --mode=clean $(RM)
 LTRM = $(LIBTOOL) --mode=uninstall $(RM)