diff --git a/Makefile.am b/Makefile.am index d59c21828a..a3bafabeb2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = macros debian intl doc-tools doc lib src po rpm accounts +SUBDIRS = macros debian intl doc-tools doc lib src intl-scm po rpm accounts docdir = ${GNC_DOC_INSTALL_DIR} diff --git a/configure.in b/configure.in index 414c9fae4f..e109341e80 100644 --- a/configure.in +++ b/configure.in @@ -694,6 +694,7 @@ AC_OUTPUT( doc/sgml/pt_PT/Makefile doc-tools/Makefile intl/Makefile + intl-scm/Makefile lib/Makefile lib/guile-www/Makefile lib/srfi/Makefile diff --git a/intl-scm/.cvsignore b/intl-scm/.cvsignore new file mode 100644 index 0000000000..a403b17fe4 --- /dev/null +++ b/intl-scm/.cvsignore @@ -0,0 +1,3 @@ +Makefile +Makefile.in +guile-strings.c diff --git a/intl-scm/Makefile.am b/intl-scm/Makefile.am new file mode 100644 index 0000000000..2114ab3886 --- /dev/null +++ b/intl-scm/Makefile.am @@ -0,0 +1,13 @@ +EXTRA_DIST = \ + .cvsignore \ + guile-strings.c \ + xgettext.scm + +guile-strings.c: + rm -f guile-strings.c + guile -s ./xgettext.scm `find ../src -name '*.scm'` +CLEANFILES += guile-strings.c + +all-local: + rm -f guile-strings.c + diff --git a/src/scm/xgettext.scm b/intl-scm/xgettext.scm similarity index 100% rename from src/scm/xgettext.scm rename to intl-scm/xgettext.scm diff --git a/make-gnucash-potfiles.in b/make-gnucash-potfiles.in index 34c44177e0..4f20a874da 100644 --- a/make-gnucash-potfiles.in +++ b/make-gnucash-potfiles.in @@ -50,3 +50,5 @@ foreach my $file (@possible_files) { print $path . $name . "\n"; } + +print "intl-scm/guile-strings.c\n"; diff --git a/po/POTFILES.in b/po/POTFILES.in index 47f216730e..e3ecab4c33 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -213,6 +213,7 @@ src/gnome/file-history.c src/gnome/window-help.c src/gnome/gnc-network.c src/gnome/gnc-splash.c +src/gnome/gnucash.keys.in src/gnome/mainwindow-account-tree.c src/gnome/reconcile-list.c src/gnome/top-level.c @@ -222,6 +223,7 @@ src/gnome/window-main.c src/gnome/window-reconcile.c src/gnome/window-register.c src/gnome/window-report.c +src/gnome/gnucash.desktop.in src/gnome/argv-list-converters.c src/gnome/file-utils.c src/gnome/dialog-sx-from-trans.c @@ -287,3 +289,4 @@ src/report/report-system/gnc-report.c src/report/standard-reports/gncmod-standard-reports.c src/report/stylesheets/gncmod-stylesheets.c src/report/utility-reports/gncmod-utility-reports.c +intl-scm/guile-strings.c diff --git a/src/import-export/qif-import/.cvsignore b/src/import-export/qif-import/.cvsignore index afc4346b89..6e5ca7ed41 100644 --- a/src/import-export/qif-import/.cvsignore +++ b/src/import-export/qif-import/.cvsignore @@ -1,7 +1,6 @@ Makefile -guile-strings.c +Makefile.in .deps .libs -Makefile.in *.lo *.la diff --git a/src/import-export/qif-import/Makefile.am b/src/import-export/qif-import/Makefile.am index f7c2e9a048..e71e00877e 100644 --- a/src/import-export/qif-import/Makefile.am +++ b/src/import-export/qif-import/Makefile.am @@ -56,10 +56,3 @@ EXTRA_DIST = \ ${gncscm_DATA} \ ${glade_DATA} \ file-format.txt - -guile-strings.c: ${gncscm_DATA} - rm -f guile-strings.c - guile -s ../../scm/xgettext.scm ${gncscm_DATA} -CLEANFILES += guile-strings.c - -all-local: guile-strings.c diff --git a/src/scm/.cvsignore b/src/scm/.cvsignore index 23ad0fa98c..db318b74f3 100644 --- a/src/scm/.cvsignore +++ b/src/scm/.cvsignore @@ -2,4 +2,3 @@ Makefile Makefile.in .scm-links bootstrap.scm -guile-strings.c diff --git a/src/scm/Makefile.am b/src/scm/Makefile.am index 5c67e76b60..cc978f45ed 100644 --- a/src/scm/Makefile.am +++ b/src/scm/Makefile.am @@ -26,7 +26,6 @@ gnc_regular_scm_files = \ substring-search.scm \ tip-list.scm \ tip-of-the-day.scm \ - xgettext.scm \ xml-generator.scm gncscm_DATA = ${gnc_autogen_scm_files} ${gnc_regular_scm_files} @@ -48,13 +47,6 @@ EXTRA_DIST = \ startup-design.txt \ ${SCM_FILES} -guile-strings.c: ${SCM_FILES} - rm -f guile-strings.c - guile -s ./xgettext.scm ${SCM_FILES} -CLEANFILES += guile-strings.c - -all-local: guile-strings.c - ## We borrow guile's convention and use @-...-@ as the substitution ## brackets here, instead of the usual @...@. This prevents autoconf ## from substituting the values directly into the left-hand sides of diff --git a/src/scm/gnumeric/.cvsignore b/src/scm/gnumeric/.cvsignore index a403b17fe4..282522db03 100644 --- a/src/scm/gnumeric/.cvsignore +++ b/src/scm/gnumeric/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -guile-strings.c diff --git a/src/scm/gnumeric/Makefile.am b/src/scm/gnumeric/Makefile.am index bae8a727ea..f6c3bb2b03 100644 --- a/src/scm/gnumeric/Makefile.am +++ b/src/scm/gnumeric/Makefile.am @@ -8,10 +8,3 @@ gncscm_DATA = \ EXTRA_DIST = \ .cvsignore \ ${gncscm_DATA} - -guile-strings.c: ${gncscm_DATA} - rm -f guile-strings.c - guile -s ../xgettext.scm ${gncscm_DATA} -CLEANFILES += guile-strings.c - -all-local: guile-strings.c diff --git a/src/scm/printing/.cvsignore b/src/scm/printing/.cvsignore index a403b17fe4..282522db03 100644 --- a/src/scm/printing/.cvsignore +++ b/src/scm/printing/.cvsignore @@ -1,3 +1,2 @@ Makefile Makefile.in -guile-strings.c diff --git a/src/scm/printing/Makefile.am b/src/scm/printing/Makefile.am index 284bce8c31..bd69bd568f 100644 --- a/src/scm/printing/Makefile.am +++ b/src/scm/printing/Makefile.am @@ -8,10 +8,3 @@ gncscm_DATA = \ EXTRA_DIST = \ .cvsignore \ ${gncscm_DATA} - -guile-strings.c: ${gncscm_DATA} - rm -f guile-strings.c - guile -s ../xgettext.scm ${gncscm_DATA} -CLEANFILES += guile-strings.c - -all-local: guile-strings.c