put an S on the stick button

[chaz/openbox] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 478b66b30a7a333dac44c218bc33b02093aefb81..ac4534c6026630564d9a5d844439eab8b343882e 100644 (file)
--- 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 configuration.cc screen.cc openbox.cc \
-                 util.cc bbwindow.cc workspace.cc blackbox.cc \
-                 main.cc xeventhandler.cc
+openbox3_SOURCES= client.cc frame.cc openbox.cc screen.cc \
+                  main.cc rootwindow.cc
 
 MAINTAINERCLEANFILES= Makefile.in