call getState() before updateTransientFor(), don't need to initialize _modal separate...

[chaz/openbox] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 154791ddd8f7910ffa7adb91fc64341c8e548d9e..cbb636405f4e99a5b54c1f4ea506664368236b4e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,7 @@ CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
 -DLOCALEDIR=\"$(localedir)\" \
--DSCRIPTDIR=\"$(scriptdir)\" -DSWIG_GLOBAL 
-# -DSWIG_GLOBAL is for the swigruntime.cc (see swigruntime.i for explanation)
+-DSCRIPTDIR=\"$(scriptdir)\"
 
 LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
 
@@ -21,7 +20,7 @@ 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 \
-                  swigruntime.cc openbox_wrap.cc
+                  openbox_wrap.cc
 openbox3_LDFLAGS= $(PYTHON_LDFLAGS)
 
 script_DATA = ob.py
@@ -36,10 +35,9 @@ distclean-local:
 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 $@ $<
 
-swigruntime.cc: swigruntime.i
-       swig -python -c++ -o $@ $<
-
 # local dependencies