make "make dist" work, compiler flags cleanups

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 .\#*
 

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

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)

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)

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@
 

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
 

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 $@ $<