X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=3a4f9865cad5c6e84fd505047d33c3bd6639b319;hb=fe55bb846db1933d8d6f023236298940cab441f8;hp=8034df0e773f5245d12e786e42f21a4b0876d976;hpb=cee305244662d352a7ad5ab7ae22f6221c064d3d;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 8034df0e..3a4f9865 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,12 +2,12 @@ localedir=$(datadir)/locale
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
-CPPFLAGS=$(XFT_CFLAGS) @CPPFLAGS@ \
+CPPFLAGS=$(XFT_CFLAGS) $(GUILE_CFLAGS) $(PYTHON_CFLAGS) @CPPFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
 -DLOCALEDIR=\"$(localedir)\"
 
-LIBS=$(XFT_LIBS) @LIBS@
+LIBS=$(XFT_LIBS) $(GUILE_LDFLAGS) $(PYTHON_LDFLAGS) @LIBS@
 
 INCLUDES= -I../otk
 
@@ -15,12 +15,21 @@ bin_PROGRAMS= openbox3
 
 openbox3_LDADD=../otk/libotk.a @LIBINTL@
 
-openbox3_SOURCES= client.cc frame.cc openbox.cc screen.cc \
-                 main.cc xeventhandler.cc
+openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \
+                  main.cc rootwindow.cc backgroundwidget.cc labelwidget.cc \
+                  buttonwidget.cc openbox_wrap.cc
+# guile.cc
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
 	rm -f *\~ *.orig *.rej .\#*
 
+openbox.i: openbox.hh screen.hh client.hh
+	touch openbox.i
+
+openbox_wrap.cc: openbox.i
+	swig -python -c++ -nodefault -o openbox_wrap.cc openbox.i
+#	swig -guile -c++ -nodefault -o openbox_wrap.cc openbox.i
+
 # local dependencies