X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2FMakefile.am;h=332d09f912450985bcc86218842e538808b53db8;hb=678bb52123bde0b71037393827c03f6b17904a60;hp=2ca5f35a46970ed80212c0f127adbd405d4e7e0b;hpb=f9107b5c5a4cc03bf544854e8d6d1ba83f6cd979;p=chaz%2Fopenbox

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 2ca5f35a..332d09f9 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,4 +1,6 @@
-CPPFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@
+scriptdir = $(libdir)/openbox/python
+
+CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@
 
 INCLUDES= -I../src
 
@@ -15,19 +17,23 @@ libotk_la_SOURCES= color.cc display.cc font.cc gccache.cc image.cc \
 
 libotk_la_LDFLAGS = $(XFT_LIBS) $(PYTHON_LIBS)
 
+script_DATA = otk.py
+
+EXTRA_DIST = $(script_DATA)
+
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
 otk_test: libotk.a otk_test.cc
-	$(CXX) $(CPPFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o otk_test otk_test.cc $(XFT_LIBS) ./libotk.a 
+	$(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o otk_test otk_test.cc $(XFT_LIBS) ./libotk.a 
 
 otk.i: $(wildcard *.hh)
 	touch $@
 
 otk_wrap.cc: otk.i
-	swig $(filter -I%,$(CFLAGS)) -python -c++ -nodefault -o $@ $<
+	swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -o $@ $<
 
 # local dependencies
 application.o: application.cc application.hh eventdispatcher.hh \