X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=9288490a145cf6a8b866ac240a8364ad9513ea1a;hb=74cfb1b4c115cdb4e05aa823b09d2b5ea9d0d690;hp=0b35f72a6ca5f9bde7d6afabcc5251c6cc5994d3;hpb=5face4c6f35172761367f63ac0b6eaf62d84e532;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 0b35f72a..9288490a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,39 +3,24 @@ scriptdir = $(libdir)/openbox/python
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
+CPPFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
 -DLOCALEDIR=\"$(localedir)\" \
 -DSCRIPTDIR=\"$(scriptdir)\"
 
-LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
-
-INCLUDES= -I..
+LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@ $(SWIG_PYTHON_LIB)
 
 bin_PROGRAMS= openbox3
 
-openbox3_LDADD=-L../otk -lotk -lswigpy @LIBINTL@
-
+openbox3_LDADD=-L../otk -lotk @LIBINTL@
+openbox3_LDFLAGS=-export-dynamic
 openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \
-                  main.cc backgroundwidget.cc labelwidget.cc \
-                  buttonwidget.cc python.cc bindings.cc \
-                  openbox_wrap.cc
-openbox3_LDFLAGS= $(PYTHON_LDFLAGS)
-
-script_DATA = ob.py
-
-EXTRA_DIST = $(script_DATA)
+                  main.cc python.cc bindings.cc
+noinst_HEADERS= actions.hh bindings.hh client.hh frame.hh openbox.hh \
+                python.hh screen.hh
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
-	rm -f *\~ *.orig *.rej .\#*
-
-openbox.i: openbox.hh screen.hh client.hh python.hh frame.hh
-	touch $@
-
-%_wrap.cc: %.i
-	swig -c -I../otk $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
-
-# local dependencies
+	$(RM) *\~ *.orig *.rej .\#*