add merry's style as an option

[chaz/openbox] / otk / Makefile.am

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 29b35442fd9572d25ca3ae8cd6475f066021d1b9..d0edbe1dd8e5dd8ce84bcafe61a89db6a98e28b9 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -2,9 +2,11 @@ buttonsdir = $(pkgdatadir)/buttons
 scriptdir = $(libdir)/openbox/python
 
 CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
--DBUTTONSDIR=\"$(buttonsdir)\"
+-DBUTTONSDIR=\"$(buttonsdir)\" -DSWIG_GLOBAL
+# -DSWIG_GLOBAL means we don't have to link libswigpy cuz libotk will export
+# everything it would
 
-INCLUDES= -I../src
+#INCLUDES= -I../src
 
 #noinst_LIBRARIES=libotk.a
 lib_LTLIBRARIES=libotk.la
@@ -31,15 +33,17 @@ distclean-local:
        rm -f *\~ *.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) .libs/libotk.al @LIBS@
+       $(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) .libs/libotk.al @LIBS@
+       $(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 -c $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
+       swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
 
 # local dependencies