From 51ca9977c757145d07bff162e8d90d61c76f37d3 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 12 Jun 2003 21:13:59 +0000 Subject: Put the ChangeLog.pre-1-4 in the Makefiles. svn path=/trunk/; revision=21426 --- art/Makefile.am | 1 + calendar/Makefile.am | 5 ++++- camel/Makefile.am | 1 + composer/Makefile.am | 1 + default_user/Makefile.am | 4 +++- doc/Makefile.am | 2 ++ doc/devel/Makefile.am | 3 ++- e-util/Makefile.am | 5 ++++- filter/Makefile.am | 9 +++++++-- help/Makefile.am | 5 ++++- help/no/Makefile.am | 4 +++- importers/Makefile.am | 5 ++++- libwombat/Makefile.am | 2 ++ mail/Makefile.am | 1 + my-evolution/Makefile.am | 1 + shell/Makefile.am | 3 +++ tools/Makefile.am | 1 - ui/Makefile.am | 4 +++- views/Makefile.am | 2 ++ widgets/Makefile.am | 3 +++ widgets/misc/Makefile.am | 4 +++- wombat/Makefile.am | 1 + 22 files changed, 55 insertions(+), 12 deletions(-) diff --git a/art/Makefile.am b/art/Makefile.am index 1409d509c8..e5050c17bd 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -229,6 +229,7 @@ if DEFAULT_BINARY endif EXTRA_DIST = \ + ChangeLog.pre-1-4 \ attachment.xpm \ bell.xpm \ check-filled.xpm \ diff --git a/calendar/Makefile.am b/calendar/Makefile.am index 89cea775bd..4b0426da91 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -6,4 +6,7 @@ endif SUBDIRS = idl cal-util pcs cal-client gui importers $(CONDUIT_DIR) -EXTRA_DIST = zones.h +EXTRA_DIST = \ + ChangeLog.pre-1-4 \ + zones.h + diff --git a/camel/Makefile.am b/camel/Makefile.am index 5599b93008..b5469177d2 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -290,4 +290,5 @@ noinst_HEADERS = \ camel-html-parser.h EXTRA_DIST = \ + ChangeLog.pre-1-4 \ README diff --git a/composer/Makefile.am b/composer/Makefile.am index f605c116f3..51d158daf9 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -93,6 +93,7 @@ libcomposer_la_SOURCES = \ EXTRA_DIST = \ $(glade_DATA) \ $(IDLS) \ + ChangeLog.pre-1-4 \ composer-marshal.list \ bad-icon.xpm diff --git a/default_user/Makefile.am b/default_user/Makefile.am index 574f872c9b..19003a80c4 100644 --- a/default_user/Makefile.am +++ b/default_user/Makefile.am @@ -3,7 +3,9 @@ SUBDIRS = local defaultdir = $(privdatadir)/default_user default_DATA = addressbook-sources.xml searches.xml vfolders.xml -EXTRA_DIST = $(default_DATA) +EXTRA_DIST = \ + $(default_DATA) \ + ChangeLog.pre-1-4 install-data-hook: -mkdir $(DESTDIR)$(defaultdir)/views diff --git a/doc/Makefile.am b/doc/Makefile.am index 75be1c7ed2..b940e42eb7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1 +1,3 @@ SUBDIRS = devel + +EXTRA_DIST = ChangeLog.pre-1-4 diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am index 67058268d3..7940af73f5 100644 --- a/doc/devel/Makefile.am +++ b/doc/devel/Makefile.am @@ -94,7 +94,8 @@ EXTRA_DIST = \ $(extra_files) \ $(installed_content_files) \ $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) + $(DOC_MAIN_SGML_FILE) \ + ChangeLog.pre-1-4 # $(DOC_MODULE).types \ # $(DOC_MODULE)-sections.txt \ diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 74bf6978d7..29cd5e58e5 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -136,7 +136,10 @@ libeconduit_la_SOURCES = $(pilot_compile) libeconduit_static_la_SOURCES = $(libeconduit_la_SOURCES) libeconduit_static_la_LDFLAGS = -all-static -EXTRA_DIST = $(pilot_sources) e-util-marshal.list +EXTRA_DIST = \ + $(pilot_sources) \ + ChangeLog.pre-1-4 \ + e-util-marshal.list edb3include_HEADERS = \ e-db3-utils.h \ diff --git a/filter/Makefile.am b/filter/Makefile.am index 9f85f028e3..2b4b1038d5 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -69,8 +69,13 @@ libfilter_la_SOURCES = \ libfilter_la_DEPENDENCIES = libfilter-i18n.h -EXTRA_DIST = filtertypes.xml vfoldertypes.xml \ - $(glade_DATA) libfilter-i18n.h filter-marshal.list +EXTRA_DIST = \ + $(glade_DATA) \ + ChangeLog.pre-1-4 \ + filter-marshal.list \ + filtertypes.xml \ + libfilter-i18n.h \ + vfoldertypes.xml # basic rules. filterdir = $(privdatadir) diff --git a/help/Makefile.am b/help/Makefile.am index 3d27ac8780..7ff022b9a6 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,3 +1,6 @@ SUBDIRS = C -EXTRA_DIST = xmldocs.make omf.make +EXTRA_DIST = \ + ChangeLog.pre-1-4 \ + xmldocs.make \ + omf.make diff --git a/help/no/Makefile.am b/help/no/Makefile.am index 56df841020..97f50baeb7 100644 --- a/help/no/Makefile.am +++ b/help/no/Makefile.am @@ -44,6 +44,8 @@ sgml_ents = \ usage-mainwindow.sgml \ usage-print.sgml \ usage-sync.sgml - + include $(top_srcdir)/help/sgmldocs.make dist-hook: app-dist-hook + +EXTRA_DIST = ChangeLog.pre-1-4 \ No newline at end of file diff --git a/importers/Makefile.am b/importers/Makefile.am index 194746bee8..6535a0b013 100644 --- a/importers/Makefile.am +++ b/importers/Makefile.am @@ -70,6 +70,9 @@ oaf_in_files = GNOME_Evolution_Netscape_Intelligent_Importer.oaf.in \ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) -EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) +EXTRA_DIST = \ + $(oaf_in_files) \ + $(oaf_DATA) \ + ChangeLog.pre-1-4 @XML_I18N_MERGE_OAF_RULE@ diff --git a/libwombat/Makefile.am b/libwombat/Makefile.am index 3c6723fc81..30e7074396 100644 --- a/libwombat/Makefile.am +++ b/libwombat/Makefile.am @@ -33,3 +33,5 @@ noinst_LTLIBRARIES = libwombat-static.la libwombat_static_la_SOURCES = $(libwombat_la_SOURCES) libwombat_static_la_LDFLAGS = --all-static + +EXTRA_DIST = ChangeLog.pre-1-4 \ No newline at end of file diff --git a/mail/Makefile.am b/mail/Makefile.am index 344ce9f027..ded741a549 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -192,6 +192,7 @@ $(EVOLUTION_MAIL_CORBA_GENERATED_H): Mailer.idl $(EVOLUTION_MAIL_CORBA_GENERATED_C): $(EVOLUTION_MAIL_CORBA_GENERATED_H) EXTRA_DIST = \ + ChangeLog.pre-1-4 \ Mailer.idl \ $(SPELL_IDL) \ $(glade_DATA) \ diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am index 0d1d3bd6f2..3bb6fd91a4 100644 --- a/my-evolution/Makefile.am +++ b/my-evolution/Makefile.am @@ -117,6 +117,7 @@ EXTRA_DIST = \ $(server_DATA) \ $(Location_DATA) \ $(glade_DATA) \ + ChangeLog.pre-1-4 \ Locations.h \ Location-translation-script \ check-empty.xpm \ diff --git a/shell/Makefile.am b/shell/Makefile.am index b6021ea02d..a46cc1c631 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -234,6 +234,8 @@ evolution_SOURCES = \ e-shell-view-menu.h \ e-shell-view.c \ e-shell-view.h \ + e-shell-window.c \ + e-shell-window.h \ e-shell.c \ e-shell.h \ e-shortcuts-view-model.c \ @@ -359,6 +361,7 @@ EXTRA_DIST = \ $(etspec_DATA) \ $(schema_DATA) \ $(icons) \ + ChangeLog.pre-1-4 \ GNOME_Evolution_TestComponent.server \ e-shell-marshal.list \ evolution-nognome.in diff --git a/tools/Makefile.am b/tools/Makefile.am index 7fb6880b87..467f699650 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -4,7 +4,6 @@ privlibexec_SCRIPTS = \ privlibexec_PROGRAMS = \ evolution-addressbook-import \ - evolution-launch-composer \ killev diff --git a/ui/Makefile.am b/ui/Makefile.am index 1856bbc0aa..47e1e04779 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -21,4 +21,6 @@ XML_FILES = \ evolutionui_DATA = $(XML_FILES) -EXTRA_DIST = $(XML_FILES) +EXTRA_DIST = \ + $(XML_FILES) \ + ChangeLog.pre-1-4 diff --git a/views/Makefile.am b/views/Makefile.am index f6439105cc..3dc18e3f6d 100644 --- a/views/Makefile.am +++ b/views/Makefile.am @@ -1 +1,3 @@ SUBDIRS = addressbook mail tasks calendar + +EXTRA_DIST = ChangeLog.pre-1-4 diff --git a/widgets/Makefile.am b/widgets/Makefile.am index c4fda6b6c6..4154550db6 100644 --- a/widgets/Makefile.am +++ b/widgets/Makefile.am @@ -3,3 +3,6 @@ SUBDIRS = \ e-timezone-dialog \ misc \ menus + +EXTRA_DIST = \ + ChangeLog.pre-1-4 diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 3f1be05c58..10dc419309 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -132,4 +132,6 @@ test_title_bar_LDADD = \ BUILT_SOURCES = $(MARSHAL_GENERATED) CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = e-util-marshal.list +EXTRA_DIST = \ + e-util-marshal.list \ + ChangeLog.pre-1-4 diff --git a/wombat/Makefile.am b/wombat/Makefile.am index 311adad020..0513b9efb7 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -86,6 +86,7 @@ idl_DATA = $(IDLS) EXTRA_DIST = $(server_DATA) \ $(server_in_files) \ $(idl_DATA) \ + ChangeLog.pre-1-4 \ GNOME_Evolution_WombatLDAP.server.in.in \ GNOME_Evolution_WombatNOLDAP.server.in.in -- cgit v1.2.3