move windows based on their *frame* not the client

[chaz/openbox] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 70c7013aa118a3a84bb5cb0b7f399f3a1fc1f935..cbb636405f4e99a5b54c1f4ea506664368236b4e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,55 +1,43 @@
+localedir=$(datadir)/locale
+scriptdir = $(libdir)/openbox/python
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CXXFLAGS=`pkg-config --cflags xft` @CXXFLAGS@ \
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--Dmultibyte\(\)=True
+-DLOCALEDIR=\"$(localedir)\" \
+-DSCRIPTDIR=\"$(scriptdir)\"
 
-LDFLAGS=`pkg-config --libs xft`
+LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
 
-bin_PROGRAMS= openbox
+INCLUDES= -I..
 
-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=-L../otk -lotk @LIBINTL@
+
+openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \
+                  main.cc backgroundwidget.cc labelwidget.cc \
+                  buttonwidget.cc python.cc bindings.cc \
+                  openbox_wrap.cc
+openbox3_LDFLAGS= $(PYTHON_LDFLAGS)
+
+script_DATA = ob.py
+
+EXTRA_DIST = $(script_DATA)
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
        rm -f *\~ *.orig *.rej .\#*
 
+openbox.i: openbox.hh screen.hh client.hh python.hh frame.hh
+       touch $@
+
+%.py: %_wrap.cc
+
+%_wrap.cc: %.i
+       swig -c -I../otk $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
+
 # local dependencies
-basedisplay.o: basedisplay.cc basedisplay.hh timer.hh util.hh \
- gccache.hh color.hh
-blackbox.o: blackbox.cc blackbox.hh basedisplay.hh timer.hh util.hh \
- configuration.hh xatom.hh gccache.hh color.hh image.hh screen.hh \
- texture.hh workspace.hh window.hh
-color.o: color.cc color.hh basedisplay.hh timer.hh util.hh
-configuration.o: configuration.cc configuration.hh util.hh
-font.o: font.cc font.hh screen.hh color.hh texture.hh util.hh image.hh \
- timer.hh basedisplay.hh workspace.hh xatom.hh blackbox.hh \
- configuration.hh gccache.hh
-gccache.o: gccache.cc gccache.hh basedisplay.hh timer.hh util.hh \
- color.hh
-image.o: image.cc blackbox.hh basedisplay.hh timer.hh util.hh \
- configuration.hh xatom.hh gccache.hh color.hh image.hh texture.hh
-imagecontrol.o: imagecontrol.cc blackbox.hh basedisplay.hh timer.hh \
- util.hh configuration.hh xatom.hh color.hh image.hh texture.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 font.hh screen.hh color.hh texture.hh \
- image.hh workspace.hh gccache.hh window.hh
-texture.o: texture.cc texture.hh color.hh util.hh basedisplay.hh \
- timer.hh image.hh screen.hh workspace.hh xatom.hh blackbox.hh \
- configuration.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 font.hh screen.hh color.hh texture.hh \
- image.hh workspace.hh gccache.hh window.hh
-workspace.o: workspace.cc blackbox.hh basedisplay.hh timer.hh util.hh \
- configuration.hh xatom.hh font.hh screen.hh color.hh texture.hh \
- image.hh workspace.hh window.hh
-xatom.o: xatom.cc ../config.h xatom.hh screen.hh color.hh texture.hh \
- util.hh image.hh timer.hh basedisplay.hh workspace.hh blackbox.hh \
- configuration.hh