X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=456c667d6f4a0c9f385d72d14ac4f07688ddf75f;hb=74cb09bb2cc4832463a57743b1495eef24237d2a;hp=72645d2fca9dab77540db4619f6ec0b4a2f1412c;hpb=110a1eeed9b5d0deb127a02364cf6c6fe29a9de8;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 72645d2f..456c667d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,22 @@
+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) @LIBS@
 
 INCLUDES= -I../otk
 
-bin_PROGRAMS= openbox
+bin_PROGRAMS= openbox3
 
-openbox_LDADD=../otk/libotk.a
-openbox_SOURCES= basedisplay.cc configuration.cc screen.cc timer.cc util.cc window.cc workspace.cc xatom.cc blackbox.cc main.cc
+openbox3_LDADD=../otk/libotk.a @LIBINTL@
+
+openbox3_SOURCES= client.cc frame.cc openbox.cc screen.cc \
+                  main.cc
 
 MAINTAINERCLEANFILES= Makefile.in
 
@@ -21,25 +24,3 @@ distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
 # local dependencies
-basedisplay.o: basedisplay.cc basedisplay.hh timer.hh util.hh \
- ../otk/gccache.hh ../otk/color.hh
-blackbox.o: blackbox.cc blackbox.hh basedisplay.hh timer.hh util.hh \
- configuration.hh xatom.hh ../otk/gccache.hh ../otk/color.hh ../otk/image.hh screen.hh \
- ../otk/texture.hh workspace.hh window.hh
-configuration.o: configuration.cc configuration.hh util.hh
-main.o: main.cc ../version.h blackbox.hh basedisplay.hh timer.hh \
- util.hh configuration.hh xatom.hh
-screen.o: screen.cc blackbox.hh basedisplay.hh timer.hh util.hh \
- configuration.hh xatom.hh ../otk/font.hh screen.hh ../otk/color.hh ../otk/texture.hh \
- ../otk/image.hh workspace.hh ../otk/gccache.hh window.hh
-timer.o: timer.cc basedisplay.hh timer.hh util.hh
-util.o: util.cc util.hh
-window.o: window.cc blackbox.hh basedisplay.hh timer.hh util.hh \
- configuration.hh xatom.hh ../otk/font.hh screen.hh ../otk/color.hh ../otk/texture.hh \
- ../otk/image.hh workspace.hh ../otk/gccache.hh window.hh
-workspace.o: workspace.cc blackbox.hh basedisplay.hh timer.hh util.hh \
- configuration.hh xatom.hh ../otk/font.hh screen.hh ../otk/color.hh ../otk/texture.hh \
- ../otk/image.hh workspace.hh window.hh
-xatom.o: xatom.cc ../config.h xatom.hh screen.hh ../otk/color.hh ../otk/texture.hh \
- util.hh ../otk/image.hh timer.hh basedisplay.hh workspace.hh blackbox.hh \
- configuration.hh