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 07bb65efbdd4da597410f8ea9ee332344f2ecb48..cbb636405f4e99a5b54c1f4ea506664368236b4e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
 
 LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
 
-INCLUDES= -I../otk
+INCLUDES= -I..
 
 bin_PROGRAMS= openbox3
 
@@ -23,7 +23,7 @@ openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \
                   openbox_wrap.cc
 openbox3_LDFLAGS= $(PYTHON_LDFLAGS)
 
-script_DATA = openbox.py
+script_DATA = ob.py
 
 EXTRA_DIST = $(script_DATA)
 
@@ -35,7 +35,9 @@ distclean-local:
 openbox.i: openbox.hh screen.hh client.hh python.hh frame.hh
        touch $@
 
-openbox_wrap.cc: openbox.i
-       swig -I../otk $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
+%.py: %_wrap.cc
+
+%_wrap.cc: %.i
+       swig -c -I../otk $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
 
 # local dependencies