X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=107f7355ce077e20e4bf19b02e5a351c78390daf;hb=77a46782db2996c0bc662c0f6d191df7a39c2cce;hp=154791ddd8f7910ffa7adb91fc64341c8e548d9e;hpb=49394f1edf60c87b4ebbf60b7bb8d5b6302b9a2f;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 154791dd..107f7355 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,43 +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)\" -DSWIG_GLOBAL 
-# -DSWIG_GLOBAL is for the swigruntime.cc (see swigruntime.i for explanation)
+-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 @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 \
-                  swigruntime.cc openbox_wrap.cc
-openbox3_LDFLAGS= $(PYTHON_LDFLAGS)
-
-script_DATA = ob.py
-
-EXTRA_DIST = $(script_DATA)
+                  main.cc python.cc bindings.cc config.cc
+noinst_HEADERS= actions.hh bindings.hh client.hh frame.hh openbox.hh \
+                python.hh screen.hh config.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 $@ $<
-
-swigruntime.cc: swigruntime.i
-	swig -python -c++ -o $@ $<
-
-# local dependencies
+	$(RM) *\~ *.orig *.rej .\#*