move the otk wrapper stuff into its own dir
Dana Jansens danakj@orodu.net
5 files changed,
45 insertions(+),
26 deletions(-)
M
otk/Makefile.am
→
otk/Makefile.am
@@ -1,14 +1,11 @@
+SUBDIRS = wrap + buttonsdir = $(pkgdatadir)/buttons -scriptdir = $(libdir)/openbox/python includeotkdir = $(includedir)/otk pkgconfigdir = $(libdir)/pkgconfig CXXFLAGS=$(XFT_CFLAGS) @CXXFLAGS@ \ --DBUTTONSDIR=\"$(buttonsdir)\" -DSWIG_GLOBAL -# -DSWIG_GLOBAL means we don't have to link libswigpy cuz libotk will export -# everything it would - -#INCLUDES= -I../src +-DBUTTONSDIR=\"$(buttonsdir)\" #noinst_LIBRARIES=libotk.a lib_LTLIBRARIES=libotk.la@@ -20,8 +17,7 @@ property.cc rect.cc screeninfo.cc \
timer.cc \ util.cc widget.cc focuswidget.cc \ button.cc eventhandler.cc eventdispatcher.cc ustring.cc \ - label.cc focuslabel.cc application.cc appwidget.cc \ - otk_wrap.cc + label.cc focuslabel.cc application.cc appwidget.cc includeotk_HEADERS=application.hh appwidget.hh assassin.hh button.hh \ display.hh eventdispatcher.hh eventhandler.hh \ focuslabel.hh focuswidget.hh font.hh label.hh otk.hh \@@ -30,16 +26,11 @@ rendercolor.hh rendercontrol.hh renderstyle.hh \
rendertexture.hh screeninfo.hh strut.hh surface.hh \ timer.hh truerendercontrol.hh ustring.hh util.hh widget.hh \ ../config.h -libotk_la_LDFLAGS = $(XFT_LIBS) @LIBS@ MAINTAINERCLEANFILES= Makefile.in pkgconfig_DATA = otk.pc -script_DATA = otk.py - -EXTRA_DIST = $(script_DATA) - otk.pc: otk.pc.in @regex_cmd@ -e "s,\@prefix\@,$(prefix)," \ -e "s,\@version\@,$(VERSION)," \@@ -53,13 +44,5 @@ $(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) -L. -lotk @LIBS@
rendertest: libotk.la rendertest.cc $(CXX) $(CXXFLAGS) -DHAVE_CONFIG_H -I. -I. -I.. -I../src $(XFT_CFLAGS) -Wall -W -pedantic -DNDEBUG -g -O2 -o $@ rendertest.cc $(XFT_LIBS) -L. -lotk @LIBS@ - -%.py: %_wrap.cc - -otk.i: $(wildcard *.hh) - touch $@ - -%_wrap.cc: %.i - swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $< # local dependencies
M
otk/otk.i
→
otk/wrap/otk.i
@@ -3,10 +3,6 @@
%module otk %{ -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif - #include "otk.hh" %}@@ -73,7 +69,6 @@ %include "appwidget.hh"
%include "application.hh" %include "assassin.hh" %include "button.hh" -//%include "configuration.hh" %include "display.hh" %include "rendercontrol.hh" %include "property.hh"
A
otk/wrap/.cvsignore
@@ -0,0 +1,9 @@
+Makefile +Makefile.in +otk.py +.deps +.libs +otkpy.la +otkpy_la-wrap_otk.lo +otkpy_la-wrap_otk.o +wrap_otk.cc
A
otk/wrap/Makefile.am
@@ -0,0 +1,32 @@
+# XXX - INSTALL THIS GLOBALLY!#&@(!!! +pythondir = $(libdir)/openbox/python + +CXXFLAGS = $(XFT_CFLAGS) $(filter-out -W -Wall,@CXXFLAGS@) + +INCLUDES = -I.. -I../.. + +python_LTLIBRARIES = otkpy.la + +otkpy_la_CXXFLAGS = $(PYTHON_CFLAGS) +otkpy_la_LDFLAGS = -module +otkpy_la_SOURCES = wrap_otk.cc +otkpy_la_LIBADD = ../libotk.la + +CLEANFILES = wrap_* otk.py +MAINTAINERCLEANFILES = Makefile.in + +python_PYTHON = otk.py + +install-exec-hook: + $(mkinstalldirs) "$(DESTDIR)$(pythondir)" + cd "$(DESTDIR)$(pythondir)" && \ + $(RM) -f _otk.so && $(LN_S) otkpy.so _otk.so + +uninstall-local: + rm -f "$(DESTDIR)$(pythondir)/_otk.so" + +%.py: wrap_%.cc + +wrap_%.cc: %.i $(wildcard ../*.hh) + swig $(INCLUDES) $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $< +