summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald Bultje <rbultje@src.gnome.org>2005-04-01 13:28:38 +0000
committerRonald Bultje <rbultje@src.gnome.org>2005-04-01 13:28:38 +0000
commit61abd4b7e2cc3358b551723f154114eea0f90736 (patch)
tree24e50920b41ef247417a6fba1bb577f0a54f8c55
parent9c5bf2da3d225ae1395690412385c8d7575c032c (diff)
downloadtotem-61abd4b7e2cc3358b551723f154114eea0f90736.tar.gz
Fix distcheck.
* Makefile.am: * data/Makefile.am: * help/C/Makefile.am: * help/omf.make: * omf.make: * src/Makefile.am: Fix distcheck.
-rw-r--r--ChangeLog10
-rw-r--r--Makefile.am2
-rw-r--r--data/Makefile.am3
-rw-r--r--help/C/Makefile.am2
-rw-r--r--help/omf.make1
-rw-r--r--omf.make1
-rw-r--r--src/Makefile.am1
7 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c232e4be..78c06fe3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-01 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * Makefile.am:
+ * data/Makefile.am:
+ * help/C/Makefile.am:
+ * help/omf.make:
+ * omf.make:
+ * src/Makefile.am:
+ Fix distcheck.
+
2005-04-01 Bastien Nocera <hadess@hadess.net>
* src/totem-menu.c: (totem_lang_table_init): and set the correct
diff --git a/Makefile.am b/Makefile.am
index 2a38a1389..3d2aa0653 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,5 +18,7 @@ EXTRA_DIST = \
CLEANFILES = totem.spec totem-plparser.pc
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = totem-plparser.pc
diff --git a/data/Makefile.am b/data/Makefile.am
index c5e41b61b..2f07cb024 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -84,7 +84,8 @@ else
install-data-local:
endif
-EXTRA_DIST = $(stuff_DATA) $(desktop_in_in_files_all) totem.schemas.in lirc_example schemas.sh desktop.sh handlers.sh $(man_MANS) mime-type-list.txt mime-type-include.sh totem-video-thumbnailer.1 totem-video-thumbnailer.pod
+EXTRA_DIST = $(stuff_DATA) $(desktop_in_in_files_all) lirc_example totem.schemas.in schemas.sh desktop.sh handlers.sh $(man_MANS) mime-type-list.txt mime-type-include.sh totem-video-thumbnailer.1 totem-video-thumbnailer.pod
CLEANFILES = *.bak *.gladep core* *.orig *~ $(desktop_DATA) $(schema_DATA) $(desktop_in_files_all)
+DISTCLEANFILES = $(schema_in_files) update-gconf.sh
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index a9ec91cb9..2a15f0b8b 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -9,5 +9,3 @@ entities = legal.xml
include $(top_srcdir)/xmldocs.make
dist-hook: app-dist-hook
-
-
diff --git a/help/omf.make b/help/omf.make
index 3261e0015..471d5816d 100644
--- a/help/omf.make
+++ b/help/omf.make
@@ -28,6 +28,7 @@
omf_dest_dir=$(datadir)/omf/@PACKAGE@
scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
+CLEANFILES += $(omf_file:.omf=.omf.out)
omf: omf_timestamp
diff --git a/omf.make b/omf.make
index 5b52a55a9..638539090 100644
--- a/omf.make
+++ b/omf.make
@@ -29,6 +29,7 @@
omf_dest_dir=$(datadir)/omf/@PACKAGE@
scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
+CLEANFILES += $(omffile:.omf=.omf.out)
omf: omf_timestamp
diff --git a/src/Makefile.am b/src/Makefile.am
index f2d957a8b..98022ad79 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,7 +87,6 @@ totem_SOURCES = \
totem-menu.c totem-menu.h \
totem-time-label.c totem-time-label.h \
totem-uri.c totem-uri.h \
- debug.h \
totem-statusbar.c \
totem-statusbar.h \
totem-gromit.c totem-gromit.h