X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=wrap%2FMakefile.am;h=ec7b0b48f11a5dcfb0bb90a46a21db9845255241;hb=7c8c9e998ffc3a9b22e15feeffe77823142ce531;hp=7c8e603a84c1e048cf5deef884b9bd4290c5d37a;hpb=ffea5b55912ea936c84ce3d17577e9532a81cae4;p=chaz%2Fopenbox

diff --git a/wrap/Makefile.am b/wrap/Makefile.am
index 7c8e603a..ec7b0b48 100644
--- a/wrap/Makefile.am
+++ b/wrap/Makefile.am
@@ -1,35 +1,48 @@
-# XXX - INSTALL THIS GLOBALLY!#&@(!!!
-pythondir = $(libdir)/openbox/python
+oblibdir = $(libdir)/openbox
 
-CXXFLAGS = $(XFT_CFLAGS) $(filter-out -W -Wall,@CXXFLAGS@)
+#pythondir = $(oblibdir)/python
+obpythondir = $(oblibdir)/python
 
-INCLUDES = -I.. -I../swig
+CPPFLAGS = $(XFT_CFLAGS) $(SWIG_PYTHON_CFLAGS) @CPPFLAGS@
+CXXFLAGS = $(filter-out -W -Wall,@CXXFLAGS@)
+LDFLAGS  = -module -avoid-version
+INCLUDES = -I.. -I../otk -I../src
 
-python_LTLIBRARIES = otkpy.la
+obpython_LTLIBRARIES = otkpy.la obpy.la
+obpython_PYTHON = otk.py ob.py
 
-otkpy_la_CXXFLAGS = $(PYTHON_CFLAGS)
-otkpy_la_LDFLAGS  = -module
 otkpy_la_SOURCES  = wrap_otk.cc
-otkpy_la_LIBADD   = ../otk/libotk.la
+#otkpy_la_LIBADD   = ../otk/libotk.la   # do this for the global version of otk
 
-CLEANFILES = wrap_* otk.py
-MAINTAINERCLEANFILES = Makefile.in
+obpy_la_SOURCES  = wrap_ob.cc
 
-python_PYTHON = otk.py
+CLEANFILES = wrap_* *.py
+MAINTAINERCLEANFILES = Makefile.in
 
 install-exec-hook:
-	$(mkinstalldirs) "$(DESTDIR)$(pythondir)"
-	cd "$(DESTDIR)$(pythondir)" && \
+	$(mkinstalldirs) "$(DESTDIR)$(obpythondir)"
+	cd "$(DESTDIR)$(obpythondir)" && \
 		$(RM) -f _otk.so && $(LN_S) otkpy.so _otk.so
+	$(mkinstalldirs) "$(DESTDIR)$(obpythondir)"
+	cd "$(DESTDIR)$(obpythondir)" && \
+		$(RM) -f _ob.so && $(LN_S) obpy.so _ob.so
 
-uninstall-local:
-	rm -f "$(DESTDIR)$(pythondir)/_otk.so"
+uninstall-am:
+	$(RM) "$(DESTDIR)$(obpythondir)/_otk.so"
+	$(RM) "$(DESTDIR)$(obpythondir)/_ob.so"
+	rmdir -p $(obpythondir) || true
 
 %.py: wrap_%.cc
 
 otk.i: $(wildcard ../otk/*.hh)
 	@touch $@
 
-wrap_%.cc: %.i
-	swig $(INCLUDES) $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
+ob.i: $(addprefix ../src/,openbox.hh screen.hh client.hh python.hh frame.hh)
+	@touch $@
+
+wrap_otk.cc: otk.i
+	$(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $<
+
+wrap_ob.cc: ob.i callback.i
+	$(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $<