put an S on the stick button

[chaz/openbox] / src / Makefile.am

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