From e0448bd957187c8a557d895819de25175a60235f Mon Sep 17 00:00:00 2001 From: "Donald A. Peterson" Date: Fri, 28 Feb 2003 02:52:19 +0000 Subject: [PATCH] Removed wildcards from Makefiles for better POSIX-compliant portability svn: r1321 --- src/.cvsignore | 1 + src/Makefile.am | 102 ++++++++++++++++++++++++++++-- src/Makefile.in | 111 ++++++++++++++++++++++++++++++--- src/data/.cvsignore | 1 + src/data/Makefile.in | 7 +-- src/data/templates/Makefile.am | 6 +- src/data/templates/Makefile.in | 14 +++-- src/docgen/.cvsignore | 1 + src/docgen/Makefile.am | 16 ++++- src/docgen/Makefile.in | 24 +++++-- src/filters/.cvsignore | 1 + src/filters/Makefile.am | 20 +++++- src/filters/Makefile.in | 28 +++++++-- src/gramps_main.py | 10 ++- src/plugins/.cvsignore | 1 + src/plugins/Makefile.am | 48 +++++++++++++- src/plugins/Makefile.in | 56 +++++++++++++++-- src/po/Makefile.in | 7 +-- 18 files changed, 403 insertions(+), 51 deletions(-) diff --git a/src/.cvsignore b/src/.cvsignore index 7fba86ca0..fe701199c 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -1,4 +1,5 @@ Makefile +Makefile.in *.pyc *.pyo gramps.strings diff --git a/src/Makefile.am b/src/Makefile.am index 0208c4ba2..50d4bc773 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,12 +12,104 @@ MOSTLYCLEANFILES = # We only want optimized byte-compiled (.pyo) versions, no .pyc # In principle, this is handled by PYCFILES and PYOFILES, but # they don't seem to work so we edited the py-compile script instead -pkgpython_PYTHON = ${wildcard *.py} +pkgpython_PYTHON = AddMedia.py \ + AddrEdit.py \ + AddSpouse.py \ + AttrEdit.py \ + AutoComp.py \ + Bookmarks.py \ + Calendar.py \ + ChooseParents.py \ + const.py \ + DateEdit.py \ + Date.py \ + DbPrompter.py \ + DisplayTrace.py \ + DrawDoc.py \ + EditPerson.py \ + EditPlace.py \ + EditSource.py \ + EventEdit.py \ + Filter.py \ + Find.py \ + FontScale.py \ + GedcomInfo.py \ + GenericFilter.py \ + GrampsCfg.py \ + gramps_main.py \ + GrampsParser.py \ + gramps.py \ + GrampsXML.py \ + GrampsZODB.py \ + GraphLayout.py \ + ImageSelect.py \ + ImgManip.py \ + intl.py \ + latin_ansel.py \ + latin_utf8.py \ + LocEdit.py \ + Marriage.py \ + MediaView.py \ + MergeData.py \ + NameEdit.py \ + NoteEdit.py \ + PaperMenu.py \ + PedView.py \ + PlaceView.py \ + Plugins.py \ + QuestionDialog.py \ + QuickAdd.py \ + ReadXML.py \ + RelImage.py \ + RelLib.py \ + Report.py \ + SelectChild.py \ + Sorter.py \ + sort.py \ + soundex.py \ + Sources.py \ + SourceView.py \ + SpreadSheetDoc.py \ + StartupDialog.py \ + StyleEditor.py \ + SubstKeywords.py \ + TarFile.py \ + TextDoc.py \ + UrlEdit.py \ + Utils.py \ + VersionControl.py \ + WriteXML.py -# Use GNU make's ':=' syntax for nice wildcard use. -# If not using GNU make, then list all files individually -GLADEFILES := ${wildcard *.glade} -GRAPHICS := ${wildcard *.xpm} ${wildcard *.png} ${wildcard *.jpg} + +# Could use GNU make's ':=' syntax for nice wildcard use but since +# GNU make is not POSIX-compliant, we list all files individually +GLADEFILES = config.glade \ + dialog.glade \ + EditPerson.glade \ + gramps.glade \ + imagesel.glade \ + marriage.glade \ + mergedata.glade \ + places.glade \ + plugins.glade \ + preferences.glade \ + revision.glade \ + rule.glade \ + srcsel.glade \ + styles.glade +XPMFILES = earth.xpm \ + fam.xpm \ + gramps.xpm \ + pedegree.xpm \ + people.xpm + + +PNGFILES = gramps.png \ + logo.png + +JPGFILES = splash.jpg + +GRAPHICS = ${XPMFILES} ${PNGFILES} ${JPGFILES} # Other stuff that we need to install pkgdata_DATA = ${INTLLIBS} ${GLADEFILES} ${GRAPHICS} gramps.desktop diff --git a/src/Makefile.in b/src/Makefile.in index 5b4bde42b..755a6758d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -49,7 +49,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -123,12 +122,106 @@ MOSTLYCLEANFILES = # We only want optimized byte-compiled (.pyo) versions, no .pyc # In principle, this is handled by PYCFILES and PYOFILES, but # they don't seem to work so we edited the py-compile script instead -pkgpython_PYTHON = ${wildcard *.py} +pkgpython_PYTHON = AddMedia.py \ + AddrEdit.py \ + AddSpouse.py \ + AttrEdit.py \ + AutoComp.py \ + Bookmarks.py \ + Calendar.py \ + ChooseParents.py \ + const.py \ + DateEdit.py \ + Date.py \ + DbPrompter.py \ + DisplayTrace.py \ + DrawDoc.py \ + EditPerson.py \ + EditPlace.py \ + EditSource.py \ + EventEdit.py \ + Filter.py \ + Find.py \ + FontScale.py \ + GedcomInfo.py \ + GenericFilter.py \ + GrampsCfg.py \ + gramps_main.py \ + GrampsParser.py \ + gramps.py \ + GrampsXML.py \ + GrampsZODB.py \ + GraphLayout.py \ + ImageSelect.py \ + ImgManip.py \ + intl.py \ + latin_ansel.py \ + latin_utf8.py \ + LocEdit.py \ + Marriage.py \ + MediaView.py \ + MergeData.py \ + NameEdit.py \ + NoteEdit.py \ + PaperMenu.py \ + PedView.py \ + PlaceView.py \ + Plugins.py \ + QuestionDialog.py \ + QuickAdd.py \ + ReadXML.py \ + RelImage.py \ + RelLib.py \ + Report.py \ + SelectChild.py \ + Sorter.py \ + sort.py \ + soundex.py \ + Sources.py \ + SourceView.py \ + SpreadSheetDoc.py \ + StartupDialog.py \ + StyleEditor.py \ + SubstKeywords.py \ + TarFile.py \ + TextDoc.py \ + UrlEdit.py \ + Utils.py \ + VersionControl.py \ + WriteXML.py -# Use GNU make's ':=' syntax for nice wildcard use. -# If not using GNU make, then list all files individually -GLADEFILES := ${wildcard *.glade} -GRAPHICS := ${wildcard *.xpm} ${wildcard *.png} ${wildcard *.jpg} + +# Could use GNU make's ':=' syntax for nice wildcard use but since +# GNU make is not POSIX-compliant, we list all files individually +GLADEFILES = config.glade \ + dialog.glade \ + EditPerson.glade \ + gramps.glade \ + imagesel.glade \ + marriage.glade \ + mergedata.glade \ + places.glade \ + plugins.glade \ + preferences.glade \ + revision.glade \ + rule.glade \ + srcsel.glade \ + styles.glade + +XPMFILES = earth.xpm \ + fam.xpm \ + gramps.xpm \ + pedegree.xpm \ + people.xpm + + +PNGFILES = gramps.png \ + logo.png + + +JPGFILES = splash.jpg + +GRAPHICS = ${XPMFILES} ${PNGFILES} ${JPGFILES} # Other stuff that we need to install pkgdata_DATA = ${INTLLIBS} ${GLADEFILES} ${GRAPHICS} gramps.desktop @@ -320,7 +413,7 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -381,7 +474,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/src/data/.cvsignore b/src/data/.cvsignore index f3c7a7c5d..282522db0 100644 --- a/src/data/.cvsignore +++ b/src/data/.cvsignore @@ -1 +1,2 @@ Makefile +Makefile.in diff --git a/src/data/Makefile.in b/src/data/Makefile.in index 3392f206d..626acbfa7 100644 --- a/src/data/Makefile.in +++ b/src/data/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -48,7 +48,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -257,7 +256,7 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -316,7 +315,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/src/data/templates/Makefile.am b/src/data/templates/Makefile.am index 6ea47c126..9473659dd 100644 --- a/src/data/templates/Makefile.am +++ b/src/data/templates/Makefile.am @@ -1,5 +1,9 @@ # This is the src/data/templates level Makefile -pkgdata_DATA := ${wildcard *.tpkg} templates.xml +pkgdata_DATA = blue_edge.tpkg \ + marble.tpkg \ + pink_marble.tpkg \ + sepia.tpkg \ + sky_border.tpkg pkgdatadir = ${datadir}/@PACKAGE@/data/templates EXTRA_DIST = ${pkgdata_DATA} diff --git a/src/data/templates/Makefile.in b/src/data/templates/Makefile.in index 5a0ad737b..12028bbcd 100644 --- a/src/data/templates/Makefile.in +++ b/src/data/templates/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -48,7 +48,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -111,7 +110,12 @@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ # This is the src/data/templates level Makefile -pkgdata_DATA := ${wildcard *.tpkg} templates.xml +pkgdata_DATA = blue_edge.tpkg \ + marble.tpkg \ + pink_marble.tpkg \ + sepia.tpkg \ + sky_border.tpkg + EXTRA_DIST = ${pkgdata_DATA} subdir = src/data/templates mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -156,7 +160,7 @@ top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -202,7 +206,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/src/docgen/.cvsignore b/src/docgen/.cvsignore index 04ab68864..c3ec8f1b3 100644 --- a/src/docgen/.cvsignore +++ b/src/docgen/.cvsignore @@ -1,3 +1,4 @@ Makefile +Makefile.in *.pyc *.pyo diff --git a/src/docgen/Makefile.am b/src/docgen/Makefile.am index df1dd8be2..2d0d14226 100644 --- a/src/docgen/Makefile.am +++ b/src/docgen/Makefile.am @@ -1,6 +1,20 @@ # This is the src/docgen level Makefile for Gramps # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all .py files individually -pkgpython_PYTHON := ${wildcard *.py} +pkgpython_PYTHON = AbiWordDoc.py \ + HtmlDoc.py \ + KwordDoc.py \ + LaTeXDocGary.py \ + LaTeXDoc.py \ + NroffDoc.py \ + OpenDrawDoc.py \ + OpenOfficeDoc.py \ + OpenSpreadSheet.py \ + PdfDoc.py \ + PdfDrawDoc.py \ + PSDrawDoc.py \ + RTFDoc.py \ + SvgDrawDoc.py + pkgpyexecdir = @pkgpyexecdir@/docgen pkgpythondir = @pkgpythondir@/docgen diff --git a/src/docgen/Makefile.in b/src/docgen/Makefile.in index b3ecf6ffd..59a910376 100644 --- a/src/docgen/Makefile.in +++ b/src/docgen/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -49,7 +49,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -104,6 +103,7 @@ ZIP = @ZIP@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ + pkgpyexecdir = @pkgpyexecdir@/docgen pkgpythondir = @pkgpythondir@/docgen pyexecdir = @pyexecdir@ @@ -112,7 +112,21 @@ pythondir = @pythondir@ # This is the src/docgen level Makefile for Gramps # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all .py files individually -pkgpython_PYTHON := ${wildcard *.py} +pkgpython_PYTHON = AbiWordDoc.py \ + HtmlDoc.py \ + KwordDoc.py \ + LaTeXDocGary.py \ + LaTeXDoc.py \ + NroffDoc.py \ + OpenDrawDoc.py \ + OpenOfficeDoc.py \ + OpenSpreadSheet.py \ + PdfDoc.py \ + PdfDrawDoc.py \ + PSDrawDoc.py \ + RTFDoc.py \ + SvgDrawDoc.py + subdir = src/docgen mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = @@ -159,7 +173,7 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -205,7 +219,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/src/filters/.cvsignore b/src/filters/.cvsignore index 04ab68864..c3ec8f1b3 100644 --- a/src/filters/.cvsignore +++ b/src/filters/.cvsignore @@ -1,3 +1,4 @@ Makefile +Makefile.in *.pyc *.pyo diff --git a/src/filters/Makefile.am b/src/filters/Makefile.am index 45c96efef..7249cf978 100644 --- a/src/filters/Makefile.am +++ b/src/filters/Makefile.am @@ -1,6 +1,24 @@ # This is the src/filters level Makefile for Gramps # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all .py files individually -pkgpython_PYTHON := ${wildcard *.py} +pkgpython_PYTHON = After.py \ + AltFam.py \ + Before.py \ + Disconnected.py \ + EventPlace.py \ + EventType.py \ + Females.py \ + HavePhotos.py \ + IncompleteNames.py \ + Males.py \ + MatchSndEx2.py \ + MatchSndEx.py \ + MutlipleMarriages.py \ + NeverMarried.py \ + NoBirthdate.py \ + NoChildren.py \ + RegExMatch.py \ + SubString.py + pkgpyexecdir = @pkgpyexecdir@/filters pkgpythondir = @pkgpythondir@/filters diff --git a/src/filters/Makefile.in b/src/filters/Makefile.in index 85f030435..513dd502d 100644 --- a/src/filters/Makefile.in +++ b/src/filters/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -49,7 +49,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -104,6 +103,7 @@ ZIP = @ZIP@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ + pkgpyexecdir = @pkgpyexecdir@/filters pkgpythondir = @pkgpythondir@/filters pyexecdir = @pyexecdir@ @@ -112,7 +112,25 @@ pythondir = @pythondir@ # This is the src/filters level Makefile for Gramps # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all .py files individually -pkgpython_PYTHON := ${wildcard *.py} +pkgpython_PYTHON = After.py \ + AltFam.py \ + Before.py \ + Disconnected.py \ + EventPlace.py \ + EventType.py \ + Females.py \ + HavePhotos.py \ + IncompleteNames.py \ + Males.py \ + MatchSndEx2.py \ + MatchSndEx.py \ + MutlipleMarriages.py \ + NeverMarried.py \ + NoBirthdate.py \ + NoChildren.py \ + RegExMatch.py \ + SubString.py + subdir = src/filters mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = @@ -159,7 +177,7 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -205,7 +223,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/src/gramps_main.py b/src/gramps_main.py index 0731b3362..005b209be 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -433,16 +433,20 @@ class Gramps: url = gnome.help.file_find_file("gramps-manual","gramps-manual.sgml") if url: url = "gnome-help:"+url - gnome.help.goto(url) + print "I found the manual at:" + print url + gnome.help.display(url,"gramps-manual") def on_writing_extensions_activate(self,obj): """Display the Extending GRAMPS manual""" import gnome.help url = gnome.help.file_find_file("extending-gramps","extending-gramps.sgml") + print "I found the extension guide at:" + print url if url: + gnome.help.display(url,"extending-gramps") url = "gnome-help:"+url - gnome.help.goto(url) - + def on_remove_child_clicked(self,obj): if not self.active_family or not self.active_child or not self.active_person: return diff --git a/src/plugins/.cvsignore b/src/plugins/.cvsignore index 04ab68864..c3ec8f1b3 100644 --- a/src/plugins/.cvsignore +++ b/src/plugins/.cvsignore @@ -1,3 +1,4 @@ Makefile +Makefile.in *.pyc *.pyo diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index eea043eb4..ace4bb638 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -1,11 +1,55 @@ # This is the src/plugins level Makefile for Gramps # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all .py files individually -pkgpython_PYTHON := ${wildcard *.py} +pkgpython_PYTHON = AncestorChart.py \ + AncestorReport.py \ + Capitalize.py \ + ChangeTypes.py \ + Check.py \ + count_anc.py \ + Desbrowser.py \ + DescendReport.py \ + DesGraph.py \ + DetAncestralReport.py \ + DetDescendantReport.py \ + EventCmp.py \ + FamilyGroup.py \ + FilterEditor.py \ + Graph.py \ + GraphViz.py \ + IndivComplete.py \ + IndivSummary.py \ + Merge.py \ + PatchNames.py \ + ReadGedcom.py \ + ReadNative.py \ + RelCalc.py \ + ReorderIds.py \ + soundgen.py \ + Summary.py \ + Verify.py \ + WebPage.py \ + WriteGedcom.py \ + WritePafPalm.py \ + WritePkg.py + pkgpyexecdir = @pkgpyexecdir@/plugins pkgpythondir = @pkgpythondir@/plugins -GLADEFILES := ${wildcard *.glade} +GLADEFILES = desbrowse.glade \ + eventcmp.glade \ + gedcomexport.glade \ + gedcomimport.glade \ + merge.glade \ + pafexport.glade \ + patchnames.glade \ + pkgexport.glade \ + readgedcom.glade \ + relcalc.glade \ + soundex.glade \ + summary.glade \ + verify.glade + pkgdatadir = ${datadir}/@PACKAGE@/plugins diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index b7c759bb8..ac585bc11 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -48,7 +48,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -105,6 +104,7 @@ ZIP = @ZIP@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ + pkgpyexecdir = @pkgpyexecdir@/plugins pkgpythondir = @pkgpythondir@/plugins pyexecdir = @pyexecdir@ @@ -113,9 +113,53 @@ pythondir = @pythondir@ # This is the src/plugins level Makefile for Gramps # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all .py files individually -pkgpython_PYTHON := ${wildcard *.py} +pkgpython_PYTHON = AncestorChart.py \ + AncestorReport.py \ + Capitalize.py \ + ChangeTypes.py \ + Check.py \ + count_anc.py \ + Desbrowser.py \ + DescendReport.py \ + DesGraph.py \ + DetAncestralReport.py \ + DetDescendantReport.py \ + EventCmp.py \ + FamilyGroup.py \ + FilterEditor.py \ + Graph.py \ + GraphViz.py \ + IndivComplete.py \ + IndivSummary.py \ + Merge.py \ + PatchNames.py \ + ReadGedcom.py \ + ReadNative.py \ + RelCalc.py \ + ReorderIds.py \ + soundgen.py \ + Summary.py \ + Verify.py \ + WebPage.py \ + WriteGedcom.py \ + WritePafPalm.py \ + WritePkg.py + + +GLADEFILES = desbrowse.glade \ + eventcmp.glade \ + gedcomexport.glade \ + gedcomimport.glade \ + merge.glade \ + pafexport.glade \ + patchnames.glade \ + pkgexport.glade \ + readgedcom.glade \ + relcalc.glade \ + soundex.glade \ + summary.glade \ + verify.glade -GLADEFILES := ${wildcard *.glade} pkgdata_DATA = ${GLADEFILES} dist_pkgdata_DATA = ${pkgdata_DATA} @@ -204,7 +248,7 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -250,7 +294,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/src/po/Makefile.in b/src/po/Makefile.in index f05fa6356..ebaf2db4e 100644 --- a/src/po/Makefile.in +++ b/src/po/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.2 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -49,7 +49,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -138,7 +137,7 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -184,7 +183,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use"