make distcheck works now

Makefile.am

@@ -22,6 +22,12 @@ DESKTOP_FILES =$(DESKTOP_IN_FILES:.desktop.in=.desktop)
 desktopdir = $(datadir)/applications
 desktop_DATA = $(DESKTOP_FILES)
 
+DISTCLEANFILES =		\
+	$(DESKTOP_FILES)	\
+	intltool-extract	\
+	intltool-merge		\
+	intltool-update
+
 appicondir = $(datadir)/pixmaps
 appicon_DATA = moo/mooutils/pixmaps/medit.png
 hicolor = $(datadir)/icons/hicolor

m4/Makefile.am

@@ -6,6 +6,7 @@ EXTRA_DIST =        \
     moo-flags.m4    \
     moo-funcs.m4    \
     moo-gtk.m4      \
+    moo-i18n.m4     \
     moo-os.m4       \
     moo-pcre.m4     \
     moo-progs.m4    \

moo/mooapp/Makefile.am

@@ -1,3 +1,10 @@
+# make intltool happy
+all-am: subdirs-stamp
+subdirs-stamp:
+	mkdir -p glade
+	echo stamp > subdirs-stamp
+CLEANFILES = subdirs-stamp
+
 BUILT_SOURCES =			\
 	mooappabout-glade.h
 

moo/mooedit/Makefile.am

@@ -1,3 +1,10 @@
+# make intltool happy
+all-am: subdirs-stamp
+subdirs-stamp:
+	mkdir -p glade
+	echo stamp > subdirs-stamp
+CLEANFILES = subdirs-stamp
+
 SUBDIRS = plugins syntax
 
 mooedit_toolsdir = $(MOO_DATA_DIR)

moo/moofileview/Makefile.am

@@ -1,3 +1,10 @@
+# make intltool happy
+all-am: subdirs-stamp
+subdirs-stamp:
+	mkdir -p glade
+	echo stamp > subdirs-stamp
+CLEANFILES = subdirs-stamp
+
 moofileview_headers =	        \
 	moofileview.h
 

moo/moopython/plugins/pyproject/Makefile.am

@@ -1,7 +1,16 @@
+# make intltool happy
+all-am: subdirs-stamp
+subdirs-stamp:
+	mkdir -p projects/cproj
+	mkdir -p projects/ltxproj
+	mkdir -p mprj/config
+	echo stamp > subdirs-stamp
+CLEANFILES = subdirs-stamp
+
 ini_in_files = project-plugin.ini.desktop.in
 @MOO_INTLTOOL_INI_RULE@
 ini_files = $(ini_in_files:.ini.desktop.in=.ini)
-CLEANFILES = $(ini_files)
+CLEANFILES += $(ini_files)
 
 inidir = $(MOO_LIB_DIR)/plugins
 ini_DATA =				\
@@ -11,8 +20,8 @@ plugindir = $(MOO_LIB_DIR)/plugins/project
 plugin_DATA =				\
 	project-plugin.py
 
-mprjdir = $(plugindir)/mprj
-mprj_DATA =				\
+mprjdir = $(plugindir)
+nobase_mprj_DATA =			\
 	mprj/__init__.py		\
 	mprj/manager.py			\
 	mprj/project.py			\
@@ -20,9 +29,7 @@ mprj_DATA =				\
 	mprj/settings.py		\
 	mprj/simple.py			\
 	mprj/test.py			\
-	mprj/utils.py
-mprj_configdir = $(plugindir)/mprj/config
-mprj_config_DATA =			\
+	mprj/utils.py			\
 	mprj/config/_config.py		\
 	mprj/config/_dict.py		\
 	mprj/config/_group.py		\
@@ -33,30 +40,21 @@ mprj_config_DATA =			\
 	mprj/config/view.py		\
 	mprj/config/_xml.py
 
-projectsdir = $(MOO_LIB_DIR)/projects
-projects_DATA =				\
+projectsdir = $(MOO_LIB_DIR)
+nobase_projects_DATA =			\
 	projects/c.py			\
-	projects/latex.py
-
-cprojdir = $(projectsdir)/cproj
-cproj_DATA =				\
+	projects/latex.py		\
 	projects/cproj/config.py	\
 	projects/cproj/__init__.py	\
 	projects/cproj/optdialog.py	\
 	projects/cproj/parser.py	\
 	projects/cproj/view.py		\
-	projects/cproj/options.glade
-
-ltxprojdir = $(projectsdir)/ltxproj
-ltxproj_DATA =				\
+	projects/cproj/options.glade	\
 	projects/ltxproj/config.py	\
 	projects/ltxproj/__init__.py
 
 EXTRA_DIST =				\
     $(plugin_DATA)			\
     $(ini_in_files)			\
-    $(mprj_DATA)			\
-    $(mprj_config_DATA)			\
-    $(projects_DATA)			\
-    $(cproj_DATA)			\
-    $(ltxproj_DATA)
+    $(nobase_mprj_DATA)			\
+    $(nobase_projects_DATA)

moo/mooterm/Makefile.am

@@ -1,3 +1,10 @@
+# make intltool happy
+all-am: subdirs-stamp
+subdirs-stamp:
+	mkdir -p glade
+	echo stamp > subdirs-stamp
+CLEANFILES = subdirs-stamp
+
 mooterm_include_headers =	       \
 	mooterm.h                      \
 	mootermwindow.h                \
@@ -100,7 +107,7 @@ if MOO_OS_CYGWIN
 noinst_PROGRAMS = termhelper
 termhelper_SOURCES = $(termhelper_sources)
 nodist_termhelper_SOURCES = termhelper_res.res
-CLEANFILES = termhelper_res.res
+CLEANFILES += termhelper_res.res
 termhelper_CFLAGS =                         \
     -I$(top_builddir)                       \
     -I$(top_srcdir)                         \
@@ -114,5 +121,5 @@ termhelper_LDADD = termhelper_res.res
 else
 termhelper_res.res: termhelper_res.rc
 	touch termhelper_res.res
-CLEANFILES = termhelper_res.res
+CLEANFILES += termhelper_res.res
 endif

moo/mooutils/Makefile.am

@@ -1,3 +1,10 @@
+# make intltool happy
+all-am: subdirs-stamp
+subdirs-stamp:
+	mkdir -p glade
+	echo stamp > subdirs-stamp
+CLEANFILES = subdirs-stamp
+
 DIST_SUBDIRS = pcre xdgmime
 
 subdirs =
@@ -130,7 +137,7 @@ endif
 nodist_mooutils_sources =		\
 	moomarshals.c			\
 	moomarshals.h
-CLEANFILES =				\
+CLEANFILES +=				\
 	moomarshals.c			\
 	moomarshals.h
 
@@ -139,7 +146,7 @@ EXTRA_DIST =				\
 	py2h.sh				\
 	xml2h.sh			\
 	$(gmappedfile_sources)		\
-	$(moonewgtk_gtk_2_4_sources)	\
+	$(gtk_2_4_sources)		\
 	glade/accelbutton.glade		\
 	glade/accelprefs.glade		\
 	glade/moologwindow.glade	\