X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=4e5fa83dda5761af2cd5dbe8f941ebb7ca0251a6;hb=77a8e11660edd66279f2d3def6de3768874ba780;hp=cbbebb2363747c903387e32272a2adbda7a8552f;hpb=b9cac2146e1dfe54cb6c0ce647d6c7d58d17de54;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index cbbebb23..4e5fa83d 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,9 @@ bin_PROGRAMS= openbox3
 
 openbox3_LDADD=../otk/libotk.a @LIBINTL@
 
-openbox3_SOURCES= client.cc frame.cc screen.cc openbox.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 backgroundwidget.cc labelwidget.cc \
+                  buttonwidget.cc
 
 MAINTAINERCLEANFILES= Makefile.in