diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-02-05 10:39:14 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-02-05 10:39:14 +0000 |
| commit | 423367e8cda46f9d0f69932f617054cc15702aeb (patch) | |
| tree | 6ea6f46496246767adf5f488307f4c6427f21a97 /otk/Makefile.am | |
| parent | a5a712f9ae652e500c81b42db548d213bde4712e (diff) | |
move the otk wrapper stuff into its own dir
Diffstat (limited to 'otk/Makefile.am')
| -rw-r--r-- | otk/Makefile.am | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/otk/Makefile.am b/otk/Makefile.am index 3ca6c6ff..31eb4a76 100644 --- a/otk/Makefile.am +++ b/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 @@ libotk_la_SOURCES=rendercontrol.cc truerendercontrol.cc surface.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 @@ includeotk_HEADERS=application.hh appwidget.hh assassin.hh button.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)," \ @@ -54,12 +45,4 @@ otk_test: libotk.la otk_test.cc 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 |