X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=ac4534c6026630564d9a5d844439eab8b343882e;hb=0089719c806599a405c2def0e1e84a0ac99d9937;hp=19306b3f48c3af234fd288c2a29cc919e22a843e;hpb=62356a72a95a9f95b933f915f13b284e2be45274;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 19306b3f..ac4534c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,22 +2,21 @@ 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
 
-bin_PROGRAMS= openbox
+bin_PROGRAMS= openbox3
 
-openbox_LDADD=../otk/libotk.a @LIBINTL@
+openbox3_LDADD=../otk/libotk.a @LIBINTL@
 
-openbox_SOURCES= configuration.cc screen.cc openbox.cc \
-                 util.cc bbwindow.cc workspace.cc xatom.cc blackbox.cc \
-                 main.cc xeventhandler.cc
+openbox3_SOURCES= client.cc frame.cc openbox.cc screen.cc \
+                  main.cc rootwindow.cc
 
 MAINTAINERCLEANFILES= Makefile.in