X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=47483dc8a92d30a6aca975ce4b5045d25fb10ec6;hb=9e4d1bbabcabef13b740dd7201e35c3314abfbee;hp=f0a7ca7d3a6a2e3f169f013133905b191c7c2d0e;hpb=7bf96a9123a9f6b29a4c6168f7391db72f374f8a;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index f0a7ca7d..47483dc8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,16 +1,23 @@
+localedir=$(datadir)/locale
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CXXFLAGS=`pkg-config --cflags xft` @CXXFLAGS@ \
+CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--Dmultibyte\(\)=True
+-DLOCALEDIR=\"$(localedir)\"
 
-LDFLAGS=`pkg-config --libs xft`
+LIBS=$(XFT_LIBS) $(PYTHON_LDFLAGS) @LIBS@
 
-bin_PROGRAMS= openbox
+INCLUDES= -I../otk
 
-openbox_SOURCES= basedisplay.cc color.cc configuration.cc font.cc gccache.cc image.cc imagecontrol.cc screen.cc texture.cc timer.cc util.cc window.cc workspace.cc xatom.cc blackbox.cc main.cc
+bin_PROGRAMS= openbox3
+
+openbox3_LDADD=../otk/libotk.a @LIBINTL@
+
+openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \
+                  main.cc rootwindow.cc backgroundwidget.cc labelwidget.cc \
+                  buttonwidget.cc python.cc
 
 MAINTAINERCLEANFILES= Makefile.in