diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | data/Makefile.am | 8 | ||||
| -rw-r--r-- | data/buttons/Makefile.am | 2 | ||||
| -rw-r--r-- | data/styles/Makefile.am | 2 | ||||
| -rw-r--r-- | otk/Makefile.am | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | wrap/Makefile.am | 9 |
7 files changed, 16 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 20bfe4ad..4c82fef8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,9 +6,6 @@ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in doc: $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc -uninstall-local: - -rmdir $(pkgdatadir) - distclean-local: rm -f *\~ gmon.out .\#* diff --git a/data/Makefile.am b/data/Makefile.am index c8054908..67f1bd30 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,10 +1,10 @@ -SUBDIRS = styles buttons +#SUBDIRS = styles buttons CLEANFILES = menu MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = README.menu menu.in -all-local: menu +pkgdata_DATA = menu distclean-local: $(RM) *\~ .\#* @@ -12,9 +12,5 @@ distclean-local: menu: menu.in @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," @srcdir@/menu.in > menu -install-data-local: menu - test -f $(DESTDIR)$(pkgdatadir)/menu || \ - $(INSTALL_DATA) menu $(DESTDIR)$(pkgdatadir) - uninstall-am: $(RM) $(DESTDIR)$(pkgdatadir)/menu diff --git a/data/buttons/Makefile.am b/data/buttons/Makefile.am index 1984748d..3549bffd 100644 --- a/data/buttons/Makefile.am +++ b/data/buttons/Makefile.am @@ -10,4 +10,4 @@ MAINTAINERCLEANFILES = Makefile.in distclean-local: $(RM) *\~ .\#* #uninstall-am: -# rmdir -p $(DESTDIR)$(buttonsdir) || true +# -rmdir -p $(DESTDIR)$(buttonsdir) diff --git a/data/styles/Makefile.am b/data/styles/Makefile.am index 6a4853bf..eef4b140 100644 --- a/data/styles/Makefile.am +++ b/data/styles/Makefile.am @@ -10,4 +10,4 @@ MAINTAINERCLEANFILES = Makefile.in distclean-local: $(RM) *\~ .\#* #uninstall-am: -# rmdir -p $(DESTDIR)$(styledir) || true +# -rmdir -p $(DESTDIR)$(styledir) diff --git a/otk/Makefile.am b/otk/Makefile.am index 08f4d4cd..504319a7 100644 --- a/otk/Makefile.am +++ b/otk/Makefile.am @@ -24,6 +24,9 @@ includeotk_HEADERS=application.hh appwidget.hh assassin.hh button.hh \ timer.hh truerendercontrol.hh ustring.hh util.hh widget.hh \ ../config.h +EXTRA_DIST = otk.pc.in + +DISTCLEANFILES = otk.pc MAINTAINERCLEANFILES= Makefile.in pkgconfig_DATA = otk.pc @@ -36,6 +39,10 @@ otk.pc: otk.pc.in distclean-local: $(RM) *\~ *.orig *.rej .\#* +uninstall-am: + -rmdir -p $(includeotkdir) + -rmdir -p $(pkgconfigdir) + otk_test: libotk.la otk_test.cc $(CXX) $(CPPFLAGS) $(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@ diff --git a/src/Makefile.am b/src/Makefile.am index bdf6a50a..bf759d82 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,7 @@ openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \ buttonwidget.cc python.cc bindings.cc noinst_HEADERS= actions.hh backgroundwidget.hh bindings.hh buttonwidget.hh \ client.hh frame.hh labelwidget.hh openbox.hh python.hh \ - screen.hh widgetbase.hh + screen.hh widgetbase.hh gettext.h MAINTAINERCLEANFILES= Makefile.in 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 $@ $< |