Fix distcheck errors.

Signed-off-by: Rob Caelers <robc@krandor.org>

Makefile.am

@@ -20,11 +20,9 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 SUBDIRS =      m4 po common backend frontend 
 DIST_SUBDIRS = $(SUBDIRS) build contrib
 
-EXTRA_DIST = 	config.rpath  \
-		config.xml \
-		autogen.sh \
-		autogencross.sh \
-		depcomp
+EXTRA_DIST = 	config.xml
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
 noinst_PROGRAMS =
 

backend/include/Makefile.am

@@ -5,4 +5,4 @@
 
 MAINTAINERCLEANFILES 	= Makefile.in 
 
-EXTRA_DIST 		= $(wildcard $(srcdir)/*.hh)
+EXTRA_DIST 		= $(wildcard $(srcdir)/*.hh) $(wildcard $(srcdir)/*.h)

frontend/applets/common/include/Makefile.am

@@ -5,7 +5,7 @@
 
 MAINTAINERCLEANFILES = 	Makefile.in
 
-EXTRA_DIST = 		$(wildcard $(srcdir)/*.h)
+EXTRA_DIST           = $(wildcard $(srcdir)/*.h)
 
 
 

frontend/applets/common/src/Makefile.am

@@ -15,7 +15,7 @@ libworkrave_1_0_la_SOURCES = \
 	timebar.c \
 	timerbox.c
 libworkrave_1_0_la_CFLAGS = \
-	-Wall -std=c99 $(GTK_CFLAGS) -I../include \
+	-Wall -std=c99 $(GTK_CFLAGS) -I$(srcdir)/../include \
 	-DWORKRAVE_PKGDATADIR="\"${pkgdatadir}\""
 libworkrave_1_0_la_LIBADD = \
 	$(GTK_LIBS)

frontend/applets/gnome3/src/Makefile.am

@@ -2,7 +2,7 @@ EXTRA_DIST 	= org.workrave.WorkraveApplet.panel-applet.in.in 	\
 		  org.workrave.WorkraveAppletFactory.service.in		\
 	  	  WorkraveApplet.c				 	\
 		  WorkraveApplet.h				 	\
-		  gnome-applet.xml					\
+		  workrave-gnome-applet.xml				\
 		  workrave-gnome-applet-menu.xml
 
 BUILT_SOURCES   =
@@ -71,8 +71,6 @@ $(GDBUS_SERVER_GENERATED) : workrave-gnome-applet.xml
 
 BUILT_SOURCES += $(GDBUS_SERVER_GENERATED)
 
-EXTRA_DIST += workrave-applet.xml
-
 CLEANFILES += $(GDBUS_SERVER_GENERATED)
 
 endif

frontend/applets/indicator/src/Makefile.am

@@ -1,37 +1,31 @@
 if HAVE_INDICATOR
 
-libexec_PROGRAMS = indicator-workrave-test
+# libexec_PROGRAMS = indicator-workrave-test
 
 workravelibdir = $(INDICATORDIR)
 workravelib_LTLIBRARIES = libworkrave.la
 libworkrave_la_SOURCES = \
 	indicator-workrave.c
 libworkrave_la_CFLAGS = \
 	$(INDICATOR_CFLAGS) \
-	-Wall -std=c99 -I../include -I../../common/include \
+	-Wall -std=c99 -I$(srcdir)/../include -I$(srcdir)/../../common/include \
 	-DG_LOG_DOMAIN=\"Indicator-Workrave\" \
 	-DWORKRAVE_PKGDATADIR="\"${pkgdatadir}\""
 libworkrave_la_LIBADD = \
-	$(INDICATOR_LIBS) -L../../common/src -lworkrave-1.0
+	$(INDICATOR_LIBS) -L$(srcdir)/../../common/src -lworkrave-1.0
 libworkrave_la_LDFLAGS = \
 	-module \
 	-avoid-version
 
-#	timebar.c \
-#	timebar.h \
-#	timerbox.c \
-#	timerbox.h	
-#
-
-indicator_workrave_test_SOURCES = \
-	test.c 
-indicator_workrave_test_CFLAGS = \
-	-Wall -std=c99 $(GTK_CFLAGS)  -I../include -I../../common/include \
-	-DG_LOG_DOMAIN=\"Indicator-Workrave\" \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	-DWORKRAVE_PKGDATADIR="\"${pkgdatadir}\""
-indicator_workrave_test_LDADD = \
-	$(GTK_LIBS) ../../common/src/libworkrave-1.0.la
+#indicator_workrave_test_SOURCES = \
+#	test.c 
+#indicator_workrave_test_CFLAGS = \
+#	-Wall -std=c99 $(GTK_CFLAGS)  -I../include -I../../common/include \
+#	-DG_LOG_DOMAIN=\"Indicator-Workrave\" \
+#	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+#	-DWORKRAVE_PKGDATADIR="\"${pkgdatadir}\""
+#indicator_workrave_test_LDADD = \
+#	$(GTK_LIBS) ../../common/src/libworkrave-1.0.la
 
 BUILT_SOURCES =
 

frontend/common/share/sounds/Makefile.am

@@ -3,12 +3,12 @@
 # Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008, 2011 Rob Caelers & Raymond Penners
 #
 
-MAINTAINERCLEANFILES = 	Makefile.in workrave.soundlist
-DISTCLEANFILES = 	workrave.soundlist
+MAINTAINERCLEANFILES = 	Makefile.in
+DISTCLEANFILES =
 
 SUBDIRS	= subtle default
 
 soundsdir = 		$(datadir)/sounds/workrave/
 defaultsoundsdir = 	$(soundsdir)/default
 
-EXTRA_DIST = 		${defaultsounds_DATA} $(utils_DATA) workrave.soundlist.in eventsrc.in
+EXTRA_DIST = 		${defaultsounds_DATA} $(utils_DATA)

po/POTFILES.in

@@ -9,19 +9,19 @@ backend/src/CoreFactory.cc
 backend/src/DayTimePred.cc
 backend/src/DistributionManager.cc
 backend/src/DistributionSocketLink.cc
+backend/src/GIOSocketDriver.cc
 backend/src/GNetSocketDriver.cc
+backend/src/GSettingsConfigurator.cc
 backend/src/GlibIniConfigurator.cc
 backend/src/IdleLogManager.cc
 backend/src/InputMonitor.cc
 backend/src/InputMonitorFactory.cc
 backend/src/PacketBuffer.cc
-backend/src/QtIniConfigurator.cc
-backend/src/QtNativeConfigurator.cc
-backend/src/QtSettingsConfigurator.cc
+backend/src/SocketDriver.cc
 backend/src/Statistics.cc
+backend/src/Test.cc
 backend/src/TimePredFactory.cc
 backend/src/Timer.cc
-backend/src/WeekTimePred.cc
 backend/src/XMLConfigurator.cc
 backend/src/osx/OSXConfigurator.cc
 backend/src/osx/OSXInputMonitor.cc
@@ -36,54 +36,73 @@ backend/src/win32/W32Configurator.cc
 backend/src/win32/W32InputMonitor.cc
 backend/src/win32/W32InputMonitorFactory.cc
 backend/src/win32/W32LowLevelMonitor.cc
-common/bin/DBus-template.cc
-common/src/DBus.cc
-common/src/DBusBinding.cc
+common/bin/DBus-client-template-freedesktop.cc
+common/bin/DBus-template-freedesktop.cc
+common/bin/DBus-template-gio.cc
+common/src/DBus-freedesktop.cc
+common/src/DBus-gio.cc
+common/src/DBusBinding-freedesktop.cc
+common/src/DBusBinding-gio.cc
 common/src/GlibThread.cc
+common/src/Locale.cc
 common/src/StringUtil.cc
 common/src/Util.cc
+common/src/WRID.cc
 common/src/debug.cc
-common/src/unix/Sound.cc
 common/src/win32/crashlog.c
 common/win32/harpoon/src/harpoon.c
-frontend/common/share/sounds/workrave.soundlist.in
-frontend/common/share/sounds/eventsrc.in
+frontend/applets/common/src/timebar.c
+frontend/applets/common/src/timerbox.c
+frontend/applets/gnome2/src/GNOME_WorkraveApplet.xml.in
+frontend/applets/gnome2/src/Workrave-Applet.server.in.in
+frontend/applets/gnome2/src/WorkraveApplet.c
+frontend/applets/gnome2/src/WorkraveApplet.c
+frontend/applets/gnome3/src/WorkraveApplet.c
+frontend/applets/gnome3/src/WorkraveApplet.c
+frontend/applets/gnome3/src/org.workrave.WorkraveApplet.panel-applet.in.in
+frontend/applets/indicator/src/indicator-workrave.c
+frontend/common/src/GstSoundPlayer.cc
+frontend/common/src/PulseMixer.cc
 frontend/common/src/SoundPlayer.cc
 frontend/common/src/System.cc
 frontend/common/src/Text.cc
 frontend/common/src/TimerBoxControl.cc
-frontend/common/src/kde/KdeSoundPlayer.cc
 frontend/common/src/osx/OSXSoundPlayer.cc
 frontend/common/src/osx/Sound.cc
 frontend/common/src/win32/Sound.cc
+frontend/common/src/win32/W32DirectSoundPlayer.cc
+frontend/common/src/win32/W32Mixer.cc
 frontend/common/src/win32/W32SoundPlayer.cc
 frontend/common/src/x11/Sound.cc
 frontend/gtkmm/src/AppletControl.cc
 frontend/gtkmm/src/AppletWindow.cc
 frontend/gtkmm/src/BreakWindow.cc
 frontend/gtkmm/src/DailyLimitWindow.cc
 frontend/gtkmm/src/DataConnector.cc
+frontend/gtkmm/src/EventButton.cc
 frontend/gtkmm/src/EventImage.cc
 frontend/gtkmm/src/EventLabel.cc
 frontend/gtkmm/src/Frame.cc
 frontend/gtkmm/src/GUI.cc
 frontend/gtkmm/src/GUIConfig.cc
+frontend/gtkmm/src/GenericDBusApplet.cc
 frontend/gtkmm/src/GnomeAppletMenu.cc
 frontend/gtkmm/src/GnomeAppletWindow.cc
 frontend/gtkmm/src/GtkUtil.cc
 frontend/gtkmm/src/HeadInfo.cc
 frontend/gtkmm/src/Hig.cc
 frontend/gtkmm/src/IconListCellRenderer.cc
 frontend/gtkmm/src/IconListNotebook.cc
-frontend/gtkmm/src/KdeAppletWindow.cc
-frontend/gtkmm/src/KdeWorkraveControl.cc
+frontend/gtkmm/src/IndicatorAppletMenu.cc
 frontend/gtkmm/src/MainGtkMenu.cc
 frontend/gtkmm/src/MainWindow.cc
 frontend/gtkmm/src/Menus.cc
 frontend/gtkmm/src/MicroBreakWindow.cc
+frontend/gtkmm/src/Plug.cc
 frontend/gtkmm/src/PreferencesDialog.cc
 frontend/gtkmm/src/PreludeWindow.cc
 frontend/gtkmm/src/RestBreakWindow.cc
+frontend/gtkmm/src/Session.cc
 frontend/gtkmm/src/StatusIcon.cc
 frontend/gtkmm/src/TimeBar.cc
 frontend/gtkmm/src/TimeEntry.cc
@@ -92,23 +111,20 @@ frontend/gtkmm/src/TimerBoxPreferencePage.cc
 frontend/gtkmm/src/TimerPreferencesPanel.cc
 frontend/gtkmm/src/WindowHints.cc
 frontend/gtkmm/src/X11SystrayAppletWindow.cc
-frontend/gtkmm/src/gtktrayicon.c
-frontend/gtkmm/src/workrave.desktop.in
-frontend/gtkmm/src/gnome_applet/GNOME_WorkraveApplet.xml.in
-frontend/gtkmm/src/gnome_applet/Workrave-Applet.server.in.in
-frontend/gtkmm/src/gnome_applet/WorkraveApplet.c
-frontend/gtkmm/src/gnome_applet3/org.workrave.WorkraveApplet.panel-applet.in.in
-frontend/gtkmm/src/gnome_applet3/WorkraveApplet.c
 frontend/gtkmm/src/main.cc
+frontend/gtkmm/src/osx/OSXAppletWindow.cc
 frontend/gtkmm/src/osx/OSXGtkMenu.cc
 frontend/gtkmm/src/osx/OSXUtil.cc
 frontend/gtkmm/src/unix/desktop-window.c
 frontend/gtkmm/src/win32/DesktopWindow.cc
 frontend/gtkmm/src/win32/W32AppletMenu.cc
 frontend/gtkmm/src/win32/W32AppletWindow.cc
 frontend/gtkmm/src/win32/W32Compat.cc
+frontend/gtkmm/src/win32/W32StatusIcon.cc
 frontend/gtkmm/src/win32/W32TrayMenu.cc
 frontend/gtkmm/src/win32/dll_hell.c
+frontend/gtkmm/src/workrave.desktop.in
+frontend/gtkmm/win32/setup/src/zapper.c
 frontend/plugin/distribution/gtkmm/src/NetworkJoinDialog.cc
 frontend/plugin/distribution/gtkmm/src/NetworkLogDialog.cc
 frontend/plugin/distribution/gtkmm/src/NetworkPreferencePage.cc
@@ -117,9 +133,3 @@ frontend/plugin/exercises/common/src/Exercise.cc
 frontend/plugin/exercises/gtkmm/src/ExercisesDialog.cc
 frontend/plugin/exercises/gtkmm/src/ExercisesPanel.cc
 frontend/plugin/statistics/gtkmm/src/StatisticsDialog.cc
-frontend/qt/src/GUI.cc
-frontend/qt/src/StatusWindow.cc
-frontend/qt/src/TimeBar.cc
-frontend/qt/src/TimerBoxView.cc
-frontend/qt/src/main.cc
-

po/POTFILES.skip

@@ -4,3 +4,5 @@ frontend/gtkmm/src/gnome_applet/GNOME_WorkraveApplet.xml
 frontend/gtkmm/src/gnome_applet/Workrave-Applet.server.in
 frontend/gtkmm/src/gnome_applet/Workrave-Applet.server.in
 frontend/gtkmm/src/workrave.desktop.in
+frontend/gtkmm/src/gtktrayicon.c
+frontend/gtkmm/src/gtktrayicon3.c