initialize _modal, its used before the window's type is checked

[chaz/openbox] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 85479f69cd5b2c064233b2e041a582bd81ca4d4d..cbb636405f4e99a5b54c1f4ea506664368236b4e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,27 +1,43 @@
 localedir=$(datadir)/locale
+scriptdir = $(libdir)/openbox/python
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@ \
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--DLOCALEDIR=\"$(localedir)\"
+-DLOCALEDIR=\"$(localedir)\" \
+-DSCRIPTDIR=\"$(scriptdir)\"
 
-LDFLAGS=`pkg-config --libs xft`
+LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
 
-INCLUDES= -I../otk
+INCLUDES= -I..
 
-bin_PROGRAMS= openbox
+bin_PROGRAMS= openbox3
 
-openbox_LDADD=../otk/libotk.a @LIBINTL@
+openbox3_LDADD=-L../otk -lotk @LIBINTL@
 
-openbox_SOURCES= configuration.cc screen.cc openbox.cc \
-                 util.cc bbwindow.cc workspace.cc blackbox.cc \
-                 main.cc xeventhandler.cc
+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