X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=0210831a735f605bab2b041325ca696bc8be9b8e;hb=9e0ae7ecee94a0cc467d90926428fdc84f9a0339;hp=065efbb450f6e7aba1c34d77132ec60fea98252d;hpb=45c2589ef6e6576604543229dfa1582d471e6a94;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 065efbb4..0210831a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,22 +2,22 @@ localedir=$(datadir)/locale
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@ \
+CPPFLAGS=$(XFT_CFLAGS) $(GUILE_CFLAGS) @CPPFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
 -DLOCALEDIR=\"$(localedir)\"
 
-LDFLAGS=`pkg-config --libs xft`
+LIBS=$(XFT_LIBS) $(GUILE_LDFLAGS) @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 window.cc workspace.cc xatom.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