X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2FMakefile.am;h=08f4d4cd15c84a388a1b70ea08bf73d97216b7e9;hb=7c8c9e998ffc3a9b22e15feeffe77823142ce531;hp=794d18e8c26b78bdde207ccfbaf44992cd08c5b5;hpb=e6bfddf849009bef7bbb75be5147b4a533fa1ad2;p=chaz%2Fopenbox

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 794d18e8..08f4d4cd 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,12 +1,8 @@
 buttonsdir = $(pkgdatadir)/buttons
-scriptdir = $(libdir)/openbox/python
+includeotkdir = $(includedir)/otk
+pkgconfigdir = $(libdir)/pkgconfig
 
-CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_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
+CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ -DBUTTONSDIR=\"$(buttonsdir)\"
 
 #noinst_LIBRARIES=libotk.a
 lib_LTLIBRARIES=libotk.la
@@ -18,32 +14,32 @@ 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
-
-libotk_la_LDFLAGS = $(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
+                  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 \
+                   point.hh property.hh pseudorendercontrol.hh rect.hh \
+                   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
 
 MAINTAINERCLEANFILES= Makefile.in
 
-script_DATA = otk.py
+pkgconfig_DATA = otk.pc
 
-EXTRA_DIST = $(script_DATA)
+otk.pc: otk.pc.in
+	@regex_cmd@ -e "s,\@prefix\@,$(prefix)," \
+		-e "s,\@version\@,$(VERSION)," \
+		@srcdir@/$^ > $@
 
 distclean-local:
-	rm -f *\~ *.orig *.rej .\#*
+	$(RM) *\~ *.orig *.rej .\#*
 
 otk_test: libotk.la otk_test.cc
-	$(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@
+	$(CXX) $(CPPFLAGS) $(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 $@ $<
+	$(CXX) $(CPPFLAGS) $(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@
 
 # local dependencies