X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=bc83bb6fb80fd743dd8b9e70c7000bcac67c6276;hb=23a7f188297ba3cef1bf13f1be9407ff6eb9bd62;hp=a998e93d913e65c12debc8cb5bc1e4509379cc9e;hpb=2528b4458cec8c784317d12d09c98bb53f034186;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index a998e93d..bc83bb6f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,12 +2,12 @@ localedir=$(datadir)/locale
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@ \
+CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
 -DLOCALEDIR=\"$(localedir)\"
 
-LDFLAGS=`pkg-config --libs xft`
+LIBS=$(XFT_LIBS) @LIBS@
 
 INCLUDES= -I../otk
 
@@ -15,9 +15,8 @@ bin_PROGRAMS= openbox3
 
 openbox3_LDADD=../otk/libotk.a @LIBINTL@
 
-openbox3_SOURCES= client.cc frame.cc bbscreen.cc openbox.cc screen.cc \
-                 bbwindow.cc workspace.cc blackbox.cc \
-                 main.cc xeventhandler.cc
+openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \
+                  main.cc rootwindow.cc
 
 MAINTAINERCLEANFILES= Makefile.in