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

diff --git a/wrap/Makefile.am b/wrap/Makefile.am
index 7c8e603a..3f904882 100644
--- a/wrap/Makefile.am
+++ b/wrap/Makefile.am
@@ -1,35 +1,49 @@
-# 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 = -I$(srcdir)/../otk -I$(srcdir)/../src $(XFT_CFLAGS) $(SWIG_PYTHON_CFLAGS) @CPPFLAGS@
+CXXFLAGS = $(filter-out -W -Wall,@CXXFLAGS@)
+LDFLAGS  = -module -avoid-version
 
-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
+
+EXTRA_DIST = otk.i ob.i callback.i
 
-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)
 
 %.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 otk_point.i otk_rect.i otk_size.i otk_rendercolor.i otk_rendertexture.i otk_ustring.i otk_font.i otk_renderstyle.i otk_widget.i otk_label.i otk_button.i otk_appwidget.i otk_application.i otk_strut.i otk_property.i otk_timer.i
+	$(SWIG) $(SWIG_PYTHON_OPT) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $<
+
+wrap_ob.cc: ob.i ob_callback.i ob_client.i ob_screen.i ob_openbox.i ob_frame.i ob_python.i
+	$(SWIG) $(SWIG_PYTHON_OPT) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $<