X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2FMakefile.am;h=58fe305d83a4abde554a723623f0f8fe99f087a2;hb=77a46782db2996c0bc662c0f6d191df7a39c2cce;hp=3ca6c6ffe1fd29522bd7447943d04995388f6f03;hpb=a5a712f9ae652e500c81b42db548d213bde4712e;p=chaz%2Fopenbox

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 3ca6c6ff..58fe305d 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,65 +1,51 @@
 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
+CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ -DBUTTONSDIR=\"$(buttonsdir)\"
 
-#INCLUDES= -I../src
-
-#noinst_LIBRARIES=libotk.a
 lib_LTLIBRARIES=libotk.la
 
-libotk_la_SOURCES=rendercontrol.cc truerendercontrol.cc surface.cc \
+libotk_la_SOURCES=rendercontrol.cc truerendercontrol.cc surface.cc util.cc \
                   renderstyle.cc rendercolor.cc pseudorendercontrol.cc \
-                  display.cc font.cc \
-                  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
+                  display.cc font.cc property.cc timer.cc \
+                  eventdispatcher.cc eventhandler.cc ustring.cc \
+                  widget.cc application.cc label.cc appwidget.cc button.cc \
+                  otk.cc messagedialog.cc
+
+#focuswidget.cc focuslabel.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 \
+                   display.hh eventdispatcher.hh eventhandler.hh font.hh \
+                   label.hh otk.hh point.hh property.hh pseudorendercontrol.hh\
+                   rect.hh rendercolor.hh rendercontrol.hh renderstyle.hh \
+                   rendertexture.hh size.hh strut.hh surface.hh \
                    timer.hh truerendercontrol.hh ustring.hh util.hh widget.hh \
-                   ../config.h
-libotk_la_LDFLAGS = $(XFT_LIBS) @LIBS@
+                   messagedialog.hh ../config.h
 
+EXTRA_DIST = otk.pc.in
+
+DISTCLEANFILES = otk.pc
 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)," \
 		@srcdir@/$^ > $@
 
 distclean-local:
-	rm -f *\~ *.orig *.rej .\#*
+	$(RM) *\~ *.orig *.rej .\#*
+
+uninstall-am:
+	-rmdir -p $(includeotkdir)
+	-rmdir -p $(pkgconfigdir)
 
 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