diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-02-06 06:19:46 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-02-06 06:19:46 +0000 |
| commit | c3e4f97d87207bd0df5cb93007a83a97bba0064d (patch) | |
| tree | 4b84b779df0a819c6aaba23c64cb451367848d3a /wrap/Makefile.am | |
| parent | 37050803a6340a31de87cd19a8418163c8550ea8 (diff) | |
make "make dist" work, compiler flags cleanups
Diffstat (limited to 'wrap/Makefile.am')
| -rw-r--r-- | wrap/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/wrap/Makefile.am b/wrap/Makefile.am index d13f53b4..38470d80 100644 --- a/wrap/Makefile.am +++ b/wrap/Makefile.am @@ -3,10 +3,9 @@ oblibdir = $(libdir)/openbox #pythondir = $(oblibdir)/python obpythondir = $(oblibdir)/python -CPPFLAGS = $(XFT_CFLAGS) $(SWIG_PYTHON_CFLAGS) @CPPFLAGS@ +CPPFLAGS = -I$(srcdir)/../otk -I$(srcdir)/../src $(XFT_CFLAGS) $(SWIG_PYTHON_CFLAGS) @CPPFLAGS@ CXXFLAGS = $(filter-out -W -Wall,@CXXFLAGS@) LDFLAGS = -module -avoid-version -INCLUDES = -I.. -I../otk -I../src obpython_LTLIBRARIES = otkpy.la obpy.la obpython_PYTHON = otk.py ob.py @@ -32,7 +31,7 @@ install-exec-hook: uninstall-am: $(RM) "$(DESTDIR)$(obpythondir)/_otk.so" $(RM) "$(DESTDIR)$(obpythondir)/_ob.so" - rmdir -p $(obpythondir) || true + -rmdir -p $(obpythondir) %.py: wrap_%.cc @@ -43,8 +42,8 @@ ob.i: $(addprefix ../src/,openbox.hh screen.hh client.hh python.hh frame.hh) @touch $@ wrap_otk.cc: otk.i - $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $< + $(SWIG) $(SWIG_PYTHON_OPT) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $< wrap_ob.cc: ob.i callback.i - $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $< + $(SWIG) $(SWIG_PYTHON_OPT) $(filter -I%,$(CPPFLAGS)) -nodefault -o $@ $< |