diff -Naur gnucash-1.6.8.orig/Makefile.in gnucash-1.6.8/Makefile.in --- gnucash-1.6.8.orig/Makefile.in Thu Aug 22 12:16:40 2002 +++ gnucash-1.6.8/Makefile.in Sun Aug 25 01:31:10 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -170,16 +174,7 @@ noinst_DATA = make-gnucash-patch @GNC_TAGS_FILE@ -doc_DATA = \ - AUTHORS \ - COPYING \ - ChangeLog \ - ChangeLog.1 \ - HACKING \ - INSTALL \ - NEWS \ - README \ - README.patches +doc_DATA = AUTHORS COPYING ChangeLog ChangeLog.1 HACKING INSTALL NEWS README README.patches # All the other files that go in the distribution tarfile that aren't @@ -193,27 +188,10 @@ # Don't list any directories or you'll get *everything*, including the # CVS dirs. -EXTRA_DIST = config.rpath \ - .cvsignore \ - ChangeLog.1 \ - HACKING \ - README.patches \ - gnucash.lsm \ - make-gnucash-patch.in \ - po/.cvsignore \ - po/README \ - po/glossary/da.po \ - po/glossary/de.po \ - po/glossary/es.po \ - po/glossary/es_NI-policy.txt \ - po/glossary/no.po \ - po/glossary/sv.po \ - po/glossary/gnc-glossary.txt \ - po/glossary/txt-to-pot.sh +EXTRA_DIST = config.rpath .cvsignore ChangeLog.1 HACKING README.patches gnucash.lsm make-gnucash-patch.in po/.cvsignore po/README po/glossary/da.po po/glossary/de.po po/glossary/es.po po/glossary/es_NI-policy.txt po/glossary/no.po po/glossary/sv.po po/glossary/gnc-glossary.txt po/glossary/txt-to-pot.sh -DISTCLEANFILES = \ - TAGS.stamp cscope.files cscope.out etags.files make-gnucash-patch +DISTCLEANFILES = TAGS.stamp cscope.files cscope.out etags.files make-gnucash-patch ACLOCAL_AMFLAGS = -I m4 @@ -231,21 +209,18 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 \ - m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 \ - m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 \ - m4/lib-link.m4 m4/lib-prefix.m4 m4/progtest.m4 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -412,6 +387,11 @@ -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile $(mkinstalldirs) $(distdir)/po $(distdir)/po/glossary @for file in $(DISTFILES); do \ d=$(srcdir); \ diff -Naur gnucash-1.6.8.orig/accounts/C/Makefile.in gnucash-1.6.8/accounts/C/Makefile.in --- gnucash-1.6.8.orig/accounts/C/Makefile.in Thu Aug 22 12:17:43 2002 +++ gnucash-1.6.8/accounts/C/Makefile.in Sun Aug 25 01:31:10 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,44 +170,10 @@ accountdir = ${GNC_ACCOUNTS_DIR}/C -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - - -EXTRA_DIST = \ - acctchrt_full.gnucash-xea \ - acctlist_brokerage.gnucash-xea \ - acctlist_carloan.gnucash-xea \ - acctlist_cdmoneymkt.gnucash-xea \ - acctlist_childcare.gnucash-xea \ - acctlist_common.gnucash-xea \ - acctlist_currency.gnucash-xea \ - acctlist_eduloan.gnucash-xea \ - acctlist_fixedassets.gnucash-xea \ - acctlist_full.gnucash-xea \ - acctlist_homeloan.gnucash-xea \ - acctlist_homeown.gnucash-xea \ - acctlist_otherloan.gnucash-xea \ - acctlist_renter.gnucash-xea \ - acctlist_retiremt.gnucash-xea \ - acctlist_spouseinc.gnucash-xea \ - acctlist_spouseretire.gnucash-xea \ - ${account_DATA} \ - .cvsignore +account_DATA = acctchrt_brokerage.gnucash-xea acctchrt_carloan.gnucash-xea acctchrt_cdmoneymkt.gnucash-xea acctchrt_childcare.gnucash-xea acctchrt_common.gnucash-xea acctchrt_currency.gnucash-xea acctchrt_eduloan.gnucash-xea acctchrt_fixedassets.gnucash-xea acctchrt_homeloan.gnucash-xea acctchrt_homeown.gnucash-xea acctchrt_otherloan.gnucash-xea acctchrt_renter.gnucash-xea acctchrt_retiremt.gnucash-xea acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea + + +EXTRA_DIST = acctchrt_full.gnucash-xea acctlist_brokerage.gnucash-xea acctlist_carloan.gnucash-xea acctlist_cdmoneymkt.gnucash-xea acctlist_childcare.gnucash-xea acctlist_common.gnucash-xea acctlist_currency.gnucash-xea acctlist_eduloan.gnucash-xea acctlist_fixedassets.gnucash-xea acctlist_full.gnucash-xea acctlist_homeloan.gnucash-xea acctlist_homeown.gnucash-xea acctlist_otherloan.gnucash-xea acctlist_renter.gnucash-xea acctlist_retiremt.gnucash-xea acctlist_spouseinc.gnucash-xea acctlist_spouseretire.gnucash-xea ${account_DATA} .cvsignore mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -215,14 +185,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps accounts/C/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu accounts/C/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -254,6 +224,11 @@ subdir = accounts/C distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu accounts/C/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/accounts/Makefile.in gnucash-1.6.8/accounts/Makefile.in --- gnucash-1.6.8.orig/accounts/Makefile.in Thu Aug 22 12:17:43 2002 +++ gnucash-1.6.8/accounts/Makefile.in Sun Aug 25 01:31:10 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,8 +170,7 @@ SUBDIRS = C da de_DE es_ES fr_FR pt_PT sk -EXTRA_DIST = \ - .cvsignore +EXTRA_DIST = .cvsignore mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@ -177,14 +180,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps accounts/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu accounts/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -283,6 +286,11 @@ subdir = accounts distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu accounts/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/accounts/da/Makefile.in gnucash-1.6.8/accounts/da/Makefile.in --- gnucash-1.6.8.orig/accounts/da/Makefile.in Thu Aug 22 12:17:43 2002 +++ gnucash-1.6.8/accounts/da/Makefile.in Sun Aug 25 01:31:10 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,16 +170,10 @@ accountdir = ${GNC_ACCOUNTS_DIR}/da -account_DATA = \ - acctchrt_car.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea +account_DATA = acctchrt_car.gnucash-xea acctchrt_common.gnucash-xea acctchrt_homeloan.gnucash-xea acctchrt_homeown.gnucash-xea -EXTRA_DIST = \ - ${account_DATA} \ - .cvsignore +EXTRA_DIST = ${account_DATA} .cvsignore mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -187,14 +185,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps accounts/da/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu accounts/da/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -226,6 +224,11 @@ subdir = accounts/da distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu accounts/da/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/accounts/de_DE/Makefile.in gnucash-1.6.8/accounts/de_DE/Makefile.in --- gnucash-1.6.8.orig/accounts/de_DE/Makefile.in Thu Aug 22 12:17:44 2002 +++ gnucash-1.6.8/accounts/de_DE/Makefile.in Sun Aug 25 01:31:10 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,25 +170,10 @@ accountdir = ${GNC_ACCOUNTS_DIR}/de_DE -account_DATA = \ - acctchrt_auto.gnucash-xea \ - acctchrt_autoloan.gnucash-xea \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_houseown.gnucash-xea \ - acctchrt_investment.gnucash-xea \ - acctchrt_kids.gnucash-xea \ - acctchrt_otherasset.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_studium.gnucash-xea - - -EXTRA_DIST = \ - ${account_DATA} \ - acctlist_full.gnucash \ - acctchrt_full.gnucash-xea \ - .cvsignore +account_DATA = acctchrt_auto.gnucash-xea acctchrt_autoloan.gnucash-xea acctchrt_brokerage.gnucash-xea acctchrt_common.gnucash-xea acctchrt_currency.gnucash-xea acctchrt_houseown.gnucash-xea acctchrt_investment.gnucash-xea acctchrt_kids.gnucash-xea acctchrt_otherasset.gnucash-xea acctchrt_otherloan.gnucash-xea acctchrt_studium.gnucash-xea + + +EXTRA_DIST = ${account_DATA} acctlist_full.gnucash acctchrt_full.gnucash-xea .cvsignore mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -196,14 +185,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps accounts/de_DE/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu accounts/de_DE/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -235,6 +224,11 @@ subdir = accounts/de_DE distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu accounts/de_DE/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/accounts/es_ES/Makefile.in gnucash-1.6.8/accounts/es_ES/Makefile.in --- gnucash-1.6.8.orig/accounts/es_ES/Makefile.in Thu Aug 22 12:17:44 2002 +++ gnucash-1.6.8/accounts/es_ES/Makefile.in Sun Aug 25 01:31:10 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,27 +170,10 @@ accountdir = ${GNC_ACCOUNTS_DIR}/es_ES -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - - -EXTRA_DIST = \ - ${account_DATA} \ - .cvsignore +account_DATA = acctchrt_brokerage.gnucash-xea acctchrt_carloan.gnucash-xea acctchrt_cdmoneymkt.gnucash-xea acctchrt_childcare.gnucash-xea acctchrt_common.gnucash-xea acctchrt_currency.gnucash-xea acctchrt_eduloan.gnucash-xea acctchrt_fixedassets.gnucash-xea acctchrt_homeloan.gnucash-xea acctchrt_homeown.gnucash-xea acctchrt_otherloan.gnucash-xea acctchrt_renter.gnucash-xea acctchrt_retiremt.gnucash-xea acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea + + +EXTRA_DIST = ${account_DATA} .cvsignore mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -198,14 +185,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps accounts/es_ES/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu accounts/es_ES/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -237,6 +224,11 @@ subdir = accounts/es_ES distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu accounts/es_ES/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/accounts/fr_FR/Makefile.in gnucash-1.6.8/accounts/fr_FR/Makefile.in --- gnucash-1.6.8.orig/accounts/fr_FR/Makefile.in Thu Aug 22 12:17:45 2002 +++ gnucash-1.6.8/accounts/fr_FR/Makefile.in Sun Aug 25 01:31:10 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,27 +170,10 @@ accountdir = ${GNC_ACCOUNTS_DIR}/fr_FR -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - - -EXTRA_DIST = \ - ${account_DATA} \ - .cvsignore +account_DATA = acctchrt_brokerage.gnucash-xea acctchrt_carloan.gnucash-xea acctchrt_cdmoneymkt.gnucash-xea acctchrt_childcare.gnucash-xea acctchrt_common.gnucash-xea acctchrt_currency.gnucash-xea acctchrt_eduloan.gnucash-xea acctchrt_fixedassets.gnucash-xea acctchrt_homeloan.gnucash-xea acctchrt_homeown.gnucash-xea acctchrt_otherloan.gnucash-xea acctchrt_renter.gnucash-xea acctchrt_retiremt.gnucash-xea acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea + + +EXTRA_DIST = ${account_DATA} .cvsignore mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -198,14 +185,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps accounts/fr_FR/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu accounts/fr_FR/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -237,6 +224,11 @@ subdir = accounts/fr_FR distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu accounts/fr_FR/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/accounts/pt_PT/Makefile.in gnucash-1.6.8/accounts/pt_PT/Makefile.in --- gnucash-1.6.8.orig/accounts/pt_PT/Makefile.in Thu Aug 22 12:17:45 2002 +++ gnucash-1.6.8/accounts/pt_PT/Makefile.in Sun Aug 25 01:31:10 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,27 +170,10 @@ accountdir = ${GNC_ACCOUNTS_DIR}/pt_PT -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - - -EXTRA_DIST = \ - ${account_DATA} \ - .cvsignore +account_DATA = acctchrt_brokerage.gnucash-xea acctchrt_carloan.gnucash-xea acctchrt_cdmoneymkt.gnucash-xea acctchrt_childcare.gnucash-xea acctchrt_common.gnucash-xea acctchrt_currency.gnucash-xea acctchrt_eduloan.gnucash-xea acctchrt_fixedassets.gnucash-xea acctchrt_homeloan.gnucash-xea acctchrt_homeown.gnucash-xea acctchrt_otherloan.gnucash-xea acctchrt_renter.gnucash-xea acctchrt_retiremt.gnucash-xea acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea + + +EXTRA_DIST = ${account_DATA} .cvsignore mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -198,14 +185,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps accounts/pt_PT/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu accounts/pt_PT/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -237,6 +224,11 @@ subdir = accounts/pt_PT distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu accounts/pt_PT/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/accounts/sk/Makefile.in gnucash-1.6.8/accounts/sk/Makefile.in --- gnucash-1.6.8.orig/accounts/sk/Makefile.in Thu Aug 22 12:17:45 2002 +++ gnucash-1.6.8/accounts/sk/Makefile.in Sun Aug 25 01:31:10 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,27 +170,10 @@ accountdir = ${GNC_ACCOUNTS_DIR}/sk -account_DATA = \ - acctchrt_brokerage.gnucash-xea \ - acctchrt_carloan.gnucash-xea \ - acctchrt_cdmoneymkt.gnucash-xea \ - acctchrt_childcare.gnucash-xea \ - acctchrt_common.gnucash-xea \ - acctchrt_currency.gnucash-xea \ - acctchrt_eduloan.gnucash-xea \ - acctchrt_fixedassets.gnucash-xea \ - acctchrt_homeloan.gnucash-xea \ - acctchrt_homeown.gnucash-xea \ - acctchrt_otherloan.gnucash-xea \ - acctchrt_renter.gnucash-xea \ - acctchrt_retiremt.gnucash-xea \ - acctchrt_spouseinc.gnucash-xea \ - acctchrt_spouseretire.gnucash-xea - - -EXTRA_DIST = \ - ${account_DATA} \ - .cvsignore +account_DATA = acctchrt_brokerage.gnucash-xea acctchrt_carloan.gnucash-xea acctchrt_cdmoneymkt.gnucash-xea acctchrt_childcare.gnucash-xea acctchrt_common.gnucash-xea acctchrt_currency.gnucash-xea acctchrt_eduloan.gnucash-xea acctchrt_fixedassets.gnucash-xea acctchrt_homeloan.gnucash-xea acctchrt_homeown.gnucash-xea acctchrt_otherloan.gnucash-xea acctchrt_renter.gnucash-xea acctchrt_retiremt.gnucash-xea acctchrt_spouseinc.gnucash-xea acctchrt_spouseretire.gnucash-xea + + +EXTRA_DIST = ${account_DATA} .cvsignore mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -198,14 +185,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps accounts/sk/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu accounts/sk/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -237,6 +224,11 @@ subdir = accounts/sk distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu accounts/sk/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/config.h.in gnucash-1.6.8/config.h.in --- gnucash-1.6.8.orig/config.h.in Thu Aug 22 12:07:01 2002 +++ gnucash-1.6.8/config.h.in Fri Aug 23 21:39:30 2002 @@ -112,6 +112,9 @@ /* Define if you have the getuid function. */ #undef HAVE_GETUID +/* Define if you have the localtime_r function. */ +#undef HAVE_LOCALTIME_R + /* Define if you have the memcpy function. */ #undef HAVE_MEMCPY @@ -121,6 +124,9 @@ /* Define if you have the munmap function. */ #undef HAVE_MUNMAP +/* Define if you have the pthread_mutex_init function. */ +#undef HAVE_PTHREAD_MUTEX_INIT + /* Define if you have the putenv function. */ #undef HAVE_PUTENV @@ -139,6 +145,9 @@ /* Define if you have the strdup function. */ #undef HAVE_STRDUP +/* Define if you have the strptime function. */ +#undef HAVE_STRPTIME + /* Define if you have the strtoul function. */ #undef HAVE_STRTOUL @@ -208,12 +217,6 @@ /* Define if you have the header file. */ #undef HAVE_SYS_PARAM_H -/* Define if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_TYPES_H - /* Define if you have the header file. */ #undef HAVE_UNISTD_H @@ -269,4 +272,7 @@ /* is sizeof(long_long) >= sizeof(gint64) */ #undef GUILE_LONG_LONG_OK + +/* Define if scanf supports %qd conversions. */ +#undef HAVE_SCANF_QD diff -Naur gnucash-1.6.8.orig/configure gnucash-1.6.8/configure --- gnucash-1.6.8.orig/configure Thu Aug 22 12:07:06 2002 +++ gnucash-1.6.8/configure Sun Aug 25 01:31:54 2002 @@ -8464,7 +8464,7 @@ fi -for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h +for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -8596,24 +8596,11 @@ #include #include -#if HAVE_SYS_TYPES_H -# include -#endif - -#if HAVE_STDLIB_H -# include -#endif - -#if HAVE_SYS_STAT_H -# include -#endif - -#if HAVE_UNISTD_H -# include -#endif - /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE +# ifdef HAVE_UNISTD_H +# include +# endif /* Assume that all systems that can run configure have sys/param.h. */ # ifndef HAVE_SYS_PARAM_H @@ -8721,7 +8708,7 @@ } EOF -if { (eval echo configure:8725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -8745,12 +8732,12 @@ echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:8749: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:8736: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9165,7 +9152,7 @@ echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:9169: checking for iconv" >&5 +echo "configure:9156: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9173,7 +9160,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -9183,7 +9170,7 @@ iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:9187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -9195,7 +9182,7 @@ am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" cat > conftest.$ac_ext < #include @@ -9205,7 +9192,7 @@ iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:9209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -9228,7 +9215,7 @@ fi if test "$am_cv_lib_iconv" = yes; then echo $ac_n "checking how to link with libiconv""... $ac_c" 1>&6 -echo "configure:9232: checking how to link with libiconv" >&5 +echo "configure:9219: checking how to link with libiconv" >&5 echo "$ac_t""$LIBICONV" 1>&6 else CPPFLAGS="$am_save_CPPFLAGS" @@ -9244,7 +9231,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9248: checking for $ac_word" >&5 +echo "configure:9235: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9279,7 +9266,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9283: checking for $ac_word" >&5 +echo "configure:9270: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9316,7 +9303,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9320: checking for $ac_word" >&5 +echo "configure:9307: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9353,7 +9340,7 @@ # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9357: checking for $ac_word" >&5 +echo "configure:9344: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9416,17 +9403,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9420: checking for $ac_hdr" >&5 +echo "configure:9407: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9457,12 +9444,12 @@ strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9461: checking for $ac_func" >&5 +echo "configure:9448: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9514,13 +9501,13 @@ if test "$am_cv_func_iconv" = yes; then echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:9518: checking for iconv declaration" >&5 +echo "configure:9505: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9539,7 +9526,7 @@ ; return 0; } EOF -if { (eval echo configure:9543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -9563,19 +9550,19 @@ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:9567: checking for nl_langinfo and CODESET" >&5 +echo "configure:9554: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:9579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -9598,19 +9585,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:9602: checking for LC_MESSAGES" >&5 +echo "configure:9589: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:9614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -9636,7 +9623,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9640: checking for $ac_word" >&5 +echo "configure:9627: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9669,7 +9656,7 @@ ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:9673: checking version of bison" >&5 +echo "configure:9660: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -9696,7 +9683,7 @@ echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:9700: checking whether NLS is requested" >&5 +echo "configure:9687: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -9720,7 +9707,7 @@ gt_use_preinstalled_gnugettext=no echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:9724: checking whether included gettext is requested" >&5 +echo "configure:9711: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -9740,12 +9727,12 @@ echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:9744: checking for GNU gettext in libc" >&5 +echo "configure:9731: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -9755,7 +9742,7 @@ return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings ; return 0; } EOF -if { (eval echo configure:9759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libc=yes else @@ -10125,7 +10112,7 @@ fi echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:10129: checking for GNU gettext in libintl" >&5 +echo "configure:10116: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10134,7 +10121,7 @@ gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -10149,7 +10136,7 @@ return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0) ; return 0; } EOF -if { (eval echo configure:10153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libintl=yes else @@ -10162,7 +10149,7 @@ if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -10177,7 +10164,7 @@ return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0) ; return 0; } EOF -if { (eval echo configure:10181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" @@ -10243,7 +10230,7 @@ if test "$gt_use_preinstalled_gnugettext" = "yes"; then if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then echo $ac_n "checking how to link with libintl""... $ac_c" 1>&6 -echo "configure:10247: checking how to link with libintl" >&5 +echo "configure:10234: checking how to link with libintl" >&5 echo "$ac_t""$LIBINTL" 1>&6 for element in $INCINTL; do @@ -10441,17 +10428,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10445: checking for $ac_hdr" >&5 +echo "configure:10432: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10506,9 +10493,9 @@ LIBS="-lpq $LIBS" fi echo $ac_n "checking for libpq""... $ac_c" 1>&6 -echo "configure:10510: checking for libpq" >&5 +echo "configure:10497: checking for libpq" >&5 cat > conftest.$ac_ext < @@ -10519,7 +10506,7 @@ ; return 0; } EOF -if { (eval echo configure:10523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -10573,19 +10560,19 @@ echo $ac_n "checking for nl_langinfo and D_FMT""... $ac_c" 1>&6 -echo "configure:10577: checking for nl_langinfo and D_FMT" >&5 +echo "configure:10564: checking for nl_langinfo and D_FMT" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_dfmt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(D_FMT); ; return 0; } EOF -if { (eval echo configure:10589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_dfmt=yes else @@ -10639,7 +10626,7 @@ # Extract the first word of "etags", so it can be a program name with args. set dummy etags; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10643: checking for $ac_word" >&5 +echo "configure:10630: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GNC_TAGS_FILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10686,7 +10673,7 @@ # check for glade libs echo $ac_n "checking for glade_init in -lglade""... $ac_c" 1>&6 -echo "configure:10690: checking for glade_init in -lglade" >&5 +echo "configure:10677: checking for glade_init in -lglade" >&5 ac_lib_var=`echo glade'_'glade_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10694,7 +10681,7 @@ ac_save_LIBS="$LIBS" LIBS="-lglade $GLADE_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10752,7 +10739,7 @@ # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10756: checking for $ac_word" >&5 +echo "configure:10743: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10833,12 +10820,12 @@ DB_LIBS= echo $ac_n "checking for dbopen""... $ac_c" 1>&6 -echo "configure:10837: checking for dbopen" >&5 +echo "configure:10824: checking for dbopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dbopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbopen=yes" else @@ -10880,7 +10867,7 @@ echo "$ac_t""no" 1>&6 if test "$prefer_db1" = "yes"; then echo $ac_n "checking for dbopen in -ldb1""... $ac_c" 1>&6 -echo "configure:10884: checking for dbopen in -ldb1" >&5 +echo "configure:10871: checking for dbopen in -ldb1" >&5 ac_lib_var=`echo db1'_'dbopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10888,7 +10875,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb1 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10918,7 +10905,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:10922: checking for dbopen in -ldb" >&5 +echo "configure:10909: checking for dbopen in -ldb" >&5 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10926,7 +10913,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10956,7 +10943,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __db185_open in -ldb-3""... $ac_c" 1>&6 -echo "configure:10960: checking for __db185_open in -ldb-3" >&5 +echo "configure:10947: checking for __db185_open in -ldb-3" >&5 ac_lib_var=`echo db-3'_'__db185_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10964,7 +10951,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb-3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11005,7 +10992,7 @@ else echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:11009: checking for dbopen in -ldb" >&5 +echo "configure:10996: checking for dbopen in -ldb" >&5 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11013,7 +11000,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11043,7 +11030,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbopen in -ldb1""... $ac_c" 1>&6 -echo "configure:11047: checking for dbopen in -ldb1" >&5 +echo "configure:11034: checking for dbopen in -ldb1" >&5 ac_lib_var=`echo db1'_'dbopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11051,7 +11038,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb1 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11081,7 +11068,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __db185_open in -ldb-3""... $ac_c" 1>&6 -echo "configure:11085: checking for __db185_open in -ldb-3" >&5 +echo "configure:11072: checking for __db185_open in -ldb-3" >&5 ac_lib_var=`echo db-3'_'__db185_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11089,7 +11076,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb-3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11138,17 +11125,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11142: checking for $ac_hdr" >&5 +echo "configure:11129: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11186,17 +11173,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11190: checking for $ac_hdr" >&5 +echo "configure:11177: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11240,7 +11227,7 @@ oLIBS="$LIBS" LIBS="$LIBS $GNOME_XML_LIB" echo $ac_n "checking for xmlElemDump in -lxml""... $ac_c" 1>&6 -echo "configure:11244: checking for xmlElemDump in -lxml" >&5 +echo "configure:11231: checking for xmlElemDump in -lxml" >&5 ac_lib_var=`echo xml'_'xmlElemDump | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11248,7 +11235,7 @@ ac_save_LIBS="$LIBS" LIBS="-lxml $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11290,7 +11277,7 @@ GTKHTML_CFLAGS=`$GNOME_CONFIG --cflags gtkhtml` echo $ac_n "checking for main in -lgal""... $ac_c" 1>&6 -echo "configure:11294: checking for main in -lgal" >&5 +echo "configure:11281: checking for main in -lgal" >&5 ac_lib_var=`echo gal'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11298,14 +11285,14 @@ ac_save_LIBS="$LIBS" LIBS="-lgal `$GNOME_CONFIG --libs gal` $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11330,7 +11317,7 @@ # check for gtkhtml and enable it via HAVE_LIBGTKHTML # if found echo $ac_n "checking for gtk_html_new in -lgtkhtml""... $ac_c" 1>&6 -echo "configure:11334: checking for gtk_html_new in -lgtkhtml" >&5 +echo "configure:11321: checking for gtk_html_new in -lgtkhtml" >&5 ac_lib_var=`echo gtkhtml'_'gtk_html_new | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11338,7 +11325,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgtkhtml $GTKHTML_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11380,7 +11367,7 @@ # Note: this doesn't croak if GHTTP_LIBS is empty! (e.g. on RH6.2) echo $ac_n "checking for ghttp_request_new in -lghttp""... $ac_c" 1>&6 -echo "configure:11384: checking for ghttp_request_new in -lghttp" >&5 +echo "configure:11371: checking for ghttp_request_new in -lghttp" >&5 ac_lib_var=`echo ghttp'_'ghttp_request_new | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11388,7 +11375,7 @@ ac_save_LIBS="$LIBS" LIBS="-lghttp $GHTTP_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11429,7 +11416,7 @@ echo $ac_n "checking for ghttp_enable_ssl in -lghttp""... $ac_c" 1>&6 -echo "configure:11433: checking for ghttp_enable_ssl in -lghttp" >&5 +echo "configure:11420: checking for ghttp_enable_ssl in -lghttp" >&5 ac_lib_var=`echo ghttp'_'ghttp_enable_ssl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11437,7 +11424,7 @@ ac_save_LIBS="$LIBS" LIBS="-lghttp $GHTTP_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11527,7 +11514,7 @@ # LAME: if you ask gnome-config for the zvt libs, it doesn't include # imlib, though it needs it so we'll just steal gtkhtml's which does. echo $ac_n "checking for main in -lzvt""... $ac_c" 1>&6 -echo "configure:11531: checking for main in -lzvt" >&5 +echo "configure:11518: checking for main in -lzvt" >&5 ac_lib_var=`echo zvt'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11535,14 +11522,14 @@ ac_save_LIBS="$LIBS" LIBS="-lzvt `$GNOME_CONFIG --libs zvt gtkhtml` $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11565,7 +11552,7 @@ echo $ac_n "checking for main in -lbonobo""... $ac_c" 1>&6 -echo "configure:11569: checking for main in -lbonobo" >&5 +echo "configure:11556: checking for main in -lbonobo" >&5 ac_lib_var=`echo bonobo'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11573,14 +11560,14 @@ ac_save_LIBS="$LIBS" LIBS="-lbonobo `$GNOME_CONFIG --libs bonobo` $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11604,7 +11591,7 @@ echo $ac_n "checking for main in -loaf""... $ac_c" 1>&6 -echo "configure:11608: checking for main in -loaf" >&5 +echo "configure:11595: checking for main in -loaf" >&5 ac_lib_var=`echo oaf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11612,14 +11599,14 @@ ac_save_LIBS="$LIBS" LIBS="-loaf `$GNOME_CONFIG --libs oaf` $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11687,7 +11674,7 @@ # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11691: checking for $ac_word" >&5 +echo "configure:11678: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11722,7 +11709,7 @@ min_libguppi_version=0.35.1 echo $ac_n "checking for libguppi - version >= $min_libguppi_version""... $ac_c" 1>&6 -echo "configure:11726: checking for libguppi - version >= $min_libguppi_version" >&5 +echo "configure:11713: checking for libguppi - version >= $min_libguppi_version" >&5 no_libguppi="" if test "$GNOME_CONFIG" = "no" ; then no_libguppi=yes @@ -11747,7 +11734,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -11814,7 +11801,7 @@ EOF -if { (eval echo configure:11818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -11848,7 +11835,7 @@ CFLAGS="$CFLAGS $LIBGUPPI_CFLAGS" LIBS="$LIBS $LIBGUPPI_LIBS" cat > conftest.$ac_ext < @@ -11858,7 +11845,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:11862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding libguppi or finding the wrong" @@ -11919,7 +11906,7 @@ ### popt echo $ac_n "checking for poptStrippedArgv in -lpopt""... $ac_c" 1>&6 -echo "configure:11923: checking for poptStrippedArgv in -lpopt" >&5 +echo "configure:11910: checking for poptStrippedArgv in -lpopt" >&5 ac_lib_var=`echo popt'_'poptStrippedArgv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11927,7 +11914,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpopt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11996,7 +11983,7 @@ # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12000: checking for $ac_word" >&5 +echo "configure:11987: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12036,7 +12023,7 @@ max_guile_version=1.5.0 echo $ac_n "checking for guile - ${min_guile_version} <= version < ${max_guile_version}""... $ac_c" 1>&6 -echo "configure:12040: checking for guile - ${min_guile_version} <= version < ${max_guile_version}" >&5 +echo "configure:12027: checking for guile - ${min_guile_version} <= version < ${max_guile_version}" >&5 if test x${BUILD_GUILE} != x -a ${BUILD_GUILE} != no ; then guile_version=`guile-config --version 2>&1` @@ -12112,7 +12099,7 @@ # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12116: checking for $ac_word" >&5 +echo "configure:12103: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12154,7 +12141,7 @@ # Extract the first word of "g-wrap-config", so it can be a program name with args. set dummy g-wrap-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12158: checking for $ac_word" >&5 +echo "configure:12145: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_G_WRAP_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12195,7 +12182,7 @@ if test x$CHECK_VERSION != xno ; then echo $ac_n "checking for g-wrap - ${min_gwrap_version} <= version < ${max_gwrap_version}""... $ac_c" 1>&6 -echo "configure:12199: checking for g-wrap - ${min_gwrap_version} <= version < ${max_gwrap_version}" >&5 +echo "configure:12186: checking for g-wrap - ${min_gwrap_version} <= version < ${max_gwrap_version}" >&5 gwrap_major_version=`${G_WRAP_CONFIG} --version | \ sed 's/g-wrap-config \([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` @@ -12255,17 +12242,17 @@ # Find out what the g-wrap compile and link flags are. echo $ac_n "checking for g-wrap compile args""... $ac_c" 1>&6 -echo "configure:12259: checking for g-wrap compile args" >&5 +echo "configure:12246: checking for g-wrap compile args" >&5 G_WRAP_COMPILE_ARGS=`${G_WRAP_CONFIG} --c-compile-args guile` echo "$ac_t""$G_WRAP_COMPILE_ARGS" 1>&6 echo $ac_n "checking for g-wrap link args""... $ac_c" 1>&6 -echo "configure:12264: checking for g-wrap link args" >&5 +echo "configure:12251: checking for g-wrap link args" >&5 G_WRAP_LINK_ARGS=`${G_WRAP_CONFIG} --c-link-args guile` echo "$ac_t""$G_WRAP_LINK_ARGS" 1>&6 echo $ac_n "checking for g-wrap module directory""... $ac_c" 1>&6 -echo "configure:12269: checking for g-wrap module directory" >&5 +echo "configure:12256: checking for g-wrap module directory" >&5 G_WRAP_MODULE_DIR=`${G_WRAP_CONFIG} --guile-module-directory` echo "$ac_t""$G_WRAP_MODULE_DIR" 1>&6 @@ -12273,7 +12260,7 @@ # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12277: checking for $ac_word" >&5 +echo "configure:12264: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12320,14 +12307,14 @@ ### -------------------------------------------------------------------------- ### Check size of long_long - some guile's are broken. echo $ac_n "checking if guile long_long is at least as big as gint64""... $ac_c" 1>&6 -echo "configure:12324: checking if guile long_long is at least as big as gint64" >&5 +echo "configure:12311: checking if guile long_long is at least as big as gint64" >&5 GNC_OLDCFLAGS="$CFLAGS" CFLAGS="${GNOME_INCLUDEDIR} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}" if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -12337,12 +12324,12 @@ } EOF -if { (eval echo configure:12341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for scm_long_long2num in -lguile""... $ac_c" 1>&6 -echo "configure:12346: checking for scm_long_long2num in -lguile" >&5 +echo "configure:12333: checking for scm_long_long2num in -lguile" >&5 ac_lib_var=`echo guile'_'scm_long_long2num | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12350,7 +12337,7 @@ ac_save_LIBS="$LIBS" LIBS="-lguile $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12402,14 +12389,14 @@ # However, I'm sure we require this elsewhere, so don't remove this test # unless you've done sufficient code review/testing. echo $ac_n "checking if unsigned long is at least as big as guint32""... $ac_c" 1>&6 -echo "configure:12406: checking if unsigned long is at least as big as guint32" >&5 +echo "configure:12393: checking if unsigned long is at least as big as guint32" >&5 GNC_OLDCFLAGS="$CFLAGS" CFLAGS="${GNOME_INCLUDEDIR} ${GUILE_INCS} ${CFLAGS} ${GLIB_CFLAGS}" if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -12418,7 +12405,7 @@ } EOF -if { (eval echo configure:12422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -12437,6 +12424,134 @@ CFLAGS="$GNC_OLDCFLAGS" +###------------------------------------------------------------------------- +### Stuff from Mac OS X Port +###------------------------------------------------------------------------- + +for ac_func in strptime localtime_r pthread_mutex_init +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:12435: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:12463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + +if test "$ac_cv_func_strptime" = no ; then + STRPTIME_O="strptime.lo" + SCM_STRPTIME_O="scm_strptime.o" +fi + + + + +if test "$ac_cv_func_localtime_r" = no ; then + LOCALTIME_R_O="localtime_r.lo" +fi + + + +if test $am_cv_val_LC_MESSAGES = "no"; then + LC_MESSAGES_ENUM="LC_ALL" +else + LC_MESSAGES_ENUM="LC_MESSAGES" +fi + + +if test $am_cv_scanf_lld=no; then + echo $ac_n "checking if scanf supports %qd conversion""... $ac_c" 1>&6 +echo "configure:12511: checking if scanf supports %qd conversion" >&5 + if test "$cross_compiling" = yes; then + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +else + cat > conftest.$ac_ext < +#include + +int main () +{ + long long int d; + d = 0; + if ((sscanf ("10000000000", "%qd", &d) != 1) || (d != 10000000000)) + exit (1); + exit (0); +} + +EOF +if { (eval echo configure:12532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + cat >> confdefs.h <<\EOF +#define HAVE_SCANF_QD 1 +EOF + + echo "$ac_t""yes" 1>&6 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + + echo "$ac_t""no" 1>&6 + { echo "configure: error: cannot continue" 1>&2; exit 1; } + +fi +rm -fr conftest* +fi + +fi + +###---- ### -------------------------------------------------------------------------- ### Makefile creation @@ -12770,6 +12885,10 @@ s%@G_WRAP_COMPILE_ARGS@%$G_WRAP_COMPILE_ARGS%g s%@G_WRAP_LINK_ARGS@%$G_WRAP_LINK_ARGS%g s%@G_WRAP_MODULE_DIR@%$G_WRAP_MODULE_DIR%g +s%@SCM_STRPTIME_O@%$SCM_STRPTIME_O%g +s%@STRPTIME_O@%$STRPTIME_O%g +s%@LOCALTIME_R_O@%$LOCALTIME_R_O%g +s%@LC_MESSAGES_ENUM@%$LC_MESSAGES_ENUM%g CEOF EOF diff -Naur gnucash-1.6.8.orig/configure.in gnucash-1.6.8/configure.in --- gnucash-1.6.8.orig/configure.in Thu Aug 22 12:06:57 2002 +++ gnucash-1.6.8/configure.in Fri Aug 23 21:39:32 2002 @@ -625,6 +625,58 @@ ]) CFLAGS="$GNC_OLDCFLAGS" +###------------------------------------------------------------------------- +### Stuff from Mac OS X Port +###------------------------------------------------------------------------- + +AC_CHECK_FUNCS(strptime localtime_r pthread_mutex_init) + +if test "$ac_cv_func_strptime" = no ; then + STRPTIME_O="strptime.lo" + SCM_STRPTIME_O="scm_strptime.o" +fi + +AC_SUBST(SCM_STRPTIME_O) +AC_SUBST(STRPTIME_O) + +if test "$ac_cv_func_localtime_r" = no ; then + LOCALTIME_R_O="localtime_r.lo" +fi + +AC_SUBST(LOCALTIME_R_O) + +if test $am_cv_val_LC_MESSAGES = "no"; then + LC_MESSAGES_ENUM="LC_ALL" +else + LC_MESSAGES_ENUM="LC_MESSAGES" +fi +AC_SUBST(LC_MESSAGES_ENUM) + +if test $am_cv_scanf_lld=no; then + AC_MSG_CHECKING(if scanf supports %qd conversion) + AC_TRY_RUN([ +#include +#include + +int main () +{ + long long int d; + d = 0; + if ((sscanf ("10000000000", "%qd", &d) != 1) || (d != 10000000000)) + exit (1); + exit (0); +} +],[ + AC_DEFINE(HAVE_SCANF_QD, 1, + [Define if scanf supports %qd conversions.]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + AC_MSG_ERROR(cannot continue, no long long conversion support in scanf) + ]) +fi + +###---- ### -------------------------------------------------------------------------- ### Makefile creation diff -Naur gnucash-1.6.8.orig/debian/Makefile.in gnucash-1.6.8/debian/Makefile.in --- gnucash-1.6.8.orig/debian/Makefile.in Thu Aug 22 12:16:42 2002 +++ gnucash-1.6.8/debian/Makefile.in Sun Aug 25 01:31:10 2002 @@ -129,6 +129,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -137,6 +138,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -157,8 +159,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -167,32 +171,24 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -EXTRA_DIST = \ - README.debian \ - changelog \ - control \ - copyright \ - dirs \ - gnucash.menu \ - rules \ - postinst +EXTRA_DIST = README.debian changelog control copyright dirs gnucash.menu rules postinst mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = ChangeLog Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps debian/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu debian/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -205,6 +201,11 @@ subdir = debian distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu debian/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/doc/Makefile.in gnucash-1.6.8/doc/Makefile.in --- gnucash-1.6.8.orig/doc/Makefile.in Thu Aug 22 12:16:43 2002 +++ gnucash-1.6.8/doc/Makefile.in Sun Aug 25 01:31:11 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -168,34 +172,13 @@ SUBDIRS = examples html sgml -doc_DATA = \ - README.francais \ - README.german \ - guile-hackers.txt \ - projects.html - - -man_MANS = \ - gnc-prices.1 \ - gnucash.1 - - -EXTRA_DIST = \ - .cvsignore \ - ${doc_DATA} \ - Configure-osr5 \ - Configure-uw7 \ - RAW-NOTES \ - README.build-system \ - README.francais \ - README.german \ - README.translator.txt \ - build-aix.txt \ - build-solaris.txt \ - build-suse.txt \ - gnome-hackers.txt \ - gnc-prices.1 \ - gnucash.1 +doc_DATA = README.francais README.german guile-hackers.txt projects.html + + +man_MANS = gnc-prices.1 gnucash.1 + + +EXTRA_DIST = .cvsignore ${doc_DATA} Configure-osr5 Configure-uw7 RAW-NOTES README.build-system README.francais README.german README.translator.txt build-aix.txt build-solaris.txt build-suse.txt gnome-hackers.txt gnc-prices.1 gnucash.1 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@ -211,14 +194,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -375,6 +358,11 @@ subdir = doc distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/doc/examples/Makefile.in gnucash-1.6.8/doc/examples/Makefile.in --- gnucash-1.6.8.orig/doc/examples/Makefile.in Thu Aug 22 12:16:43 2002 +++ gnucash-1.6.8/doc/examples/Makefile.in Sun Aug 25 01:31:11 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,37 +170,10 @@ docdir = ${GNC_DOC_INSTALL_DIR}/examples -doc_DATA = \ - Money95bank_fr.qif \ - Money95invst_fr.qif \ - Money95mfunds_fr.qif \ - Money95stocks_fr.qif \ - README \ - abc-all.qif \ - abc.qif \ - bogus.qif \ - cbb-export.qif \ - currency.xac \ - currency_tree_xml.xac \ - every.qif \ - ms-money.qif \ - quicktest.qif \ - splitdemo.xac \ - swipe.qif \ - taxreport.xac \ - test.xac \ - test2.xac \ - test3.xac \ - test4.xac \ - trading.xac \ - trading2.xac \ - web.qif \ - xfer.xac - - -EXTRA_DIST = \ - .cvsignore \ - ${doc_DATA} +doc_DATA = Money95bank_fr.qif Money95invst_fr.qif Money95mfunds_fr.qif Money95stocks_fr.qif README abc-all.qif abc.qif bogus.qif cbb-export.qif currency.xac currency_tree_xml.xac every.qif ms-money.qif quicktest.qif splitdemo.xac swipe.qif taxreport.xac test.xac test2.xac test3.xac test4.xac trading.xac trading2.xac web.qif xfer.xac + + +EXTRA_DIST = .cvsignore ${doc_DATA} mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -208,14 +185,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/examples/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/examples/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -247,6 +224,11 @@ subdir = doc/examples distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/examples/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/doc/html/Makefile.in gnucash-1.6.8/doc/html/Makefile.in --- gnucash-1.6.8.orig/doc/html/Makefile.in Thu Aug 22 12:16:44 2002 +++ gnucash-1.6.8/doc/html/Makefile.in Sun Aug 25 01:31:11 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -168,14 +172,10 @@ SUBDIRS = fr -doc_DATA = \ - gnucash.css \ - index.html +doc_DATA = gnucash.css index.html -EXTRA_DIST = \ - .cvsignore \ - ${doc_DATA} +EXTRA_DIST = .cvsignore ${doc_DATA} mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -187,14 +187,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/html/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/html/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -312,6 +312,11 @@ subdir = doc/html distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/html/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/doc/html/fr/Makefile.in gnucash-1.6.8/doc/html/fr/Makefile.in --- gnucash-1.6.8.orig/doc/html/fr/Makefile.in Thu Aug 22 12:16:44 2002 +++ gnucash-1.6.8/doc/html/fr/Makefile.in Sun Aug 25 01:31:11 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -168,43 +172,10 @@ docdir = ${GNC_SHAREDIR}/html/fr -doc_DATA = \ - bofa-mym.html \ - projects.html \ - xacc-about.html \ - xacc-accountedit.html \ - xacc-acctypes.html \ - xacc-accwin.html \ - xacc-adjbwin.html \ - xacc-apar.html \ - xacc-apprdepr.html \ - xacc-bal_tracker.html \ - xacc-balsheet.html \ - xacc-currency.html \ - xacc-date.html \ - xacc-double.html \ - xacc-expense.html \ - xacc-globalprefs.html \ - xacc-gpl.html \ - xacc-gpl-fr.html \ - xacc-groups.html \ - xacc-main.html \ - xacc-mainwin.html \ - xacc-pnl.html \ - xacc-print.html \ - xacc-quicken.html \ - xacc-recnwin.html \ - xacc-regwin.html \ - xacc-reports.html \ - xacc-ticker.html \ - xacc-trans_report.html \ - xacc-y2k.html - - -EXTRA_DIST = \ - .cvsignore \ - tidy-up \ - ${doc_DATA} +doc_DATA = bofa-mym.html projects.html xacc-about.html xacc-accountedit.html xacc-acctypes.html xacc-accwin.html xacc-adjbwin.html xacc-apar.html xacc-apprdepr.html xacc-bal_tracker.html xacc-balsheet.html xacc-currency.html xacc-date.html xacc-double.html xacc-expense.html xacc-globalprefs.html xacc-gpl.html xacc-gpl-fr.html xacc-groups.html xacc-main.html xacc-mainwin.html xacc-pnl.html xacc-print.html xacc-quicken.html xacc-recnwin.html xacc-regwin.html xacc-reports.html xacc-ticker.html xacc-trans_report.html xacc-y2k.html + + +EXTRA_DIST = .cvsignore tidy-up ${doc_DATA} mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -216,14 +187,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/html/fr/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/html/fr/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -341,6 +312,11 @@ subdir = doc/html/fr distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/html/fr/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/doc/html/fr/image/Makefile.in gnucash-1.6.8/doc/html/fr/image/Makefile.in --- gnucash-1.6.8.orig/doc/html/fr/image/Makefile.in Thu Aug 22 12:16:44 2002 +++ gnucash-1.6.8/doc/html/fr/image/Makefile.in Sun Aug 25 01:31:11 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,38 +170,10 @@ docdir = ${GNC_SHAREDIR}/html/fr/image -doc_DATA = \ - appr-asset1.gif \ - appr-asset2.gif \ - appr-income.gif \ - appr-main1.gif \ - appr-main2.gif \ - contract.gif \ - depr-asset.gif \ - depr-main.gif \ - expand.gif \ - foliowin-single.gif \ - foliowin.gif \ - newaccwin-code.gif \ - newaccwin-trade.gif \ - newaccwin.gif \ - recnwin.gif \ - regwin-double.gif \ - regwin-multi.gif \ - regwin-single.gif \ - regwin-single2.gif \ - regwin.gif \ - report-baln.gif \ - report-folio.gif \ - report-option.gif \ - reportwin.gif \ - ticker-a.gif \ - ticker-b.gif - - -EXTRA_DIST = \ - .cvsignore \ - ${doc_DATA} +doc_DATA = appr-asset1.gif appr-asset2.gif appr-income.gif appr-main1.gif appr-main2.gif contract.gif depr-asset.gif depr-main.gif expand.gif foliowin-single.gif foliowin.gif newaccwin-code.gif newaccwin-trade.gif newaccwin.gif recnwin.gif regwin-double.gif regwin-multi.gif regwin-single.gif regwin-single2.gif regwin.gif report-baln.gif report-folio.gif report-option.gif reportwin.gif ticker-a.gif ticker-b.gif + + +EXTRA_DIST = .cvsignore ${doc_DATA} mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../../config.h @@ -209,14 +185,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/html/fr/image/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/html/fr/image/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -248,6 +224,11 @@ subdir = doc/html/fr/image distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/html/fr/image/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/doc/sgml/C/Makefile.in gnucash-1.6.8/doc/sgml/C/Makefile.in --- gnucash-1.6.8.orig/doc/sgml/C/Makefile.in Thu Aug 22 12:16:45 2002 +++ gnucash-1.6.8/doc/sgml/C/Makefile.in Sun Aug 25 01:31:12 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -168,80 +172,15 @@ gnucash_helpdir = $(GNC_HELPDIR)/C -GNUCASH_SGML_FILES = \ - bofa-mym.sgml \ - gnucash.sgml \ - xacc-about.sgml \ - xacc-accountedit.sgml \ - xacc-acctypes.sgml \ - xacc-account-hierarchy-creator.sgml \ - xacc-account-summary.sgml \ - xacc-apar.sgml \ - xacc-asset-liability-barcharts.sgml \ - xacc-asset-liability-piecharts.sgml \ - xacc-balancereport.sgml \ - xacc-balancesheet.sgml \ - xacc-calculator.sgml \ - xacc-chartofaccts.sgml \ - xacc-commodity.sgml \ - xacc-common-report-options.sgml \ - xacc-currencyhandling.sgml \ - xacc-dateinput.sgml \ - xacc-depreciation.sgml \ - xacc-dochack.sgml \ - xacc-doubleentry.sgml \ - xacc-euro.sgml \ - xacc-features.sgml \ - xacc-file-operations.sgml \ - xacc-gnome-mdi.sgml \ - xacc-gnucash-web-browser.sgml \ - xacc-gpl.sgml \ - xacc-incomeexpense.sgml \ - xacc-income-expense-barcharts.sgml \ - xacc-income-expense-piecharts.sgml \ - xacc-locatingtxns.sgml \ - xacc-mainwin.sgml \ - xacc-multicolumn-view-reports.sgml \ - xacc-net-worth-barchart.sgml \ - xacc-newacctwin.sgml \ - xacc-pnl.sgml \ - xacc-portfolio-report.sgml \ - xacc-price-editor.sgml \ - xacc-price-sources.sgml \ - xacc-preferences.sgml \ - xacc-print-check.sgml \ - xacc-print.sgml \ - xacc-qif-import.sgml \ - xacc-quicken.sgml \ - xacc-quickstart.sgml \ - xacc-recnwin.sgml \ - xacc-regwin-kbd.sgml \ - xacc-regwin.sgml \ - xacc-repdev.sgml \ - xacc-reports.sgml \ - xacc-scheme.sgml \ - xacc-stock-price-report.sgml \ - xacc-tax-report.sgml \ - xacc-toplevel.sgml \ - xacc-trans-report.sgml \ - xacc-txf-categories.sgml \ - xacc-txf-export.sgml \ - xacc-txf-export-anomalies.sgml \ - xacc-userdocs.sgml \ - xacc-whats-new.sgml \ - xacc-y2k.sgml +GNUCASH_SGML_FILES = bofa-mym.sgml gnucash.sgml xacc-about.sgml xacc-accountedit.sgml xacc-acctypes.sgml xacc-account-hierarchy-creator.sgml xacc-account-summary.sgml xacc-apar.sgml xacc-asset-liability-barcharts.sgml xacc-asset-liability-piecharts.sgml xacc-balancereport.sgml xacc-balancesheet.sgml xacc-calculator.sgml xacc-chartofaccts.sgml xacc-commodity.sgml xacc-common-report-options.sgml xacc-currencyhandling.sgml xacc-dateinput.sgml xacc-depreciation.sgml xacc-dochack.sgml xacc-doubleentry.sgml xacc-euro.sgml xacc-features.sgml xacc-file-operations.sgml xacc-gnome-mdi.sgml xacc-gnucash-web-browser.sgml xacc-gpl.sgml xacc-incomeexpense.sgml xacc-income-expense-barcharts.sgml xacc-income-expense-piecharts.sgml xacc-locatingtxns.sgml xacc-mainwin.sgml xacc-multicolumn-view-reports.sgml xacc-net-worth-barchart.sgml xacc-newacctwin.sgml xacc-pnl.sgml xacc-portfolio-report.sgml xacc-price-editor.sgml xacc-price-sources.sgml xacc-preferences.sgml xacc-print-check.sgml xacc-print.sgml xacc-qif-import.sgml xacc-quicken.sgml xacc-quickstart.sgml xacc-recnwin.sgml xacc-regwin-kbd.sgml xacc-regwin.sgml xacc-repdev.sgml xacc-reports.sgml xacc-scheme.sgml xacc-stock-price-report.sgml xacc-tax-report.sgml xacc-toplevel.sgml xacc-trans-report.sgml xacc-txf-categories.sgml xacc-txf-export.sgml xacc-txf-export-anomalies.sgml xacc-userdocs.sgml xacc-whats-new.sgml xacc-y2k.sgml gnucash_html_dir = $(top_srcdir)/doc/html/C -GNUCASH_HTML_FILES = \ - $(gnucash_html_dir)/xacc-tax-report-example.html +GNUCASH_HTML_FILES = $(gnucash_html_dir)/xacc-tax-report-example.html -EXTRA_DIST = \ - $(GNUCASH_SGML_FILES) \ - $(GNUCASH_HTML_FILES) \ - topic.dat +EXTRA_DIST = $(GNUCASH_SGML_FILES) $(GNUCASH_HTML_FILES) topic.dat mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -251,14 +190,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/sgml/C/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sgml/C/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -357,6 +296,11 @@ subdir = doc/sgml/C distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/sgml/C/Makefile $(mkinstalldirs) $(distdir)/$(gnucash_html_dir) @for file in $(DISTFILES); do \ d=$(srcdir); \ diff -Naur gnucash-1.6.8.orig/doc/sgml/C/image/Makefile.in gnucash-1.6.8/doc/sgml/C/image/Makefile.in --- gnucash-1.6.8.orig/doc/sgml/C/image/Makefile.in Thu Aug 22 12:16:46 2002 +++ gnucash-1.6.8/doc/sgml/C/image/Makefile.in Sun Aug 25 01:31:12 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,68 +170,10 @@ imagedir = ${GNC_HELPDIR}/C/image -image_DATA = \ - appr-asset1.png \ - appr-asset2.png \ - appr-main1.png \ - appr-main2.png \ - asset-barchart.png \ - asset-piechart.png \ - autosplitledger.png \ - basicledger.png \ - basicledger-transfer.png \ - contract.png \ - depr-asset.png \ - depr-main.png \ - editaccount.png \ - expand.png \ - financial-calculator.png \ - foliowin-single.png \ - foliowin.png \ - foreign-currency.png \ - general-ledger.png \ - income-barchart.png \ - income-piechart.png \ - logo-NetBSD-banner.png \ - logo-debian.png \ - logo-linux.png \ - mdi-notebook.png \ - mdi-onewindow.png \ - mdi-toplevel.png \ - menu-and-toolbar.png \ - newaccwin-code.png \ - newaccwin-trade.png \ - new-user-frame1.png \ - new-user-frame2.png \ - new-user-frame3.png \ - new-user-frame4.png \ - new-user-frame5.png \ - prefs-general.png \ - prefs-international.png \ - prefs-network.png \ - prefs-qif-import.png \ - prefs-reconcile.png \ - prefs-register-colors.png \ - prefs-register.png \ - prefs-user-info.png \ - pricedb.png \ - recnwin.png \ - recninfo.png \ - report-av-baln.png \ - report-baln.png \ - report-folio.png \ - report-option.png \ - report-pnl.png \ - report-tax.png \ - report-tax-options.png \ - reportwin.png \ - tax-info-dialog.png \ - transactionjrnl.png - - -EXTRA_DIST = \ - .cvsignore \ - ${image_DATA} +image_DATA = appr-asset1.png appr-asset2.png appr-main1.png appr-main2.png asset-barchart.png asset-piechart.png autosplitledger.png basicledger.png basicledger-transfer.png contract.png depr-asset.png depr-main.png editaccount.png expand.png financial-calculator.png foliowin-single.png foliowin.png foreign-currency.png general-ledger.png income-barchart.png income-piechart.png logo-NetBSD-banner.png logo-debian.png logo-linux.png mdi-notebook.png mdi-onewindow.png mdi-toplevel.png menu-and-toolbar.png newaccwin-code.png newaccwin-trade.png new-user-frame1.png new-user-frame2.png new-user-frame3.png new-user-frame4.png new-user-frame5.png prefs-general.png prefs-international.png prefs-network.png prefs-qif-import.png prefs-reconcile.png prefs-register-colors.png prefs-register.png prefs-user-info.png pricedb.png recnwin.png recninfo.png report-av-baln.png report-baln.png report-folio.png report-option.png report-pnl.png report-tax.png report-tax-options.png reportwin.png tax-info-dialog.png transactionjrnl.png + + +EXTRA_DIST = .cvsignore ${image_DATA} mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../../config.h @@ -239,14 +185,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/sgml/C/image/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sgml/C/image/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -278,6 +224,11 @@ subdir = doc/sgml/C/image distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/sgml/C/image/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/doc/sgml/Makefile.in gnucash-1.6.8/doc/sgml/Makefile.in --- gnucash-1.6.8.orig/doc/sgml/Makefile.in Thu Aug 22 12:16:45 2002 +++ gnucash-1.6.8/doc/sgml/Makefile.in Sun Aug 25 01:31:11 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,8 +170,7 @@ SUBDIRS = C de_DE es pt_PT -EXTRA_DIST = \ - .cvsignore +EXTRA_DIST = .cvsignore mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -177,14 +180,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/sgml/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sgml/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -283,6 +286,11 @@ subdir = doc/sgml distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/sgml/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/doc/sgml/de_DE/Makefile.in gnucash-1.6.8/doc/sgml/de_DE/Makefile.in --- gnucash-1.6.8.orig/doc/sgml/de_DE/Makefile.in Thu Aug 22 12:16:51 2002 +++ gnucash-1.6.8/doc/sgml/de_DE/Makefile.in Sun Aug 25 01:31:12 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,24 +170,15 @@ gnucash_helpdir = $(GNC_HELPDIR)/de_DE -GNUCASH_SGML_FILES = \ - gnucash.sgml \ - xacc-about.sgml \ - xacc-features.sgml \ - xacc-quickstart.sgml \ - xacc-whats-new.sgml +GNUCASH_SGML_FILES = gnucash.sgml xacc-about.sgml xacc-features.sgml xacc-quickstart.sgml xacc-whats-new.sgml gnucash_html_dir = $(top_srcdir)/doc/html/C -GNUCASH_HTML_FILES = \ - $(gnucash_html_dir)/xacc-tax-report-example.html +GNUCASH_HTML_FILES = $(gnucash_html_dir)/xacc-tax-report-example.html -EXTRA_DIST = \ - $(GNUCASH_SGML_FILES) \ - $(GNUCASH_HTML_FILES) \ - topic.dat +EXTRA_DIST = $(GNUCASH_SGML_FILES) $(GNUCASH_HTML_FILES) topic.dat mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -193,14 +188,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/sgml/de_DE/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sgml/de_DE/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -213,6 +208,11 @@ subdir = doc/sgml/de_DE distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/sgml/de_DE/Makefile $(mkinstalldirs) $(distdir)/$(gnucash_html_dir) @for file in $(DISTFILES); do \ d=$(srcdir); \ diff -Naur gnucash-1.6.8.orig/doc/sgml/es/Makefile.in gnucash-1.6.8/doc/sgml/es/Makefile.in --- gnucash-1.6.8.orig/doc/sgml/es/Makefile.in Thu Aug 22 12:16:56 2002 +++ gnucash-1.6.8/doc/sgml/es/Makefile.in Sun Aug 25 01:31:12 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,62 +170,15 @@ gnucash_helpdir = $(GNC_HELPDIR)/es -GNUCASH_SGML_FILES = \ - bofa-mym.sgml \ - gnucash.sgml \ - gpl-es.sgml \ - traduccion.sgml \ - xacc-about.sgml \ - xacc-accountedit.sgml \ - xacc-acctypes.sgml \ - xacc-adjbalwin.sgml \ - xacc-apar.sgml \ - xacc-balancereport.sgml \ - xacc-balancesheet.sgml \ - xacc-chartofaccts.sgml \ - xacc-commodity.sgml \ - xacc-currencyhandling.sgml \ - xacc-dateinput.sgml \ - xacc-depreciation.sgml \ - xacc-dochack.sgml \ - xacc-doubleentry.sgml \ - xacc-euro.sgml \ - xacc-gpl.sgml \ - xacc-incomeexpense.sgml \ - xacc-locatingtxns.sgml \ - xacc-mainwin.sgml \ - xacc-newacctwin.sgml \ - xacc-pnl.sgml \ - xacc-portfolio-report.sgml \ - xacc-preferences.sgml \ - xacc-print-check.sgml \ - xacc-print.sgml \ - xacc-qif-import.sgml \ - xacc-quicken.sgml \ - xacc-recnwin.sgml \ - xacc-regwin-kbd.sgml \ - xacc-regwin.sgml \ - xacc-reports.sgml \ - xacc-tax-report.sgml \ - xacc-ticker.sgml \ - xacc-trans-report.sgml \ - xacc-txf-categories.sgml \ - xacc-txf-export-anomalies.sgml \ - xacc-txf-export.sgml \ - xacc-userdocs.sgml \ - xacc-y2k.sgml +GNUCASH_SGML_FILES = bofa-mym.sgml gnucash.sgml gpl-es.sgml traduccion.sgml xacc-about.sgml xacc-accountedit.sgml xacc-acctypes.sgml xacc-adjbalwin.sgml xacc-apar.sgml xacc-balancereport.sgml xacc-balancesheet.sgml xacc-chartofaccts.sgml xacc-commodity.sgml xacc-currencyhandling.sgml xacc-dateinput.sgml xacc-depreciation.sgml xacc-dochack.sgml xacc-doubleentry.sgml xacc-euro.sgml xacc-gpl.sgml xacc-incomeexpense.sgml xacc-locatingtxns.sgml xacc-mainwin.sgml xacc-newacctwin.sgml xacc-pnl.sgml xacc-portfolio-report.sgml xacc-preferences.sgml xacc-print-check.sgml xacc-print.sgml xacc-qif-import.sgml xacc-quicken.sgml xacc-recnwin.sgml xacc-regwin-kbd.sgml xacc-regwin.sgml xacc-reports.sgml xacc-tax-report.sgml xacc-ticker.sgml xacc-trans-report.sgml xacc-txf-categories.sgml xacc-txf-export-anomalies.sgml xacc-txf-export.sgml xacc-userdocs.sgml xacc-y2k.sgml gnucash_html_dir = $(top_srcdir)/doc/html/C -GNUCASH_HTML_FILES = \ - $(gnucash_html_dir)/xacc-tax-report-example.html +GNUCASH_HTML_FILES = $(gnucash_html_dir)/xacc-tax-report-example.html -EXTRA_DIST = \ - $(GNUCASH_SGML_FILES) \ - $(GNUCASH_HTML_FILES) \ - topic.dat +EXTRA_DIST = $(GNUCASH_SGML_FILES) $(GNUCASH_HTML_FILES) topic.dat mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -231,14 +188,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/sgml/es/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sgml/es/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -251,6 +208,11 @@ subdir = doc/sgml/es distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/sgml/es/Makefile $(mkinstalldirs) $(distdir)/$(gnucash_html_dir) @for file in $(DISTFILES); do \ d=$(srcdir); \ diff -Naur gnucash-1.6.8.orig/doc/sgml/pt_PT/Makefile.in gnucash-1.6.8/doc/sgml/pt_PT/Makefile.in --- gnucash-1.6.8.orig/doc/sgml/pt_PT/Makefile.in Thu Aug 22 12:17:00 2002 +++ gnucash-1.6.8/doc/sgml/pt_PT/Makefile.in Sun Aug 25 01:31:12 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,81 +170,15 @@ gnucash_helpdir = $(GNC_HELPDIR)/pt_PT -GNUCASH_SGML_FILES = \ - bofa-mym.sgml \ - xacc-about.sgml \ - xacc-account-hierarchy-creator.sgml \ - xacc-accountedit.sgml \ - xacc-acctypes.sgml \ - xacc-apar.sgml \ - xacc-balancereport.sgml \ - xacc-balancesheet.sgml \ - xacc-calculator.sgml \ - xacc-chartofaccts.sgml \ - xacc-commodity.sgml \ - xacc-currencyhandling.sgml \ - xacc-dateinput.sgml \ - xacc-depreciation.sgml \ - xacc-doubleentry.sgml \ - xacc-euro.sgml \ - xacc-features.sgml \ - xacc-file-operations.sgml \ - xacc-gpl.sgml \ - xacc-incomeexpense.sgml \ - xacc-locatingtxns.sgml \ - xacc-mainwin.sgml \ - xacc-newacctwin.sgml \ - xacc-pnl.sgml \ - xacc-portfolio-report.sgml \ - xacc-preferences.sgml \ - xacc-price-editor.sgml \ - xacc-price-sources.sgml \ - xacc-print-check.sgml \ - xacc-print.sgml \ - xacc-qif-import.sgml \ - xacc-quicken.sgml \ - xacc-quickstart.sgml \ - xacc-recnwin.sgml \ - xacc-regwin-kbd.sgml \ - xacc-regwin.sgml \ - xacc-reports.sgml \ - xacc-tax-report.sgml \ - xacc-ticker.sgml \ - xacc-toplevel.sgml \ - xacc-trans-report.sgml \ - xacc-txf-export-anomalies.sgml \ - xacc-txf-export.sgml \ - xacc-userdocs.sgml \ - gnucash.sgml \ - xacc-account-summary.sgml \ - xacc-asset-liability-barcharts.sgml \ - xacc-asset-liability-piecharts.sgml \ - xacc-common-report-options.sgml \ - xacc-dochack.sgml \ - xacc-gnome-mdi.sgml \ - xacc-gnucash-web-browser.sgml \ - xacc-income-expense-barcharts.sgml \ - xacc-income-expense-piecharts.sgml \ - xacc-multicolumn-view-reports.sgml \ - xacc-net-worth-barchart.sgml \ - xacc-repdev.sgml \ - xacc-scheme.sgml \ - xacc-stock-price-report.sgml \ - xacc-txf-categories.sgml \ - xacc-whats-new.sgml \ - xacc-y2k.sgml +GNUCASH_SGML_FILES = bofa-mym.sgml xacc-about.sgml xacc-account-hierarchy-creator.sgml xacc-accountedit.sgml xacc-acctypes.sgml xacc-apar.sgml xacc-balancereport.sgml xacc-balancesheet.sgml xacc-calculator.sgml xacc-chartofaccts.sgml xacc-commodity.sgml xacc-currencyhandling.sgml xacc-dateinput.sgml xacc-depreciation.sgml xacc-doubleentry.sgml xacc-euro.sgml xacc-features.sgml xacc-file-operations.sgml xacc-gpl.sgml xacc-incomeexpense.sgml xacc-locatingtxns.sgml xacc-mainwin.sgml xacc-newacctwin.sgml xacc-pnl.sgml xacc-portfolio-report.sgml xacc-preferences.sgml xacc-price-editor.sgml xacc-price-sources.sgml xacc-print-check.sgml xacc-print.sgml xacc-qif-import.sgml xacc-quicken.sgml xacc-quickstart.sgml xacc-recnwin.sgml xacc-regwin-kbd.sgml xacc-regwin.sgml xacc-reports.sgml xacc-tax-report.sgml xacc-ticker.sgml xacc-toplevel.sgml xacc-trans-report.sgml xacc-txf-export-anomalies.sgml xacc-txf-export.sgml xacc-userdocs.sgml gnucash.sgml xacc-account-summary.sgml xacc-asset-liability-barcharts.sgml xacc-asset-liability-piecharts.sgml xacc-common-report-options.sgml xacc-dochack.sgml xacc-gnome-mdi.sgml xacc-gnucash-web-browser.sgml xacc-income-expense-barcharts.sgml xacc-income-expense-piecharts.sgml xacc-multicolumn-view-reports.sgml xacc-net-worth-barchart.sgml xacc-repdev.sgml xacc-scheme.sgml xacc-stock-price-report.sgml xacc-txf-categories.sgml xacc-whats-new.sgml xacc-y2k.sgml gnucash_html_dir = $(top_srcdir)/doc/html/C -GNUCASH_HTML_FILES = \ - $(gnucash_html_dir)/xacc-tax-report-example.html +GNUCASH_HTML_FILES = $(gnucash_html_dir)/xacc-tax-report-example.html -EXTRA_DIST = \ - $(GNUCASH_SGML_FILES) \ - $(GNUCASH_HTML_FILES) \ - topic.dat +EXTRA_DIST = $(GNUCASH_SGML_FILES) $(GNUCASH_HTML_FILES) topic.dat mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -250,14 +188,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/sgml/pt_PT/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sgml/pt_PT/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -270,6 +208,11 @@ subdir = doc/sgml/pt_PT distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/sgml/pt_PT/Makefile $(mkinstalldirs) $(distdir)/$(gnucash_html_dir) @for file in $(DISTFILES); do \ d=$(srcdir); \ diff -Naur gnucash-1.6.8.orig/doc-tools/Makefile.in gnucash-1.6.8/doc-tools/Makefile.in --- gnucash-1.6.8.orig/doc-tools/Makefile.in Thu Aug 22 12:16:42 2002 +++ gnucash-1.6.8/doc-tools/Makefile.in Sun Aug 25 01:31:12 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,18 +170,13 @@ noinst_PROGRAMS = dbadd -LDADD = \ - ${DB_LIBS} \ - ${INTLLIBS} +LDADD = ${DB_LIBS} ${INTLLIBS} -dbadd_SOURCES = \ - dbadd.c +dbadd_SOURCES = dbadd.c -EXTRA_DIST = \ - .cvsignore \ - build-help-index.in +EXTRA_DIST = .cvsignore build-help-index.in noinst_DATA = build-help-index @@ -210,8 +209,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best +DEP_FILES = .deps/dbadd.P SOURCES = $(dbadd_SOURCES) OBJECTS = $(dbadd_OBJECTS) @@ -219,9 +219,9 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc-tools/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc-tools/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -235,9 +235,6 @@ maintainer-clean-noinstPROGRAMS: -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -260,9 +257,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -317,6 +311,11 @@ subdir = doc-tools distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc-tools/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -327,8 +326,38 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -dbadd.o: dbadd.c ../config.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -366,27 +395,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-noinstPROGRAMS distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -397,12 +426,14 @@ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean build-help-index: build-help-index.in diff -Naur gnucash-1.6.8.orig/lib/Makefile.in gnucash-1.6.8/lib/Makefile.in --- gnucash-1.6.8.orig/lib/Makefile.in Thu Aug 22 12:17:05 2002 +++ gnucash-1.6.8/lib/Makefile.in Sun Aug 25 01:31:12 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,8 +170,7 @@ SUBDIRS = guile-www srfi -EXTRA_DIST = \ - README +EXTRA_DIST = README mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@ -177,14 +180,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -283,6 +286,11 @@ subdir = lib distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/lib/guile-www/Makefile.in gnucash-1.6.8/lib/guile-www/Makefile.in --- gnucash-1.6.8.orig/lib/guile-www/Makefile.in Thu Aug 22 12:17:06 2002 +++ gnucash-1.6.8/lib/guile-www/Makefile.in Sun Aug 25 01:31:12 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -178,14 +182,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/guile-www/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/guile-www/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -217,6 +221,11 @@ subdir = lib/guile-www distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/guile-www/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/lib/srfi/Makefile.in gnucash-1.6.8/lib/srfi/Makefile.in --- gnucash-1.6.8.orig/lib/srfi/Makefile.in Thu Aug 22 12:17:06 2002 +++ gnucash-1.6.8/lib/srfi/Makefile.in Sun Aug 25 01:31:13 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,13 +170,7 @@ gncscmdir = ${GNC_SHAREDIR}/guile-modules/srfi -gncscm_DATA = \ - srfi-1.scm \ - srfi-2.scm \ - srfi-8.scm \ - srfi-9.scm \ - srfi-11.scm \ - srfi-19.scm +gncscm_DATA = srfi-1.scm srfi-2.scm srfi-8.scm srfi-9.scm srfi-11.scm srfi-19.scm EXTRA_DIST = README .cvsignore ${gncscm_DATA} @@ -186,14 +184,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/srfi/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/srfi/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -225,6 +223,11 @@ subdir = lib/srfi distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/srfi/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/ltmain.sh gnucash-1.6.8/ltmain.sh --- gnucash-1.6.8.orig/ltmain.sh Thu Aug 22 12:06:59 2002 +++ gnucash-1.6.8/ltmain.sh Sun Aug 25 00:30:28 2002 @@ -55,8 +55,8 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.4.2 -TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)" +VERSION=1.4 +TIMESTAMP=" (1.920 2001/04/24 23:26:18)" default_mode= help="Try \`$progname --help' for more information." @@ -84,9 +84,6 @@ save_LANG="$LANG"; LANG=C; export LANG fi -# Make sure IFS has a sensible default -: ${IFS=" "} - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then echo "$modename: not configured to build any kind of library" 1>&2 echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 @@ -205,11 +202,6 @@ exit 1 fi -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - if test -z "$show_help"; then # Infer the operation mode. @@ -337,7 +329,7 @@ -Wc,*) args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` lastarg= - save_ifs="$IFS"; IFS=',' + IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" @@ -623,10 +615,6 @@ # Now arrange that obj and lo_libobj become the same file $show "(cd $xdir && $LN_S $baseobj $libobj)" if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - $run $rm "$lockfile" - fi exit 0 else error=$? @@ -1043,17 +1031,6 @@ # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; esac fi deplibs="$deplibs $arg" @@ -1145,7 +1122,7 @@ -Wc,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` arg= - save_ifs="$IFS"; IFS=',' + IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in @@ -1163,7 +1140,7 @@ -Wl,*) args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` arg= - save_ifs="$IFS"; IFS=',' + IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' for flag in $args; do IFS="$save_ifs" case $flag in @@ -1303,11 +1280,11 @@ output_objdir="$output_objdir/$objdir" fi # Create the object directory. - if test ! -d "$output_objdir"; then + if test ! -d $output_objdir; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then + if test $status -ne 0 && test ! -d $output_objdir; then exit $status fi fi @@ -1501,7 +1478,7 @@ continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : + if test $found = yes || test -f "$lib"; then : else $echo "$modename: cannot find the library \`$lib'" 1>&2 exit 1 @@ -1673,7 +1650,7 @@ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if test $linkalldeplibs = yes; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths @@ -1773,7 +1750,7 @@ if test -f "$output_objdir/$soname-def"; then : else $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' eval cmds=\"$extract_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" @@ -1786,7 +1763,7 @@ # Create $newlib if test -f "$output_objdir/$newlib"; then :; else $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' eval cmds=\"$old_archive_from_expsyms_cmds\" for cmd in $cmds; do IFS="$save_ifs" @@ -1798,7 +1775,7 @@ # make sure the library variables are pointing to the new library dir=$output_objdir linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" + fi # test -n $old_archive_from_expsyms_cmds if test "$linkmode" = prog || test "$mode" != relink; then add_shlibpath= @@ -1934,17 +1911,17 @@ echo "*** Therefore, libtool will create a static module, that should work " echo "*** as long as the dlopening application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes + build_libtool_libs=module + build_old_libs=yes else - build_libtool_libs=no + build_libtool_libs=no fi fi else @@ -1957,8 +1934,8 @@ if test "$linkmode" = lib; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test "$hardcode_into_libs" != yes || test $build_old_libs = yes || + test $link_static = yes; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -2173,7 +2150,7 @@ fi set dummy $rpath - if test "$#" -gt 2; then + if test $# -gt 2; then $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 fi install_libdir="$2" @@ -2198,7 +2175,7 @@ else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' set dummy $vinfo 0 0 0 IFS="$save_ifs" @@ -2214,7 +2191,7 @@ # Check that each of the things are valid numbers. case $current in - [0-9]*) ;; + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2223,7 +2200,7 @@ esac case $revision in - [0-9]*) ;; + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2232,7 +2209,7 @@ esac case $age in - [0-9]*) ;; + 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2240,7 +2217,7 @@ ;; esac - if test "$age" -gt "$current"; then + if test $age -gt $current; then $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit 1 @@ -2279,7 +2256,7 @@ # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test $loop != 0; do iface=`expr $revision - $loop` loop=`expr $loop - 1` verstring="sgi$major.$iface:$verstring" @@ -2302,7 +2279,7 @@ # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test $loop != 0; do iface=`expr $current - $loop` loop=`expr $loop - 1` verstring="$verstring:${iface}.0" @@ -2335,16 +2312,6 @@ if test -z "$vinfo" && test -n "$release"; then major= verstring="0.0" - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring="" - ;; - *) - verstring="0.0" - ;; - esac if test "$need_version" = no; then versuffix= else @@ -2403,7 +2370,7 @@ *) finalize_rpath="$finalize_rpath $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test $hardcode_into_libs != yes || test $build_old_libs = yes; then dependency_libs="$temp_xrpath $dependency_libs" fi fi @@ -2441,9 +2408,6 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - ;; *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then @@ -2487,7 +2451,7 @@ EOF $rm conftest $CC -o conftest conftest.c $deplibs - if test "$?" -eq 0 ; then + if test $? -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" @@ -2521,7 +2485,7 @@ $rm conftest $CC -o conftest conftest.c $i # Did it work? - if test "$?" -eq 0 ; then + if test $? -eq 0 ; then ldd_output=`ldd conftest` libname=`eval \\$echo \"$libname_spec\"` deplib_matches=`eval \\$echo \"$library_names_spec\"` @@ -2692,7 +2656,7 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test $allow_undefined = no; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" @@ -2820,7 +2784,7 @@ export_symbols="$output_objdir/$libname.exp" $run $rm $export_symbols eval cmds=\"$export_symbols_cmds\" - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -2850,7 +2814,7 @@ $show "mkdir $gentop" $run mkdir "$gentop" status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then + if test $status -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" @@ -2869,7 +2833,7 @@ $show "mkdir $xdir" $run mkdir "$xdir" status=$? - if test "$status" -ne 0 && test ! -d "$xdir"; then + if test $status -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" @@ -2896,7 +2860,7 @@ else eval cmds=\"$archive_cmds\" fi - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -2989,7 +2953,7 @@ $show "mkdir $gentop" $run mkdir "$gentop" status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then + if test $status -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" @@ -3008,7 +2972,7 @@ $show "mkdir $xdir" $run mkdir "$xdir" status=$? - if test "$status" -ne 0 && test ! -d "$xdir"; then + if test $status -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" @@ -3024,7 +2988,7 @@ output="$obj" eval cmds=\"$reload_cmds\" - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -3060,7 +3024,7 @@ reload_objs="$libobjs $reload_conv_objs" output="$libobj" eval cmds=\"$reload_cmds\" - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -3323,25 +3287,27 @@ #undef lt_preloaded_symbols #if defined (__STDC__) && __STDC__ -# define lt_ptr void * +# define lt_ptr_t void * #else -# define lt_ptr char * +# define lt_ptr_t char * # define const #endif /* The mapping between symbol names and symbols. */ const struct { const char *name; - lt_ptr address; + lt_ptr_t address; } lt_preloaded_symbols[] = {\ " - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" + sed -n -e 's/^: \([^ ]*\) $/ {\"\1\", (lt_ptr_t) 0},/p' \ + -e 's/^. \([^ ]*\) \([^ ]*\)$/ {"\2", (lt_ptr_t) \&\2},/p' \ + < "$nlist" >> "$output_objdir/$dlsyms" $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr) 0} + {0, (lt_ptr_t) 0} }; /* This works around a problem in FreeBSD linker */ @@ -3403,7 +3369,7 @@ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + if test $need_relink = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" @@ -3528,7 +3494,7 @@ relink_command="$var=\"$var_value\"; export $var; $relink_command" fi done - relink_command="(cd `pwd`; $relink_command)" + relink_command="cd `pwd`; $relink_command" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi @@ -3652,9 +3618,8 @@ # relink executable if necessary if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : + if (eval \$relink_command); then : else - $echo \"\$relink_command_output\" >&2 $rm \"\$progdir/\$file\" exit 1 fi @@ -3771,7 +3736,7 @@ $show "mkdir $gentop" $run mkdir "$gentop" status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then + if test $status -ne 0 && test ! -d "$gentop"; then exit $status fi generated="$generated $gentop" @@ -3791,7 +3756,7 @@ $show "mkdir $xdir" $run mkdir "$xdir" status=$? - if test "$status" -ne 0 && test ! -d "$xdir"; then + if test $status -ne 0 && test ! -d "$xdir"; then exit $status fi $show "(cd $xdir && $AR x $xabs)" @@ -3825,7 +3790,7 @@ eval cmds=\"$old_archive_cmds\" fi - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -3858,7 +3823,7 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" + relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. @@ -3948,7 +3913,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test "$installed" = no && test $need_relink = yes; then $echo >> $output "\ relink_command=\"$relink_command\"" fi @@ -4084,7 +4049,7 @@ # Not a directory, so check to see that there is only one file specified. set dummy $files - if test "$#" -gt 2; then + if test $# -gt 2; then $echo "$modename: \`$dest' is not a directory" 1>&2 $echo "$help" 1>&2 exit 1 @@ -4186,7 +4151,7 @@ $run eval "$striplib $destdir/$realname" || exit $? fi - if test "$#" -gt 0; then + if test $# -gt 0; then # Delete the old symlinks, and create new ones. for linkname do @@ -4200,7 +4165,7 @@ # Do each command in the postinstall commands. lib="$destdir/$realname" eval cmds=\"$postinstall_cmds\" - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -4319,11 +4284,7 @@ if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" - tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` - if test $? = 0 ; then : - else - tmpdir="$tmpdir/libtool-$$" - fi + tmpdir="$tmpdir/libtool-$$" if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : else $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 @@ -4391,7 +4352,7 @@ # Do each command in the postinstall commands. eval cmds=\"$old_postinstall_cmds\" - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -4407,10 +4368,11 @@ if test -n "$current_libdirs"; then # Maybe just do a dry run. test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $0 --finish$current_libdirs' - else - exit 0 + exec $SHELL $0 --finish$current_libdirs + exit 1 fi + + exit 0 ;; # libtool finish mode @@ -4429,7 +4391,7 @@ if test -n "$finish_cmds"; then # Do each command in the finish commands. eval cmds=\"$finish_cmds\" - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" @@ -4448,7 +4410,7 @@ fi # Exit here if they wanted silent mode. - test "$show" = : && exit 0 + test "$show" = ":" && exit 0 echo "----------------------------------------------------------------------" echo "Libraries have been installed in:" @@ -4613,8 +4575,11 @@ LANG="$save_LANG"; export LANG fi - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" + # Now actually exec the command. + eval "exec \$cmd$args" + + $echo "$modename: cannot exec \$cmd$args" + exit 1 else # Display what would be done. if test -n "$shlibpath_var"; then @@ -4664,10 +4629,10 @@ objdir="$dir/$objdir" fi name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test "$mode" = uninstall && objdir="$dir" + test $mode = uninstall && objdir="$dir" # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then + if test $mode = clean; then case " $rmdirs " in *" $objdir "*) ;; *) rmdirs="$rmdirs $objdir" ;; @@ -4676,14 +4641,14 @@ # Don't error if the file doesn't exist and rm -f was used. if (test -L "$file") >/dev/null 2>&1 \ - || (test -h "$file") >/dev/null 2>&1 \ + || (test -h "$file") >/dev/null 2>&1 \ || test -f "$file"; then - : + : elif test -d "$file"; then - exit_status=1 + exit_status=1 continue elif test "$rmforce" = yes; then - continue + continue fi rmfiles="$file" @@ -4699,18 +4664,18 @@ rmfiles="$rmfiles $objdir/$n" done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - if test "$mode" = uninstall; then + if test $mode = uninstall; then if test -n "$library_names"; then # Do each command in the postuninstall commands. eval cmds=\"$postuninstall_cmds\" - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then + if test $? != 0 && test "$rmforce" != yes; then exit_status=1 fi done @@ -4720,12 +4685,12 @@ if test -n "$old_library"; then # Do each command in the old_postuninstall commands. eval cmds=\"$old_postuninstall_cmds\" - save_ifs="$IFS"; IFS='~' + IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" $show "$cmd" $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then + if test $? != 0 && test "$rmforce" != yes; then exit_status=1 fi done @@ -4745,7 +4710,7 @@ *) # Do a test to see if this is a libtool program. - if test "$mode" = clean && + if test $mode = clean && (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then relink_command= . $dir/$file @@ -4779,17 +4744,10 @@ ;; esac - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit 1 - fi -fi # test -z "$show_help" - -if test -n "$exec_cmd"; then - eval exec $exec_cmd + $echo "$modename: invalid operation mode \`$mode'" 1>&2 + $echo "$generic_help" 1>&2 exit 1 -fi +fi # test -z "$show_help" # We need to display help for each of the modes. case $mode in diff -Naur gnucash-1.6.8.orig/macros/Makefile.in gnucash-1.6.8/macros/Makefile.in --- gnucash-1.6.8.orig/macros/Makefile.in Thu Aug 22 12:16:42 2002 +++ gnucash-1.6.8/macros/Makefile.in Sun Aug 25 01:31:13 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -164,39 +168,15 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -MACROS = \ - aclocal-include.m4 \ - compiler-flags.m4 \ - curses.m4 \ - gnome-bonobo-check.m4 \ - gnome-fileutils.m4 \ - gnome-gdk-pixbuf.m4 \ - gnome-ghttp-check.m4 \ - gnome-gnorba-check.m4 \ - gnome-guile-checks.m4 \ - gnome-libgtop-check.m4 \ - gnome-objc-checks.m4 \ - gnome-orbit-check.m4 \ - gnome-print-check.m4 \ - gnome-pthread-check.m4 \ - gnome-support.m4 \ - gnome-undelfs.m4 \ - gnome-vfs.m4 \ - gnome-x-checks.m4 \ - gnome-xml-check.m4 \ - gnome.m4 \ - gperf-check.m4 \ - linger.m4 \ - need-declaration.m4 +MACROS = aclocal-include.m4 compiler-flags.m4 curses.m4 gnome-bonobo-check.m4 gnome-fileutils.m4 gnome-gdk-pixbuf.m4 gnome-ghttp-check.m4 gnome-gnorba-check.m4 gnome-guile-checks.m4 gnome-libgtop-check.m4 gnome-objc-checks.m4 gnome-orbit-check.m4 gnome-print-check.m4 gnome-pthread-check.m4 gnome-support.m4 gnome-undelfs.m4 gnome-vfs.m4 gnome-x-checks.m4 gnome-xml-check.m4 gnome.m4 gperf-check.m4 linger.m4 need-declaration.m4 EXTRA_DIST = $(MACROS) gnome-common.m4 autogen.sh MAINTAINERCLEANFILES = macros.dep -@INSIDE_GNOME_COMMON_TRUE@gnome_aclocaldir = @INSIDE_GNOME_COMMON_TRUE@$(datadir)/aclocal/gnome-macros +@INSIDE_GNOME_COMMON_TRUE@gnome_aclocaldir = $(datadir)/aclocal/gnome-macros -@INSIDE_GNOME_COMMON_TRUE@gnome_aclocal_DATA = @INSIDE_GNOME_COMMON_TRUE@$(MACROS) gnome-macros.dep gnome-common.m4 \ -@INSIDE_GNOME_COMMON_TRUE@ autogen.sh +@INSIDE_GNOME_COMMON_TRUE@gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 autogen.sh mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -207,14 +187,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps macros/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu macros/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -246,6 +226,11 @@ subdir = macros distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu macros/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/rpm/Makefile.in gnucash-1.6.8/rpm/Makefile.in --- gnucash-1.6.8.orig/rpm/Makefile.in Thu Aug 22 12:17:42 2002 +++ gnucash-1.6.8/rpm/Makefile.in Sun Aug 25 01:31:13 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -164,10 +168,7 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -EXTRA_DIST = \ - .cvsignore \ - gnucash.spec.in \ - gnucash-sql.spec.in +EXTRA_DIST = .cvsignore gnucash.spec.in gnucash-sql.spec.in CLEANFILES = gnucash.spec gnucash-sql.spec @@ -179,14 +180,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps rpm/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu rpm/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -199,6 +200,11 @@ subdir = rpm distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu rpm/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/Makefile.am gnucash-1.6.8/src/Makefile.am --- gnucash-1.6.8.orig/src/Makefile.am Fri Nov 16 08:01:02 2001 +++ gnucash-1.6.8/src/Makefile.am Sun Aug 25 01:30:54 2002 @@ -22,12 +22,19 @@ # dependencies need to go away. The libgwrap one in particular is a # problem with the current version of gwrap, and will go away when # that's fixed. + gnucash_LDADD = \ + engine/libgncengine.la \ gnome/libgncgnome.a \ + engine/libgncengine.la \ register/libgncregister.a \ + engine/libgncengine.la \ register/gnome/libgncregistergnome.a \ + engine/libgncengine.la \ guile/libgncguile.a \ + engine/libgncengine.la \ gnome/libgncgnome.a \ + engine/libgncengine.la \ calculation/libgnccalc.a \ engine/libgncengine.la \ ${GNOMEUI_LIBS} \ @@ -41,6 +48,7 @@ ${DB_LIBS} \ ${INTLLIBS} \ ${EFENCE_LIBS} + gnucash_SOURCES = \ MultiLedger.c \ diff -Naur gnucash-1.6.8.orig/src/Makefile.in gnucash-1.6.8/src/Makefile.in --- gnucash-1.6.8.orig/src/Makefile.in Thu Aug 22 12:17:07 2002 +++ gnucash-1.6.8/src/Makefile.in Sun Aug 25 01:31:13 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -164,20 +168,7 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -SUBDIRS = \ - doc \ - engine \ - calculation \ - experimental \ - register \ - guile \ - gnome \ - scm \ - quotes \ - pixmaps \ - optional \ - . \ - test +SUBDIRS = doc engine calculation experimental register guile gnome scm quotes pixmaps optional . test # Engine Makefile.am file. @@ -188,80 +179,28 @@ # dependencies need to go away. The libgwrap one in particular is a # problem with the current version of gwrap, and will go away when # that's fixed. -gnucash_LDADD = \ - gnome/libgncgnome.a \ - register/libgncregister.a \ - register/gnome/libgncregistergnome.a \ - guile/libgncguile.a \ - gnome/libgncgnome.a \ - calculation/libgnccalc.a \ - engine/libgncengine.la \ - ${GNOMEUI_LIBS} \ - ${GUPPI_LIBS} \ - ${GNOME_LIBDIR} \ - ${GNOME_PRINT_LIBS} \ - ${G_WRAP_LINK_ARGS} \ - ${GUILE_LIBS} \ - ${GTKHTML_LIBS} \ - ${GHTTP_LIBS} \ - ${DB_LIBS} \ - ${INTLLIBS} \ - ${EFENCE_LIBS} - - -gnucash_SOURCES = \ - MultiLedger.c \ - SplitLedger.c \ - EuroUtils.c \ - FileDialog.c \ - gnc-component-manager.c \ - gnc-exp-parser.c \ - gnc-main.c \ - gnc-ui-util.c \ - messages.c - - -gnucash_make_guids_LDADD = \ - engine/libgncengine.la \ - ${DL_LIB} \ - ${GNOME_XML_LIB} \ - ${GLIB_LIBS} \ - ${INTLLIBS} - - -gnucash_make_guids_SOURCES = \ - gnucash-make-guids.c - - -noinst_HEADERS = \ - AccWindow.h \ - EuroUtils.h \ - FileBox.h \ - FileDialog.h \ - MultiLedger.h \ - RecnWindow.h \ - RegWindow.h \ - SplitLedger.h \ - file-history.h \ - gnc-component-manager.h \ - gnc-exp-parser.h \ - gnc-ui.h \ - gnc-ui-common.h \ - gnc-ui-util.h \ - messages.h +gnucash_LDADD = engine/libgncengine.la gnome/libgncgnome.a engine/libgncengine.la register/libgncregister.a engine/libgncengine.la register/gnome/libgncregistergnome.a engine/libgncengine.la guile/libgncguile.a engine/libgncengine.la gnome/libgncgnome.a engine/libgncengine.la calculation/libgnccalc.a engine/libgncengine.la ${GNOMEUI_LIBS} ${GUPPI_LIBS} ${GNOME_LIBDIR} ${GNOME_PRINT_LIBS} ${G_WRAP_LINK_ARGS} ${GUILE_LIBS} ${GTKHTML_LIBS} ${GHTTP_LIBS} ${DB_LIBS} ${INTLLIBS} ${EFENCE_LIBS} -EXTRA_DIST = \ - .cvsignore + +gnucash_SOURCES = MultiLedger.c SplitLedger.c EuroUtils.c FileDialog.c gnc-component-manager.c gnc-exp-parser.c gnc-main.c gnc-ui-util.c messages.c + + +gnucash_make_guids_LDADD = engine/libgncengine.la ${DL_LIB} ${GNOME_XML_LIB} ${GLIB_LIBS} ${INTLLIBS} + + +gnucash_make_guids_SOURCES = gnucash-make-guids.c + + +noinst_HEADERS = AccWindow.h EuroUtils.h FileBox.h FileDialog.h MultiLedger.h RecnWindow.h RegWindow.h SplitLedger.h file-history.h gnc-component-manager.h gnc-exp-parser.h gnc-ui.h gnc-ui-common.h gnc-ui-util.h messages.h + + +EXTRA_DIST = .cvsignore CFLAGS = @CFLAGS@ ${GNOME_INCLUDEDIR} ${GUILE_INCS} -INCLUDES = \ - -I./calculation \ - -I./engine \ - -I./guile \ - -I./register +INCLUDES = -I./calculation -I./engine -I./guile -I./register mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@ -278,9 +217,11 @@ EuroUtils.$(OBJEXT) FileDialog.$(OBJEXT) \ gnc-component-manager.$(OBJEXT) gnc-exp-parser.$(OBJEXT) \ gnc-main.$(OBJEXT) gnc-ui-util.$(OBJEXT) messages.$(OBJEXT) -gnucash_DEPENDENCIES = gnome/libgncgnome.a register/libgncregister.a \ -register/gnome/libgncregistergnome.a guile/libgncguile.a \ -gnome/libgncgnome.a calculation/libgnccalc.a engine/libgncengine.la +gnucash_DEPENDENCIES = engine/libgncengine.la gnome/libgncgnome.a \ +engine/libgncengine.la register/libgncregister.a engine/libgncengine.la \ +register/gnome/libgncregistergnome.a engine/libgncengine.la \ +guile/libgncguile.a engine/libgncengine.la gnome/libgncgnome.a \ +engine/libgncengine.la calculation/libgnccalc.a engine/libgncengine.la gnucash_LDFLAGS = gnucash_make_guids_OBJECTS = gnucash-make-guids.$(OBJEXT) gnucash_make_guids_DEPENDENCIES = engine/libgncengine.la @@ -296,8 +237,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best +DEP_FILES = .deps/EuroUtils.P .deps/FileDialog.P .deps/MultiLedger.P \ +.deps/SplitLedger.P .deps/gnc-component-manager.P \ +.deps/gnc-exp-parser.P .deps/gnc-main.P .deps/gnc-ui-util.P \ +.deps/gnucash-make-guids.P .deps/messages.P SOURCES = $(gnucash_SOURCES) $(gnucash_make_guids_SOURCES) OBJECTS = $(gnucash_OBJECTS) $(gnucash_make_guids_OBJECTS) @@ -305,9 +250,9 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -337,9 +282,6 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -362,9 +304,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -483,6 +422,11 @@ subdir = src distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -503,75 +447,38 @@ || exit 1; \ fi; \ done -EuroUtils.o: EuroUtils.c engine/gnc-commodity.h engine/gnc-engine.h \ - EuroUtils.h engine/gnc-numeric.h -FileDialog.o: FileDialog.c ../config.h engine/Backend.h FileBox.h \ - FileDialog.h engine/Group.h engine/Account.h engine/GNCId.h \ - engine/guid.h engine/Transaction.h engine/gnc-common.h \ - engine/gnc-commodity.h engine/gnc-numeric.h engine/kvp_frame.h \ - engine/date.h engine/gnc-book.h engine/gnc-pricedb.h \ - file-history.h gnc-component-manager.h engine/gnc-event.h \ - engine/gnc-engine.h engine/gnc-engine-util.h gnc-ui.h \ - gnc-ui-common.h messages.h gnome/new-user-funs.h \ - gnome/gnc-amount-edit.h gnc-ui-util.h \ - gnome/gnc-commodity-edit.h guile/global-options.h \ - guile/option-util.h engine/gnc-book-p.h -gnc-component-manager.o: gnc-component-manager.c ../config.h \ - FileDialog.h engine/Group.h engine/Account.h engine/GNCId.h \ - engine/guid.h engine/Transaction.h engine/gnc-common.h \ - engine/gnc-commodity.h engine/gnc-numeric.h engine/kvp_frame.h \ - engine/date.h engine/gnc-book.h engine/Backend.h \ - engine/gnc-pricedb.h gnc-component-manager.h engine/gnc-event.h \ - engine/gnc-engine-util.h -gnc-exp-parser.o: gnc-exp-parser.c ../config.h calculation/finproto.h \ - calculation/finvar.h calculation/fin_spl_protos.h \ - guile/global-options.h engine/gnc-common.h guile/option-util.h \ - engine/gnc-commodity.h gnc-ui-common.h engine/date.h \ - gnc-exp-parser.h engine/gnc-numeric.h messages.h gnc-ui-util.h \ - engine/Account.h engine/GNCId.h engine/guid.h \ - engine/Transaction.h engine/kvp_frame.h -gnc-main.o: gnc-main.c ../config.h guile/gnucash.h -gnc-ui-util.o: gnc-ui-util.c ../config.h engine/Account.h engine/GNCId.h \ - engine/guid.h engine/Transaction.h engine/gnc-common.h \ - engine/gnc-commodity.h engine/gnc-numeric.h engine/kvp_frame.h \ - engine/date.h EuroUtils.h FileDialog.h engine/Group.h \ - engine/gnc-book.h engine/Backend.h engine/gnc-pricedb.h \ - guile/global-options.h guile/option-util.h gnc-ui-common.h \ - gnc-ui.h gnc-ui-util.h gnc-component-manager.h \ - engine/gnc-event.h engine/gnc-engine.h engine/gnc-engine-util.h \ - messages.h -gnucash-make-guids.o: gnucash-make-guids.c ../config.h engine/GNCIdP.h \ - engine/GNCId.h engine/guid.h -messages.o: messages.c ../config.h messages.h -MultiLedger.o: MultiLedger.c ../config.h engine/Account.h engine/GNCId.h \ - engine/guid.h engine/Transaction.h engine/gnc-common.h \ - engine/gnc-commodity.h engine/gnc-numeric.h engine/kvp_frame.h \ - engine/date.h engine/Group.h MultiLedger.h engine/Query.h \ - register/splitreg.h register/basiccell.h gnc-ui-common.h \ - register/register-common.h register/cellblock.h \ - register/gtable.h register/combocell.h register/datecell.h \ - register/quickfillcell.h register/QuickFill.h \ - register/pricecell.h gnc-ui-util.h register/numcell.h \ - register/recncell.h register/table-allgui.h SplitLedger.h \ - FileDialog.h engine/gnc-book.h engine/Backend.h \ - engine/gnc-pricedb.h guile/global-options.h guile/option-util.h \ - gnc-component-manager.h engine/gnc-event.h \ - engine/gnc-engine-util.h -SplitLedger.o: SplitLedger.c ../config.h engine/Account.h engine/GNCId.h \ - engine/guid.h engine/Transaction.h engine/gnc-common.h \ - engine/gnc-commodity.h engine/gnc-numeric.h engine/kvp_frame.h \ - engine/date.h AccWindow.h engine/Group.h FileDialog.h \ - engine/gnc-book.h engine/Backend.h engine/gnc-pricedb.h \ - MultiLedger.h engine/Query.h register/splitreg.h \ - register/basiccell.h gnc-ui-common.h register/register-common.h \ - register/cellblock.h register/gtable.h register/combocell.h \ - register/datecell.h register/quickfillcell.h \ - register/QuickFill.h register/pricecell.h gnc-ui-util.h \ - register/numcell.h register/recncell.h register/table-allgui.h \ - SplitLedger.h engine/Scrub.h guile/global-options.h \ - guile/option-util.h gnc-component-manager.h engine/gnc-event.h \ - engine/gnc-engine-util.h gnc-ui.h guile/guile-util.h messages.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-recursive dvi-am: @@ -610,26 +517,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-recursive clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-recursive distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ - distclean-tags distclean-generic clean-am + distclean-tags distclean-depend distclean-generic \ + clean-am -rm -f libtool distclean: distclean-recursive maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -645,12 +553,14 @@ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur gnucash-1.6.8.orig/src/SplitLedger.c gnucash-1.6.8/src/SplitLedger.c --- gnucash-1.6.8.orig/src/SplitLedger.c Sun May 12 03:24:26 2002 +++ gnucash-1.6.8/src/SplitLedger.c Fri Aug 23 21:39:32 2002 @@ -4536,7 +4536,7 @@ /* ======================================================== */ -G_INLINE_FUNC void + void sr_add_transaction (SplitRegister *reg, Transaction *trans, Split *split, @@ -4551,7 +4551,7 @@ int *new_split_row, VirtualCellLocation *vcell_loc); -G_INLINE_FUNC void + void sr_add_transaction (SplitRegister *reg, Transaction *trans, Split *split, diff -Naur gnucash-1.6.8.orig/src/calculation/Makefile.in gnucash-1.6.8/src/calculation/Makefile.in --- gnucash-1.6.8.orig/src/calculation/Makefile.in Thu Aug 22 12:17:10 2002 +++ gnucash-1.6.8/src/calculation/Makefile.in Sun Aug 25 01:31:13 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,27 +170,13 @@ noinst_LIBRARIES = libgnccalc.a -libgnccalc_a_SOURCES = \ - expression_parser.c \ - fin.c - - -noinst_HEADERS = \ - finvar.h \ - finproto.h \ - fin_spl_protos.h \ - fin_static_proto.h - - -EXTRA_DIST = \ - .cvsignore \ - README \ - amort_opt.c \ - amort_prt.c \ - fin-interactive.c \ - fin-main.c \ - numeric_ops.c \ - numeric_ops.h +libgnccalc_a_SOURCES = expression_parser.c fin.c + + +noinst_HEADERS = finvar.h finproto.h fin_spl_protos.h fin_static_proto.h + + +EXTRA_DIST = .cvsignore README amort_opt.c amort_prt.c fin-interactive.c fin-main.c numeric_ops.c numeric_ops.h CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} @@ -214,8 +204,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best +DEP_FILES = .deps/expression_parser.P .deps/fin.P SOURCES = $(libgnccalc_a_SOURCES) OBJECTS = $(libgnccalc_a_OBJECTS) @@ -223,9 +214,9 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/calculation/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/calculation/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -239,9 +230,6 @@ maintainer-clean-noinstLIBRARIES: -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -264,9 +252,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -322,6 +307,11 @@ subdir = src/calculation distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/calculation/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -332,10 +322,38 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -expression_parser.o: expression_parser.c finvar.h finproto.h \ - fin_static_proto.h fin_spl_protos.h -fin.o: fin.c finvar.h finproto.h fin_static_proto.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -372,27 +390,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -403,12 +421,14 @@ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur gnucash-1.6.8.orig/src/config.h.in gnucash-1.6.8/src/config.h.in --- gnucash-1.6.8.orig/src/config.h.in Thu Jan 1 09:00:00 1970 +++ gnucash-1.6.8/src/config.h.in Sat Aug 24 22:18:32 2002 @@ -0,0 +1 @@ +/* config.h.in. Generated automatically from configure.in by autoheader. */ diff -Naur gnucash-1.6.8.orig/src/doc/Makefile.in gnucash-1.6.8/src/doc/Makefile.in --- gnucash-1.6.8.orig/src/doc/Makefile.in Thu Aug 22 12:17:07 2002 +++ gnucash-1.6.8/src/doc/Makefile.in Sun Aug 25 01:31:13 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -164,18 +168,10 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -SUBDIRS = \ - design +SUBDIRS = design -EXTRA_DIST = \ - backup.txt \ - budget.txt \ - constderv.html \ - finderv.html \ - finutil.html \ - plugin.txt \ - tax.txt +EXTRA_DIST = backup.txt budget.txt constderv.html finderv.html finutil.html plugin.txt tax.txt mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -185,14 +181,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/doc/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/doc/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -291,6 +287,11 @@ subdir = src/doc distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/doc/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/doc/design/Makefile.in gnucash-1.6.8/src/doc/design/Makefile.in --- gnucash-1.6.8.orig/src/doc/design/Makefile.in Thu Aug 22 12:17:08 2002 +++ gnucash-1.6.8/src/doc/design/Makefile.in Sun Aug 25 01:31:14 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -165,18 +169,7 @@ cxxflags_set = @cxxflags_set@ info_TEXINFOS = gnucash-design.texinfo -gnucash_design_TEXINFOS = \ - component-manager.texinfo \ - concept-index.texinfo \ - engine.texinfo \ - fdl.texinfo \ - function-index.texinfo \ - intro.texinfo \ - register.texinfo \ - reports.texinfo \ - top-level.texinfo \ - type-index.texinfo \ - user-preferences.texinfo +gnucash_design_TEXINFOS = component-manager.texinfo concept-index.texinfo engine.texinfo fdl.texinfo function-index.texinfo intro.texinfo register.texinfo reports.texinfo top-level.texinfo type-index.texinfo user-preferences.texinfo CLEANFILES = gnucash-design.info gnucash-design.info-[0-9]* @@ -193,15 +186,15 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: .SUFFIXES: .dvi .info .ps .texi .texinfo .txi $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/doc/design/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/doc/design/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -357,6 +350,11 @@ subdir = src/doc/design distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/doc/design/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/engine/Makefile.am gnucash-1.6.8/src/engine/Makefile.am --- gnucash-1.6.8.orig/src/engine/Makefile.am Fri Aug 10 09:01:22 2001 +++ gnucash-1.6.8/src/engine/Makefile.am Fri Aug 23 21:39:32 2002 @@ -8,6 +8,7 @@ # Build a libtool library, libhello.la for installation in libdir. lib_LTLIBRARIES = libgncengine.la +# # Build hell from main.c and libhello.la libgncengine_la_SOURCES = \ @@ -57,8 +58,16 @@ sixtp-xml-write-utils.c \ sixtp.c +EXTRA_libgncengine_la_SOURCES = \ + strptime.c \ + strptime.h \ + localtime_r.c \ + localtime_r.h + +libgncengine_la_optional_objects = @STRPTIME_O@ @LOCALTIME_R_O@ libgncengine_la_LDFLAGS = -version-info 2:3:1 -libgncengine_la_LIBADD = ${GNOME_XML_LIB} ${GLIB_LIBS} ${DL_LIB} +libgncengine_la_LIBADD = ${GNOME_XML_LIB} ${GLIB_LIBS} ${DL_LIB} $(libgncengine_la_optional_objects) +libgncengine_la_DEPENDENCIES = $(libgncengine_la_optional_objects) noinst_HEADERS = \ Account.h \ diff -Naur gnucash-1.6.8.orig/src/engine/Makefile.in gnucash-1.6.8/src/engine/Makefile.in --- gnucash-1.6.8.orig/src/engine/Makefile.in Thu Aug 22 12:17:08 2002 +++ gnucash-1.6.8/src/engine/Makefile.in Sun Aug 25 01:31:14 2002 @@ -130,6 +130,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -138,6 +139,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -158,8 +160,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -175,116 +179,24 @@ # Build a libtool library, libhello.la for installation in libdir. lib_LTLIBRARIES = libgncengine.la +# # Build hell from main.c and libhello.la -libgncengine_la_SOURCES = \ - Account-xml-parser-v1.c \ - Account.c \ - Backend.c \ - Commodity-xml-parser-v1.c \ - DateUtils.c \ - GNCId.c \ - Group.c \ - Ledger-xml-parser-v1.c \ - NetIO.c \ - Query-xml-parser-v1.c \ - Query.c \ - Scrub.c \ - TransLog.c \ - Transaction-xml-parser-v1.c \ - Transaction.c \ - date.c \ - gnc-account-xml-v2.c \ - gnc-associate-account.c \ - gnc-book.c \ - gnc-commodity-xml-v2.c \ - gnc-commodity.c \ - gnc-engine-util.c \ - gnc-engine.c \ - gnc-event.c \ - gnc-numeric.c \ - gnc-pricedb-xml-v1.c \ - gnc-pricedb.c \ - gnc-transaction-xml-v2.c \ - guid.c \ - io-example-account.c \ - io-gncbin-r.c \ - io-gncxml-gen.c \ - io-gncxml-r.c \ - io-gncxml-v2.c \ - io-utils.c \ - kvp_frame.c \ - md5.c \ - sixtp-dom-generators.c \ - sixtp-dom-parsers.c \ - sixtp-kvp-parser.c \ - sixtp-stack.c \ - sixtp-to-dom-parser.c \ - sixtp-utils.c \ - sixtp-xml-write-utils.c \ - sixtp.c +libgncengine_la_SOURCES = Account-xml-parser-v1.c Account.c Backend.c Commodity-xml-parser-v1.c DateUtils.c GNCId.c Group.c Ledger-xml-parser-v1.c NetIO.c Query-xml-parser-v1.c Query.c Scrub.c TransLog.c Transaction-xml-parser-v1.c Transaction.c date.c gnc-account-xml-v2.c gnc-associate-account.c gnc-book.c gnc-commodity-xml-v2.c gnc-commodity.c gnc-engine-util.c gnc-engine.c gnc-event.c gnc-numeric.c gnc-pricedb-xml-v1.c gnc-pricedb.c gnc-transaction-xml-v2.c guid.c io-example-account.c io-gncbin-r.c io-gncxml-gen.c io-gncxml-r.c io-gncxml-v2.c io-utils.c kvp_frame.c md5.c sixtp-dom-generators.c sixtp-dom-parsers.c sixtp-kvp-parser.c sixtp-stack.c sixtp-to-dom-parser.c sixtp-utils.c sixtp-xml-write-utils.c sixtp.c +EXTRA_libgncengine_la_SOURCES = strptime.c strptime.h localtime_r.c localtime_r.h + + +libgncengine_la_optional_objects = @STRPTIME_O@ @LOCALTIME_R_O@ libgncengine_la_LDFLAGS = -version-info 2:3:1 -libgncengine_la_LIBADD = ${GNOME_XML_LIB} ${GLIB_LIBS} ${DL_LIB} +libgncengine_la_LIBADD = ${GNOME_XML_LIB} ${GLIB_LIBS} ${DL_LIB} $(libgncengine_la_optional_objects) +libgncengine_la_DEPENDENCIES = $(libgncengine_la_optional_objects) + +noinst_HEADERS = Account.h AccountP.h Backend.h BackendP.h DateUtils.h GNCId.h GNCIdP.h Group.h GroupP.h NetIO.h Query.h Scrub.h TransLog.h Transaction.h TransactionP.h date.h gnc-associate-account.h gnc-book-p.h gnc-book.h gnc-commodity.h gnc-common.h gnc-engine-util.h gnc-engine.h gnc-event-p.h gnc-event.h gnc-numeric.h gnc-pricedb-p.h gnc-pricedb.h gnc-xml-helper.h gnc-xml.h guid.h io-example-account.h io-gncbin.h io-gncxml-gen.h io-gncxml-p.h io-gncxml-v2.h io-gncxml.h io-utils.h kvp_frame.h md5.h sixtp-dom-generators.h sixtp-dom-parsers.h sixtp-parsers.h sixtp-stack.h sixtp-utils.h sixtp-writers.h sixtp-xml-write-utils.h sixtp.h -noinst_HEADERS = \ - Account.h \ - AccountP.h \ - Backend.h \ - BackendP.h \ - DateUtils.h \ - GNCId.h \ - GNCIdP.h \ - Group.h \ - GroupP.h \ - NetIO.h \ - Query.h \ - Scrub.h \ - TransLog.h \ - Transaction.h \ - TransactionP.h \ - date.h \ - gnc-associate-account.h \ - gnc-book-p.h \ - gnc-book.h \ - gnc-commodity.h \ - gnc-common.h \ - gnc-engine-util.h \ - gnc-engine.h \ - gnc-event-p.h \ - gnc-event.h \ - gnc-numeric.h \ - gnc-pricedb-p.h \ - gnc-pricedb.h \ - gnc-xml-helper.h \ - gnc-xml.h \ - guid.h \ - io-example-account.h \ - io-gncbin.h \ - io-gncxml-gen.h \ - io-gncxml-p.h \ - io-gncxml-v2.h \ - io-gncxml.h \ - io-utils.h \ - kvp_frame.h \ - md5.h \ - sixtp-dom-generators.h \ - sixtp-dom-parsers.h \ - sixtp-parsers.h \ - sixtp-stack.h \ - sixtp-utils.h \ - sixtp-writers.h \ - sixtp-xml-write-utils.h \ - sixtp.h - - -EXTRA_DIST = \ - .cvsignore \ - README.query-api \ - design.txt \ - extensions.txt \ - kvp_doc.txt + +EXTRA_DIST = .cvsignore README.query-api design.txt extensions.txt kvp_doc.txt CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} ${GNOME_XML_CFLAGS} ${GHTTP_CFLAGS} @@ -302,7 +214,6 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libgncengine_la_DEPENDENCIES = libgncengine_la_OBJECTS = Account-xml-parser-v1.lo Account.lo \ Backend.lo Commodity-xml-parser-v1.lo DateUtils.lo GNCId.lo Group.lo \ Ledger-xml-parser-v1.lo NetIO.lo Query-xml-parser-v1.lo Query.lo \ @@ -326,18 +237,34 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best -SOURCES = $(libgncengine_la_SOURCES) +DEP_FILES = .deps/Account-xml-parser-v1.P .deps/Account.P \ +.deps/Backend.P .deps/Commodity-xml-parser-v1.P .deps/DateUtils.P \ +.deps/GNCId.P .deps/Group.P .deps/Ledger-xml-parser-v1.P .deps/NetIO.P \ +.deps/Query-xml-parser-v1.P .deps/Query.P .deps/Scrub.P \ +.deps/TransLog.P .deps/Transaction-xml-parser-v1.P .deps/Transaction.P \ +.deps/date.P .deps/gnc-account-xml-v2.P .deps/gnc-associate-account.P \ +.deps/gnc-book.P .deps/gnc-commodity-xml-v2.P .deps/gnc-commodity.P \ +.deps/gnc-engine-util.P .deps/gnc-engine.P .deps/gnc-event.P \ +.deps/gnc-numeric.P .deps/gnc-pricedb-xml-v1.P .deps/gnc-pricedb.P \ +.deps/gnc-transaction-xml-v2.P .deps/guid.P .deps/io-example-account.P \ +.deps/io-gncbin-r.P .deps/io-gncxml-gen.P .deps/io-gncxml-r.P \ +.deps/io-gncxml-v2.P .deps/io-utils.P .deps/kvp_frame.P \ +.deps/localtime_r.P .deps/md5.P .deps/sixtp-dom-generators.P \ +.deps/sixtp-dom-parsers.P .deps/sixtp-kvp-parser.P .deps/sixtp-stack.P \ +.deps/sixtp-to-dom-parser.P .deps/sixtp-utils.P \ +.deps/sixtp-xml-write-utils.P .deps/sixtp.P .deps/strptime.P +SOURCES = $(libgncengine_la_SOURCES) $(EXTRA_libgncengine_la_SOURCES) OBJECTS = $(libgncengine_la_OBJECTS) all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/engine/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/engine/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -367,9 +294,6 @@ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -392,9 +316,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -508,6 +429,11 @@ subdir = src/engine distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/engine/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -528,204 +454,38 @@ || exit 1; \ fi; \ done -Account-xml-parser-v1.lo Account-xml-parser-v1.o : \ - Account-xml-parser-v1.c ../../config.h sixtp.h gnc-xml-helper.h \ - sixtp-utils.h date.h sixtp-parsers.h sixtp-xml-write-utils.h \ - gnc-numeric.h GNCId.h guid.h kvp_frame.h Account.h \ - Transaction.h gnc-common.h gnc-commodity.h AccountP.h Group.h \ - sixtp-writers.h Query.h gnc-pricedb.h -Account.lo Account.o : Account.c ../../config.h Account.h GNCId.h guid.h \ - Transaction.h gnc-common.h gnc-commodity.h gnc-numeric.h \ - kvp_frame.h date.h AccountP.h BackendP.h Backend.h Group.h \ - Query.h gnc-book.h gnc-pricedb.h GNCIdP.h GroupP.h \ - TransactionP.h gnc-engine-util.h gnc-event-p.h gnc-event.h \ - ../messages.h -Backend.lo Backend.o : Backend.c Account.h ../../config.h GNCId.h guid.h \ - Transaction.h gnc-common.h gnc-commodity.h gnc-numeric.h \ - kvp_frame.h date.h AccountP.h BackendP.h Backend.h Group.h \ - Query.h gnc-book.h gnc-pricedb.h GroupP.h gnc-engine-util.h \ - gnc-pricedb-p.h TransactionP.h -Commodity-xml-parser-v1.lo Commodity-xml-parser-v1.o : \ - Commodity-xml-parser-v1.c ../../config.h sixtp.h \ - gnc-xml-helper.h sixtp-utils.h date.h sixtp-parsers.h \ - sixtp-writers.h Query.h gnc-common.h Account.h GNCId.h guid.h \ - Transaction.h gnc-commodity.h gnc-numeric.h kvp_frame.h \ - gnc-pricedb.h sixtp-xml-write-utils.h gnc-engine.h \ - gnc-engine-util.h -date.lo date.o : date.c ../../config.h date.h gnc-engine-util.h \ - gnc-common.h gnc-commodity.h gnc-numeric.h -DateUtils.lo DateUtils.o : DateUtils.c ../../config.h DateUtils.h -gnc-account-xml-v2.lo gnc-account-xml-v2.o : gnc-account-xml-v2.c \ - ../../config.h gnc-xml-helper.h sixtp.h sixtp-utils.h date.h \ - sixtp-parsers.h sixtp-dom-parsers.h gnc-commodity.h kvp_frame.h \ - gnc-numeric.h guid.h GNCId.h sixtp-dom-generators.h gnc-xml.h \ - Account.h Transaction.h gnc-common.h gnc-pricedb.h \ - io-gncxml-gen.h AccountP.h Group.h -gnc-associate-account.lo gnc-associate-account.o : \ - gnc-associate-account.c ../../config.h gnc-associate-account.h \ - Account.h GNCId.h guid.h Transaction.h gnc-common.h \ - gnc-commodity.h gnc-numeric.h kvp_frame.h date.h \ - gnc-engine-util.h -gnc-book.lo gnc-book.o : gnc-book.c ../../config.h Backend.h BackendP.h \ - Account.h GNCId.h guid.h Transaction.h gnc-common.h \ - gnc-commodity.h gnc-numeric.h kvp_frame.h date.h Group.h \ - Query.h gnc-book.h gnc-pricedb.h NetIO.h Scrub.h TransLog.h \ - gnc-engine-util.h gnc-pricedb-p.h DateUtils.h io-gncxml.h \ - io-gncbin.h io-gncxml-v2.h gnc-book-p.h gnc-engine.h -gnc-commodity-xml-v2.lo gnc-commodity-xml-v2.o : gnc-commodity-xml-v2.c \ - ../../config.h gnc-xml-helper.h sixtp.h sixtp-utils.h date.h \ - sixtp-parsers.h sixtp-dom-parsers.h gnc-commodity.h kvp_frame.h \ - gnc-numeric.h guid.h GNCId.h sixtp-dom-generators.h gnc-xml.h \ - Account.h Transaction.h gnc-common.h gnc-pricedb.h \ - gnc-engine-util.h io-gncxml-gen.h AccountP.h Group.h -gnc-commodity.lo gnc-commodity.o : gnc-commodity.c ../../config.h \ - gnc-commodity.h gnc-engine-util.h gnc-common.h gnc-numeric.h -gnc-engine-util.lo gnc-engine-util.o : gnc-engine-util.c ../../config.h \ - gnc-engine-util.h gnc-common.h gnc-commodity.h gnc-numeric.h \ - gnc-engine.h -gnc-engine.lo gnc-engine.o : gnc-engine.c ../../config.h GNCIdP.h \ - GNCId.h guid.h gnc-engine.h gnc-commodity.h -gnc-event.lo gnc-event.o : gnc-event.c ../../config.h gnc-engine-util.h \ - gnc-common.h gnc-commodity.h gnc-numeric.h gnc-event-p.h \ - gnc-event.h guid.h -gnc-numeric.lo gnc-numeric.o : gnc-numeric.c gnc-engine-util.h \ - ../../config.h gnc-common.h gnc-commodity.h gnc-numeric.h -gnc-pricedb-xml-v1.lo gnc-pricedb-xml-v1.o : gnc-pricedb-xml-v1.c \ - ../../config.h gnc-engine-util.h gnc-common.h gnc-commodity.h \ - gnc-numeric.h gnc-xml.h gnc-xml-helper.h Account.h GNCId.h \ - guid.h Transaction.h kvp_frame.h date.h sixtp.h gnc-pricedb.h \ - sixtp-utils.h sixtp-parsers.h sixtp-dom-parsers.h \ - sixtp-dom-generators.h sixtp-writers.h Query.h \ - sixtp-xml-write-utils.h io-gncxml-gen.h gnc-pricedb-p.h \ - BackendP.h Backend.h Group.h gnc-book.h -gnc-pricedb.lo gnc-pricedb.o : gnc-pricedb.c ../../config.h Backend.h \ - GNCId.h guid.h GNCIdP.h gnc-engine.h gnc-commodity.h \ - gnc-engine-util.h gnc-common.h gnc-numeric.h gnc-event.h \ - gnc-event-p.h gnc-pricedb.h date.h gnc-pricedb-p.h BackendP.h \ - Account.h Transaction.h kvp_frame.h Group.h Query.h gnc-book.h -gnc-transaction-xml-v2.lo gnc-transaction-xml-v2.o : \ - gnc-transaction-xml-v2.c ../../config.h gnc-xml-helper.h \ - gnc-engine-util.h gnc-common.h gnc-commodity.h gnc-numeric.h \ - sixtp.h sixtp-utils.h date.h sixtp-parsers.h \ - sixtp-dom-parsers.h kvp_frame.h guid.h GNCId.h \ - sixtp-dom-generators.h gnc-xml.h Account.h Transaction.h \ - gnc-pricedb.h io-gncxml-gen.h TransactionP.h -GNCId.lo GNCId.o : GNCId.c ../../config.h GNCIdP.h GNCId.h guid.h \ - gnc-engine-util.h gnc-common.h gnc-commodity.h gnc-numeric.h -Group.lo Group.o : Group.c ../../config.h Account.h GNCId.h guid.h \ - Transaction.h gnc-common.h gnc-commodity.h gnc-numeric.h \ - kvp_frame.h date.h AccountP.h BackendP.h Backend.h Group.h \ - Query.h gnc-book.h gnc-pricedb.h GNCIdP.h GroupP.h \ - TransactionP.h gnc-engine-util.h gnc-event-p.h gnc-event.h -guid.lo guid.o : guid.c ../../config.h guid.h md5.h gnc-engine-util.h \ - gnc-common.h gnc-commodity.h gnc-numeric.h -io-example-account.lo io-example-account.o : io-example-account.c \ - ../../config.h sixtp.h gnc-xml-helper.h gnc-engine.h \ - gnc-commodity.h gnc-engine-util.h gnc-common.h gnc-numeric.h \ - gnc-xml.h Account.h GNCId.h guid.h Transaction.h kvp_frame.h \ - date.h gnc-pricedb.h io-example-account.h Group.h \ - io-gncxml-gen.h io-utils.h gnc-book.h Backend.h \ - sixtp-dom-generators.h sixtp-dom-parsers.h sixtp-parsers.h \ - TransLog.h -io-gncbin-r.lo io-gncbin-r.o : io-gncbin-r.c ../../config.h kvp_frame.h \ - gnc-numeric.h guid.h Account.h GNCId.h Transaction.h \ - gnc-common.h gnc-commodity.h date.h AccountP.h Backend.h \ - DateUtils.h io-gncbin.h gnc-book.h Group.h gnc-pricedb.h \ - GroupP.h BackendP.h Query.h ../messages.h TransactionP.h \ - TransLog.h gnc-engine.h gnc-engine-util.h GNCIdP.h gnc-book-p.h -io-gncxml-gen.lo io-gncxml-gen.o : io-gncxml-gen.c io-gncxml-gen.h \ - sixtp.h gnc-xml-helper.h ../../config.h -io-gncxml-r.lo io-gncxml-r.o : io-gncxml-r.c ../../config.h \ - gnc-xml-helper.h Account.h GNCId.h guid.h Transaction.h \ - gnc-common.h gnc-commodity.h gnc-numeric.h kvp_frame.h date.h \ - Query.h gnc-pricedb.h gnc-engine-util.h gnc-book-p.h gnc-book.h \ - Group.h Backend.h io-gncxml.h io-gncxml-p.h sixtp.h \ - sixtp-stack.h sixtp-parsers.h sixtp-utils.h -io-gncxml-v2.lo io-gncxml-v2.o : io-gncxml-v2.c gnc-engine.h \ - gnc-commodity.h gnc-engine-util.h ../../config.h gnc-common.h \ - gnc-numeric.h TransLog.h Account.h GNCId.h guid.h Transaction.h \ - kvp_frame.h date.h sixtp-dom-parsers.h gnc-xml-helper.h \ - io-gncxml-v2.h gnc-book.h Group.h Backend.h gnc-pricedb.h \ - io-gncxml-gen.h sixtp.h sixtp-parsers.h sixtp-utils.h gnc-xml.h \ - gnc-book-p.h gnc-pricedb-p.h BackendP.h Query.h io-utils.h -io-utils.lo io-utils.o : io-utils.c Group.h ../../config.h Account.h \ - GNCId.h guid.h Transaction.h gnc-common.h gnc-commodity.h \ - gnc-numeric.h kvp_frame.h date.h gnc-book.h Backend.h \ - gnc-pricedb.h gnc-xml.h gnc-xml-helper.h sixtp.h io-utils.h -kvp_frame.lo kvp_frame.o : kvp_frame.c ../../config.h gnc-engine.h \ - gnc-commodity.h gnc-engine-util.h gnc-common.h gnc-numeric.h \ - guid.h kvp_frame.h -Ledger-xml-parser-v1.lo Ledger-xml-parser-v1.o : Ledger-xml-parser-v1.c \ - ../../config.h gnc-engine-util.h gnc-common.h gnc-commodity.h \ - gnc-numeric.h gnc-pricedb-p.h BackendP.h Account.h GNCId.h \ - guid.h Transaction.h kvp_frame.h date.h Backend.h Group.h \ - Query.h gnc-book.h gnc-pricedb.h io-gncxml-p.h sixtp.h \ - gnc-xml-helper.h io-gncxml.h sixtp-parsers.h sixtp-utils.h \ - TransLog.h -md5.lo md5.o : md5.c ../../config.h md5.h -NetIO.lo NetIO.o : NetIO.c ../../config.h BackendP.h Account.h GNCId.h \ - guid.h Transaction.h gnc-common.h gnc-commodity.h gnc-numeric.h \ - kvp_frame.h date.h Backend.h Group.h Query.h gnc-book.h \ - gnc-pricedb.h NetIO.h gnc-engine-util.h io-gncxml.h -Query-xml-parser-v1.lo Query-xml-parser-v1.o : Query-xml-parser-v1.c \ - ../../config.h sixtp.h gnc-xml-helper.h sixtp-utils.h date.h \ - sixtp-parsers.h sixtp-writers.h Query.h gnc-common.h Account.h \ - GNCId.h guid.h Transaction.h gnc-commodity.h gnc-numeric.h \ - kvp_frame.h gnc-pricedb.h sixtp-xml-write-utils.h \ - gnc-engine-util.h -Query.lo Query.o : Query.c gnc-common.h ../../config.h gnc-engine-util.h \ - gnc-commodity.h gnc-numeric.h Account.h GNCId.h guid.h \ - Transaction.h kvp_frame.h date.h BackendP.h Backend.h Group.h \ - Query.h gnc-book.h gnc-pricedb.h TransactionP.h -Scrub.lo Scrub.o : Scrub.c Account.h ../../config.h GNCId.h guid.h \ - Transaction.h gnc-common.h gnc-commodity.h gnc-numeric.h \ - kvp_frame.h date.h Group.h GroupP.h BackendP.h Backend.h \ - Query.h gnc-book.h gnc-pricedb.h Scrub.h TransactionP.h \ - gnc-engine-util.h ../messages.h -sixtp-dom-generators.lo sixtp-dom-generators.o : sixtp-dom-generators.c \ - ../../config.h gnc-xml-helper.h sixtp-dom-generators.h GNCId.h \ - guid.h gnc-commodity.h date.h gnc-numeric.h kvp_frame.h \ - sixtp-utils.h sixtp.h -sixtp-dom-parsers.lo sixtp-dom-parsers.o : sixtp-dom-parsers.c \ - ../../config.h gnc-xml-helper.h gnc-engine-util.h gnc-common.h \ - gnc-commodity.h gnc-numeric.h gnc-engine.h sixtp-utils.h date.h \ - sixtp.h sixtp-dom-parsers.h kvp_frame.h guid.h GNCId.h -sixtp-kvp-parser.lo sixtp-kvp-parser.o : sixtp-kvp-parser.c \ - ../../config.h sixtp.h gnc-xml-helper.h sixtp-utils.h date.h \ - sixtp-parsers.h kvp_frame.h gnc-numeric.h guid.h -sixtp-stack.lo sixtp-stack.o : sixtp-stack.c sixtp.h gnc-xml-helper.h \ - ../../config.h sixtp-stack.h -sixtp-to-dom-parser.lo sixtp-to-dom-parser.o : sixtp-to-dom-parser.c \ - sixtp-parsers.h sixtp.h gnc-xml-helper.h ../../config.h \ - sixtp-utils.h date.h -sixtp-utils.lo sixtp-utils.o : sixtp-utils.c ../../config.h sixtp.h \ - gnc-xml-helper.h sixtp-utils.h date.h guid.h gnc-numeric.h \ - gnc-engine-util.h gnc-common.h gnc-commodity.h -sixtp-xml-write-utils.lo sixtp-xml-write-utils.o : \ - sixtp-xml-write-utils.c ../../config.h gnc-xml-helper.h \ - sixtp-xml-write-utils.h gnc-numeric.h GNCId.h guid.h date.h \ - kvp_frame.h sixtp-utils.h sixtp.h gnc-engine-util.h \ - gnc-common.h gnc-commodity.h -sixtp.lo sixtp.o : sixtp.c ../../config.h sixtp.h gnc-xml-helper.h \ - sixtp-stack.h gnc-engine-util.h gnc-common.h gnc-commodity.h \ - gnc-numeric.h -Transaction-xml-parser-v1.lo Transaction-xml-parser-v1.o : \ - Transaction-xml-parser-v1.c ../../config.h sixtp.h \ - gnc-xml-helper.h sixtp-utils.h date.h sixtp-parsers.h \ - sixtp-writers.h Query.h gnc-common.h Account.h GNCId.h guid.h \ - Transaction.h gnc-commodity.h gnc-numeric.h kvp_frame.h \ - gnc-pricedb.h sixtp-xml-write-utils.h TransactionP.h Group.h -Transaction.lo Transaction.o : Transaction.c ../../config.h Account.h \ - GNCId.h guid.h Transaction.h gnc-common.h gnc-commodity.h \ - gnc-numeric.h kvp_frame.h date.h AccountP.h BackendP.h \ - Backend.h Group.h Query.h gnc-book.h gnc-pricedb.h GNCIdP.h \ - Scrub.h TransactionP.h TransLog.h gnc-engine-util.h \ - gnc-engine.h gnc-event-p.h gnc-event.h ../messages.h -TransLog.lo TransLog.o : TransLog.c ../../config.h Account.h GNCId.h \ - guid.h Transaction.h gnc-common.h gnc-commodity.h gnc-numeric.h \ - kvp_frame.h date.h AccountP.h DateUtils.h TransactionP.h \ - TransLog.h gnc-engine-util.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-recursive dvi-am: @@ -764,27 +524,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-recursive clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-recursive distclean-am: distclean-libLTLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-recursive maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -801,12 +561,14 @@ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur gnucash-1.6.8.orig/src/engine/date.c gnucash-1.6.8/src/engine/date.c --- gnucash-1.6.8.orig/src/engine/date.c Tue Jun 5 14:37:52 2001 +++ gnucash-1.6.8/src/engine/date.c Fri Aug 23 21:39:32 2002 @@ -46,6 +46,13 @@ #include "date.h" #include "gnc-engine-util.h" +#ifndef HAVE_LOCALTIME_R +#include "localtime_r.h" +#endif +#ifndef HAVE_STRPTIME +#include "strptime.h" +#endif + #define NANOS_PER_SECOND 1000000000 #ifdef HAVE_LANGINFO_D_FMT diff -Naur gnucash-1.6.8.orig/src/engine/gnc-engine-util.h gnucash-1.6.8/src/engine/gnc-engine-util.h --- gnucash-1.6.8.orig/src/engine/gnc-engine-util.h Tue Jun 26 16:41:58 2001 +++ gnucash-1.6.8/src/engine/gnc-engine-util.h Fri Aug 23 21:39:32 2002 @@ -179,7 +179,9 @@ #if HAVE_SCANF_LLD # define GNC_SCANF_LLD "%lld" #else -# define GNC_SCANF_LLD "%qd" +# if HAVE_SCANF_QD +# define GNC_SCANF_LLD "%qd" +# endif #endif diff -Naur gnucash-1.6.8.orig/src/engine/guid.c gnucash-1.6.8/src/engine/guid.c --- gnucash-1.6.8.orig/src/engine/guid.c Tue Jun 26 13:19:40 2001 +++ gnucash-1.6.8/src/engine/guid.c Fri Aug 23 21:39:32 2002 @@ -28,7 +28,7 @@ #endif #include -#include + #include #include #include @@ -36,6 +36,7 @@ #include #include #include +#include #include #include diff -Naur gnucash-1.6.8.orig/src/engine/io-example-account.c gnucash-1.6.8/src/engine/io-example-account.c --- gnucash-1.6.8.orig/src/engine/io-example-account.c Thu Jan 24 15:34:25 2002 +++ gnucash-1.6.8/src/engine/io-example-account.c Fri Aug 23 21:39:32 2002 @@ -25,10 +25,11 @@ #include "config.h" #include -#include + #include #include #include +#include #include #include diff -Naur gnucash-1.6.8.orig/src/engine/localtime_r.c gnucash-1.6.8/src/engine/localtime_r.c --- gnucash-1.6.8.orig/src/engine/localtime_r.c Thu Jan 1 09:00:00 1970 +++ gnucash-1.6.8/src/engine/localtime_r.c Fri Aug 23 21:39:32 2002 @@ -0,0 +1,42 @@ + +#include "config.h" +#include +#include + +#if HAVE_PTHREAD_MUTEX_INIT +#include +struct tm * +localtime_r(const time_t *const timep, struct tm *p_tm) +{ + static pthread_mutex_t time_mutex; + static int time_mutex_inited = 0; + struct tm *tmp; + + if (!time_mutex_inited) { + time_mutex_inited = 1; + pthread_mutex_init(&time_mutex, NULL); + } + + pthread_mutex_lock(&time_mutex); + tmp = localtime(timep); + if (tmp) { + memcpy(p_tm, tmp, sizeof(struct tm)); + tmp = p_tm; + } + pthread_mutex_unlock(&time_mutex); + + return tmp; +} +#else +struct tm * +localtime_r(const time_t *const timep, struct tm *p_tm) +{ + static tm* tmp; + tmp = localtime(timep); + if (tmp) { + memcpy(p_tm, tmp, sizeof(struct tm)); + tmp = p_tm; + } + return tmp; +} +#endif diff -Naur gnucash-1.6.8.orig/src/engine/localtime_r.h gnucash-1.6.8/src/engine/localtime_r.h --- gnucash-1.6.8.orig/src/engine/localtime_r.h Thu Jan 1 09:00:00 1970 +++ gnucash-1.6.8/src/engine/localtime_r.h Fri Aug 23 21:39:32 2002 @@ -0,0 +1,10 @@ +#ifndef __LOCALTIME_R_H__ +#define __LOCALTIME_R_H__ +#include +/* + * Version of "localtime_r()", for the benefit of OSes that don't have it. + */ +extern struct tm *localtime_r(const time_t *const timep, struct tm *p_tm); + +#endif + diff -Naur gnucash-1.6.8.orig/src/engine/rpc/Makefile.in gnucash-1.6.8/src/engine/rpc/Makefile.in --- gnucash-1.6.8.orig/src/engine/rpc/Makefile.in Thu Aug 22 12:17:10 2002 +++ gnucash-1.6.8/src/engine/rpc/Makefile.in Sun Aug 25 01:31:14 2002 @@ -131,6 +131,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -139,6 +140,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -159,8 +161,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -171,45 +175,18 @@ lib_LTLIBRARIES = libgnc_rpc.la -libgnc_rpc_la_SOURCES = \ - RpcBackend.c \ - RpcServer.c \ - RpcSock.c \ - RpcUtils.c \ - gncRpc_xdr.c \ - gncRpc_clnt.c \ - gncRpc_svc.c \ - gncRpc_server.c \ - clnt_thrd.c \ - svc_thrd.c \ - xprt_thrd.c +libgnc_rpc_la_SOURCES = RpcBackend.c RpcServer.c RpcSock.c RpcUtils.c gncRpc_xdr.c gncRpc_clnt.c gncRpc_svc.c gncRpc_server.c clnt_thrd.c svc_thrd.c xprt_thrd.c libgnc_rpc_la_LDFLAGS = -version-info 0:0:0 -noinst_HEADERS = \ - RpcBackend.h \ - RpcServer.h \ - RpcServerP.h \ - RpcSock.h \ - RpcUtils.h \ - gncRpc.h \ - clnt_thrd.h \ - svc_thrd.h \ - xprt_thrd.h - - -RPCGEN_FILES = \ - gncRpc.h \ - gncRpc_xdr.c \ - gncRpc_clnt.c \ - gncRpc_svc.c - - -EXTRA_DIST = \ - .cvsignore \ - README \ - $(RPCGEN_SRCS) +noinst_HEADERS = RpcBackend.h RpcServer.h RpcServerP.h RpcSock.h RpcUtils.h gncRpc.h clnt_thrd.h svc_thrd.h xprt_thrd.h + + +RPCGEN_FILES = gncRpc.h gncRpc_xdr.c gncRpc_clnt.c gncRpc_svc.c + + +EXTRA_DIST = .cvsignore README $(RPCGEN_SRCS) INCLUDES = -I.. @@ -220,8 +197,7 @@ #RPCGEN=rpcgen -M RPCGEN = rpcgen -RPCGEN_SRCS = gncAccount.x gncCommodity.x gncKVP.x gncGUID.x \ - gncPrice.x gncQuery.x gncRpc.x gncSplit.x gncTxn.x +RPCGEN_SRCS = gncAccount.x gncCommodity.x gncKVP.x gncGUID.x gncPrice.x gncQuery.x gncRpc.x gncSplit.x gncTxn.x mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -248,8 +224,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best +DEP_FILES = .deps/RpcBackend.P .deps/RpcServer.P .deps/RpcSock.P \ +.deps/RpcUtils.P .deps/clnt_thrd.P .deps/gncRpc_clnt.P \ +.deps/gncRpc_server.P .deps/gncRpc_svc.P .deps/gncRpc_xdr.P \ +.deps/svc_thrd.P .deps/xprt_thrd.P SOURCES = $(libgnc_rpc_la_SOURCES) OBJECTS = $(libgnc_rpc_la_OBJECTS) @@ -257,9 +237,9 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/engine/rpc/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/engine/rpc/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -289,9 +269,6 @@ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -314,9 +291,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -370,6 +344,11 @@ subdir = src/engine/rpc distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/engine/rpc/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -381,6 +360,37 @@ fi; \ done +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -418,27 +428,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-libLTLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -450,12 +460,13 @@ distclean-compile clean-compile maintainer-clean-compile \ mostlyclean-libtool distclean-libtool clean-libtool \ maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean #gncRpc.h: $(RPCGEN_SRCS) diff -Naur gnucash-1.6.8.orig/src/engine/sixtp-utils.c gnucash-1.6.8/src/engine/sixtp-utils.c --- gnucash-1.6.8.orig/src/engine/sixtp-utils.c Tue Jun 5 02:06:10 2001 +++ gnucash-1.6.8/src/engine/sixtp-utils.c Fri Aug 23 21:39:32 2002 @@ -41,6 +41,12 @@ #include "gnc-numeric.h" #include "gnc-engine-util.h" +#ifndef HAVE_LOCALTIME_R +#include "localtime_r.h" +#endif +#ifndef HAVE_STRPTIME +#include "strptime.h" +#endif gboolean isspace_str(const gchar *str, int nomorethan) @@ -203,13 +209,12 @@ /* convert a string to a gint64. only whitespace allowed before and after. */ long long int v_in; int num_read; - g_return_val_if_fail(str, FALSE); - /* must use "<" here because %n's effects aren't well defined */ - if(sscanf(str, " " GNC_SCANF_LLD " %n", &v_in, &num_read) < 1) { + if(sscanf(str, " " GNC_SCANF_LLD "%n", &v_in, &num_read) < 1) { return(FALSE); } + while( (*((gchar*)str + num_read)!='\0') && isspace(*((char*)str + num_read))) num_read++; if (v) *v = v_in; @@ -230,9 +235,10 @@ int v_in; /* must use "<" here because %n's effects aren't well defined */ - if(sscanf(str, " %d %n", &v_in, &num_read) < 1) { + if(sscanf(str, " %d%n", &v_in, &num_read) < 1) { return(FALSE); } + while( (*((gchar*)str + num_read)!='\0') && isspace(*((char*)str + num_read))) num_read++; if (v) *v = v_in; @@ -465,7 +471,8 @@ if (!str || !ts) return FALSE; - sscanf(str, " %ld %n", &nanosecs, &charcount); + sscanf(str, " %ld%n", &nanosecs, &charcount); + while( (*((gchar*)str + charcount)!='\0') && isspace(*((char*)str + charcount))) charcount++; if(charcount != strlen(str)) return(FALSE); diff -Naur gnucash-1.6.8.orig/src/engine/sql/Makefile.in gnucash-1.6.8/src/engine/sql/Makefile.in --- gnucash-1.6.8.orig/src/engine/sql/Makefile.in Thu Aug 22 12:17:09 2002 +++ gnucash-1.6.8/src/engine/sql/Makefile.in Sun Aug 25 01:31:14 2002 @@ -128,6 +128,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -136,6 +137,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -156,8 +158,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -171,48 +175,13 @@ libgnc_postgres_la_LIBADD = ../libgncengine.la -libgnc_postgres_la_SOURCES = \ - PostgresBackend.c \ - account.c \ - builder.c \ - checkpoint.c \ - escape.c \ - events.c \ - gncquery.c \ - kvp-sql.c \ - price.c \ - txn.c \ - txnmass.c - - -noinst_HEADERS = \ - PostgresBackend.h \ - account.h \ - builder.h \ - checkpoint.h \ - escape.h \ - events.h \ - gncquery.h \ - kvp-sql.h \ - price.h \ - putil.h \ - txn.h \ - txnmass.h - - -EXTRA_DIST = \ - .cvsignore \ - README \ - base-objects.m4 \ - check-objects.m4 \ - design.txt \ - functions.sql \ - kvp-objects.m4 \ - table.m4 \ - table-audit.sql \ - table-create.sql \ - table-drop.sql \ - demo.c +libgnc_postgres_la_SOURCES = PostgresBackend.c account.c builder.c checkpoint.c escape.c events.c gncquery.c kvp-sql.c price.c txn.c txnmass.c + + +noinst_HEADERS = PostgresBackend.h account.h builder.h checkpoint.h escape.h events.h gncquery.h kvp-sql.h price.h putil.h txn.h txnmass.h + + +EXTRA_DIST = .cvsignore README base-objects.m4 check-objects.m4 design.txt functions.sql kvp-objects.m4 table.m4 table-audit.sql table-create.sql table-drop.sql demo.c INCLUDES = -I.. -I/usr/lib/glib/include @@ -246,8 +215,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best +DEP_FILES = .deps/PostgresBackend.P .deps/account.P .deps/builder.P \ +.deps/checkpoint.P .deps/escape.P .deps/events.P .deps/gncquery.P \ +.deps/kvp-sql.P .deps/price.P .deps/txn.P .deps/txnmass.P SOURCES = $(libgnc_postgres_la_SOURCES) OBJECTS = $(libgnc_postgres_la_OBJECTS) @@ -255,9 +227,9 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/engine/sql/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/engine/sql/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -287,9 +259,6 @@ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -312,9 +281,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -368,6 +334,11 @@ subdir = src/engine/sql distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/engine/sql/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -379,6 +350,37 @@ fi; \ done +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -416,27 +418,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-libLTLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -448,12 +450,13 @@ distclean-compile clean-compile maintainer-clean-compile \ mostlyclean-libtool distclean-libtool clean-libtool \ maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ -check-am installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Some of the required C files are built with the m4 pre-processor diff -Naur gnucash-1.6.8.orig/src/engine/strptime.c gnucash-1.6.8/src/engine/strptime.c --- gnucash-1.6.8.orig/src/engine/strptime.c Thu Jan 1 09:00:00 1970 +++ gnucash-1.6.8/src/engine/strptime.c Fri Aug 23 21:39:32 2002 @@ -0,0 +1,992 @@ +/* Convert a string representation of time to a time value. + Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* XXX This version of the implementation is not really complete. + Some of the fields cannot add information alone. But if seeing + some of them in the same format (such as year, week and weekday) + this is enough information for determining the date. */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include + +#ifdef _LIBC +# include "../locale/localeinfo.h" +#endif + +#include "strptime.h" + +#ifndef __P +# if defined (__GNUC__) || (defined (__STDC__) && __STDC__) +# define __P(args) args +# else +# define __P(args) () +# endif /* GCC. */ +#endif /* Not __P. */ + +#if ! HAVE_LOCALTIME_R && ! defined localtime_r +# ifdef _LIBC +# define localtime_r __localtime_r +# else +# include "localtime_r.h" +# endif /* ! _LIBC */ +#endif /* ! HAVE_LOCALTIME_R && ! defined (localtime_r) */ + + +#define match_char(ch1, ch2) if (ch1 != ch2) return NULL +#if defined __GNUC__ && __GNUC__ >= 2 +# define match_string(cs1, s2) \ + ({ size_t len = strlen (cs1); \ + int result = strncasecmp ((cs1), (s2), len) == 0; \ + if (result) (s2) += len; \ + result; }) +#else +/* Oh come on. Get a reasonable compiler. */ +# define match_string(cs1, s2) \ + (strncasecmp ((cs1), (s2), strlen (cs1)) ? 0 : ((s2) += strlen (cs1), 1)) +#endif +/* We intentionally do not use isdigit() for testing because this will + lead to problems with the wide character version. */ +#define get_number(from, to, n) \ + do { \ + int __n = n; \ + val = 0; \ + while (*rp == ' ') \ + ++rp; \ + if (*rp < '0' || *rp > '9') \ + return NULL; \ + do { \ + val *= 10; \ + val += *rp++ - '0'; \ + } while (--__n > 0 && val * 10 <= to && *rp >= '0' && *rp <= '9'); \ + if (val < from || val > to) \ + return NULL; \ + } while (0) +#ifdef _NL_CURRENT +# define get_alt_number(from, to, n) \ + ({ \ + __label__ do_normal; \ + if (*decided != raw) \ + { \ + const char *alts = _NL_CURRENT (LC_TIME, ALT_DIGITS); \ + int __n = n; \ + int any = 0; \ + while (*rp == ' ') \ + ++rp; \ + val = 0; \ + do { \ + val *= 10; \ + while (*alts != '\0') \ + { \ + size_t len = strlen (alts); \ + if (strncasecmp (alts, rp, len) == 0) \ + break; \ + alts += len + 1; \ + ++val; \ + } \ + if (*alts == '\0') \ + { \ + if (*decided == not && ! any) \ + goto do_normal; \ + /* If we haven't read anything it's an error. */ \ + if (! any) \ + return NULL; \ + /* Correct the premature multiplication. */ \ + val /= 10; \ + break; \ + } \ + else \ + *decided = loc; \ + } while (--__n > 0 && val * 10 <= to); \ + if (val < from || val > to) \ + return NULL; \ + } \ + else \ + { \ + do_normal: \ + get_number (from, to, n); \ + } \ + 0; \ + }) +#else +# define get_alt_number(from, to, n) \ + /* We don't have the alternate representation. */ \ + get_number(from, to, n) +#endif +#define recursive(new_fmt) \ + (*(new_fmt) != '\0' \ + && (rp = strptime_internal (rp, (new_fmt), tm, decided, era_cnt)) != NULL) + + +#ifdef _LIBC +/* This is defined in locale/C-time.c in the GNU libc. */ +extern const struct locale_data _nl_C_LC_TIME; +extern const unsigned short int __mon_yday[2][13]; + +# define weekday_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (DAY_1)].string) +# define ab_weekday_name \ + (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABDAY_1)].string) +# define month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (MON_1)].string) +# define ab_month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)].string) +# define HERE_D_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_T_FMT)].string) +# define HERE_D_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_FMT)].string) +# define HERE_AM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (AM_STR)].string) +# define HERE_PM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (PM_STR)].string) +# define HERE_T_FMT_AMPM \ + (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (T_FMT_AMPM)].string) +# define HERE_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (T_FMT)].string) + +# define strncasecmp(s1, s2, n) __strncasecmp (s1, s2, n) +#else +static char const weekday_name[][10] = + { + "Sunday", "Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday" + }; +static char const ab_weekday_name[][4] = + { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" + }; +static char const month_name[][10] = + { + "January", "February", "March", "April", "May", "June", + "July", "August", "September", "October", "November", "December" + }; +static char const ab_month_name[][4] = + { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" + }; +# define HERE_D_T_FMT "%a %b %e %H:%M:%S %Y" +# define HERE_D_FMT "%m/%d/%y" +# define HERE_AM_STR "AM" +# define HERE_PM_STR "PM" +# define HERE_T_FMT_AMPM "%I:%M:%S %p" +# define HERE_T_FMT "%H:%M:%S" + +const unsigned short int __mon_yday[2][13] = + { + /* Normal years. */ + { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, + /* Leap years. */ + { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } + }; +#endif + +/* Status of lookup: do we use the locale data or the raw data? */ +enum locale_status { not, loc, raw }; + + +#ifndef __isleap +/* Nonzero if YEAR is a leap year (every 4 years, + except every 100th isn't, and every 400th is). */ +# define __isleap(year) \ + ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0)) +#endif + +/* Compute the day of the week. */ +static void +day_of_the_week (struct tm *tm) +{ + /* We know that January 1st 1970 was a Thursday (= 4). Compute the + the difference between this data in the one on TM and so determine + the weekday. */ + int corr_year = 1900 + tm->tm_year - (tm->tm_mon < 2); + int wday = (-473 + + (365 * (tm->tm_year - 70)) + + (corr_year / 4) + - ((corr_year / 4) / 25) + ((corr_year / 4) % 25 < 0) + + (((corr_year / 4) / 25) / 4) + + __mon_yday[0][tm->tm_mon] + + tm->tm_mday - 1); + tm->tm_wday = ((wday % 7) + 7) % 7; +} + +/* Compute the day of the year. */ +static void +day_of_the_year (struct tm *tm) +{ + tm->tm_yday = (__mon_yday[__isleap (1900 + tm->tm_year)][tm->tm_mon] + + (tm->tm_mday - 1)); +} + +static char * +#ifdef _LIBC +internal_function +#endif +strptime_internal __P ((const char *rp, const char *fmt, struct tm *tm, + enum locale_status *decided, int era_cnt)); + +static char * +#ifdef _LIBC +internal_function +#endif +strptime_internal (rp, fmt, tm, decided, era_cnt) + const char *rp; + const char *fmt; + struct tm *tm; + enum locale_status *decided; + int era_cnt; +{ + const char *rp_backup; + int cnt; + size_t val; + int have_I, is_pm; + int century, want_century; + int want_era; + int have_wday, want_xday; + int have_yday; + int have_mon, have_mday; +#ifdef _NL_CURRENT + size_t num_eras; +#endif + struct era_entry *era; + + have_I = is_pm = 0; + century = -1; + want_century = 0; + want_era = 0; + era = NULL; + + have_wday = want_xday = have_yday = have_mon = have_mday = 0; + + while (*fmt != '\0') + { + /* A white space in the format string matches 0 more or white + space in the input string. */ + if (isspace (*fmt)) + { + while (isspace (*rp)) + ++rp; + ++fmt; + continue; + } + + /* Any character but `%' must be matched by the same character + in the iput string. */ + if (*fmt != '%') + { + match_char (*fmt++, *rp++); + continue; + } + + ++fmt; +#ifndef _NL_CURRENT + /* We need this for handling the `E' modifier. */ + start_over: +#endif + + /* Make back up of current processing pointer. */ + rp_backup = rp; + + switch (*fmt++) + { + case '%': + /* Match the `%' character itself. */ + match_char ('%', *rp++); + break; + case 'a': + case 'A': + /* Match day of week. */ + for (cnt = 0; cnt < 7; ++cnt) + { +#ifdef _NL_CURRENT + if (*decided !=raw) + { + if (match_string (_NL_CURRENT (LC_TIME, DAY_1 + cnt), rp)) + { + if (*decided == not + && strcmp (_NL_CURRENT (LC_TIME, DAY_1 + cnt), + weekday_name[cnt])) + *decided = loc; + break; + } + if (match_string (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt), rp)) + { + if (*decided == not + && strcmp (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt), + ab_weekday_name[cnt])) + *decided = loc; + break; + } + } +#endif + if (*decided != loc + && (match_string (weekday_name[cnt], rp) + || match_string (ab_weekday_name[cnt], rp))) + { + *decided = raw; + break; + } + } + if (cnt == 7) + /* Does not match a weekday name. */ + return NULL; + tm->tm_wday = cnt; + have_wday = 1; + break; + case 'b': + case 'B': + case 'h': + /* Match month name. */ + for (cnt = 0; cnt < 12; ++cnt) + { +#ifdef _NL_CURRENT + if (*decided !=raw) + { + if (match_string (_NL_CURRENT (LC_TIME, MON_1 + cnt), rp)) + { + if (*decided == not + && strcmp (_NL_CURRENT (LC_TIME, MON_1 + cnt), + month_name[cnt])) + *decided = loc; + break; + } + if (match_string (_NL_CURRENT (LC_TIME, ABMON_1 + cnt), rp)) + { + if (*decided == not + && strcmp (_NL_CURRENT (LC_TIME, ABMON_1 + cnt), + ab_month_name[cnt])) + *decided = loc; + break; + } + } +#endif + if (match_string (month_name[cnt], rp) + || match_string (ab_month_name[cnt], rp)) + { + *decided = raw; + break; + } + } + if (cnt == 12) + /* Does not match a month name. */ + return NULL; + tm->tm_mon = cnt; + want_xday = 1; + break; + case 'c': + /* Match locale's date and time format. */ +#ifdef _NL_CURRENT + if (*decided != raw) + { + if (!recursive (_NL_CURRENT (LC_TIME, D_T_FMT))) + { + if (*decided == loc) + return NULL; + else + rp = rp_backup; + } + else + { + if (*decided == not && + strcmp (_NL_CURRENT (LC_TIME, D_T_FMT), HERE_D_T_FMT)) + *decided = loc; + want_xday = 1; + break; + } + *decided = raw; + } +#endif + if (!recursive (HERE_D_T_FMT)) + return NULL; + want_xday = 1; + break; + case 'C': + /* Match century number. */ +#ifdef _NL_CURRENT + match_century: +#endif + get_number (0, 99, 2); + century = val; + want_xday = 1; + break; + case 'd': + case 'e': + /* Match day of month. */ + get_number (1, 31, 2); + tm->tm_mday = val; + have_mday = 1; + want_xday = 1; + break; + case 'F': + if (!recursive ("%Y-%m-%d")) + return NULL; + want_xday = 1; + break; + case 'x': +#ifdef _NL_CURRENT + if (*decided != raw) + { + if (!recursive (_NL_CURRENT (LC_TIME, D_FMT))) + { + if (*decided == loc) + return NULL; + else + rp = rp_backup; + } + else + { + if (*decided == not + && strcmp (_NL_CURRENT (LC_TIME, D_FMT), HERE_D_FMT)) + *decided = loc; + want_xday = 1; + break; + } + *decided = raw; + } +#endif + /* Fall through. */ + case 'D': + /* Match standard day format. */ + if (!recursive (HERE_D_FMT)) + return NULL; + want_xday = 1; + break; + case 'k': + case 'H': + /* Match hour in 24-hour clock. */ + get_number (0, 23, 2); + tm->tm_hour = val; + have_I = 0; + break; + case 'I': + /* Match hour in 12-hour clock. */ + get_number (1, 12, 2); + tm->tm_hour = val % 12; + have_I = 1; + break; + case 'j': + /* Match day number of year. */ + get_number (1, 366, 3); + tm->tm_yday = val - 1; + have_yday = 1; + break; + case 'm': + /* Match number of month. */ + get_number (1, 12, 2); + tm->tm_mon = val - 1; + have_mon = 1; + want_xday = 1; + break; + case 'M': + /* Match minute. */ + get_number (0, 59, 2); + tm->tm_min = val; + break; + case 'n': + case 't': + /* Match any white space. */ + while (isspace (*rp)) + ++rp; + break; + case 'p': + /* Match locale's equivalent of AM/PM. */ +#ifdef _NL_CURRENT + if (*decided != raw) + { + if (match_string (_NL_CURRENT (LC_TIME, AM_STR), rp)) + { + if (strcmp (_NL_CURRENT (LC_TIME, AM_STR), HERE_AM_STR)) + *decided = loc; + break; + } + if (match_string (_NL_CURRENT (LC_TIME, PM_STR), rp)) + { + if (strcmp (_NL_CURRENT (LC_TIME, PM_STR), HERE_PM_STR)) + *decided = loc; + is_pm = 1; + break; + } + *decided = raw; + } +#endif + if (!match_string (HERE_AM_STR, rp)) + if (match_string (HERE_PM_STR, rp)) + is_pm = 1; + else + return NULL; + break; + case 'r': +#ifdef _NL_CURRENT + if (*decided != raw) + { + if (!recursive (_NL_CURRENT (LC_TIME, T_FMT_AMPM))) + { + if (*decided == loc) + return NULL; + else + rp = rp_backup; + } + else + { + if (*decided == not && + strcmp (_NL_CURRENT (LC_TIME, T_FMT_AMPM), + HERE_T_FMT_AMPM)) + *decided = loc; + break; + } + *decided = raw; + } +#endif + if (!recursive (HERE_T_FMT_AMPM)) + return NULL; + break; + case 'R': + if (!recursive ("%H:%M")) + return NULL; + break; + case 's': + { + /* The number of seconds may be very high so we cannot use + the `get_number' macro. Instead read the number + character for character and construct the result while + doing this. */ + time_t secs = 0; + if (*rp < '0' || *rp > '9') + /* We need at least one digit. */ + return NULL; + + do + { + secs *= 10; + secs += *rp++ - '0'; + } + while (*rp >= '0' && *rp <= '9'); + + if (localtime_r (&secs, tm) == NULL) + /* Error in function. */ + return NULL; + } + break; + case 'S': + get_number (0, 61, 2); + tm->tm_sec = val; + break; + case 'X': +#ifdef _NL_CURRENT + if (*decided != raw) + { + if (!recursive (_NL_CURRENT (LC_TIME, T_FMT))) + { + if (*decided == loc) + return NULL; + else + rp = rp_backup; + } + else + { + if (strcmp (_NL_CURRENT (LC_TIME, T_FMT), HERE_T_FMT)) + *decided = loc; + break; + } + *decided = raw; + } +#endif + /* Fall through. */ + case 'T': + if (!recursive (HERE_T_FMT)) + return NULL; + break; + case 'u': + get_number (1, 7, 1); + tm->tm_wday = val % 7; + have_wday = 1; + break; + case 'g': + get_number (0, 99, 2); + /* XXX This cannot determine any field in TM. */ + break; + case 'G': + if (*rp < '0' || *rp > '9') + return NULL; + /* XXX Ignore the number since we would need some more + information to compute a real date. */ + do + ++rp; + while (*rp >= '0' && *rp <= '9'); + break; + case 'U': + case 'V': + case 'W': + get_number (0, 53, 2); + /* XXX This cannot determine any field in TM without some + information. */ + break; + case 'w': + /* Match number of weekday. */ + get_number (0, 6, 1); + tm->tm_wday = val; + have_wday = 1; + break; + case 'y': +#ifdef _NL_CURRENT + match_year_in_century: +#endif + /* Match year within century. */ + get_number (0, 99, 2); + /* The "Year 2000: The Millennium Rollover" paper suggests that + values in the range 69-99 refer to the twentieth century. */ + tm->tm_year = val >= 69 ? val : val + 100; + /* Indicate that we want to use the century, if specified. */ + want_century = 1; + want_xday = 1; + break; + case 'Y': + /* Match year including century number. */ + get_number (0, 9999, 4); + tm->tm_year = val - 1900; + want_century = 0; + want_xday = 1; + break; + case 'Z': + /* XXX How to handle this? */ + break; + case 'E': +#ifdef _NL_CURRENT + switch (*fmt++) + { + case 'c': + /* Match locale's alternate date and time format. */ + if (*decided != raw) + { + const char *fmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT); + + if (*fmt == '\0') + fmt = _NL_CURRENT (LC_TIME, D_T_FMT); + + if (!recursive (fmt)) + { + if (*decided == loc) + return NULL; + else + rp = rp_backup; + } + else + { + if (strcmp (fmt, HERE_D_T_FMT)) + *decided = loc; + want_xday = 1; + break; + } + *decided = raw; + } + /* The C locale has no era information, so use the + normal representation. */ + if (!recursive (HERE_D_T_FMT)) + return NULL; + want_xday = 1; + break; + case 'C': + if (*decided != raw) + { + if (era_cnt >= 0) + { + era = _nl_select_era_entry (era_cnt); + if (match_string (era->era_name, rp)) + { + *decided = loc; + break; + } + else + return NULL; + } + else + { + num_eras = _NL_CURRENT_WORD (LC_TIME, + _NL_TIME_ERA_NUM_ENTRIES); + for (era_cnt = 0; era_cnt < (int) num_eras; + ++era_cnt, rp = rp_backup) + { + era = _nl_select_era_entry (era_cnt); + if (match_string (era->era_name, rp)) + { + *decided = loc; + break; + } + } + if (era_cnt == (int) num_eras) + { + era_cnt = -1; + if (*decided == loc) + return NULL; + } + else + break; + } + + *decided = raw; + } + /* The C locale has no era information, so use the + normal representation. */ + goto match_century; + case 'y': + if (*decided == raw) + goto match_year_in_century; + + get_number(0, 9999, 4); + tm->tm_year = val; + want_era = 1; + want_xday = 1; + break; + case 'Y': + if (*decided != raw) + { + num_eras = _NL_CURRENT_WORD (LC_TIME, + _NL_TIME_ERA_NUM_ENTRIES); + for (era_cnt = 0; era_cnt < (int) num_eras; + ++era_cnt, rp = rp_backup) + { + era = _nl_select_era_entry (era_cnt); + if (recursive (era->era_format)) + break; + } + if (era_cnt == (int) num_eras) + { + era_cnt = -1; + if (*decided == loc) + return NULL; + else + rp = rp_backup; + } + else + { + *decided = loc; + era_cnt = -1; + break; + } + + *decided = raw; + } + get_number (0, 9999, 4); + tm->tm_year = val - 1900; + want_century = 0; + want_xday = 1; + break; + case 'x': + if (*decided != raw) + { + const char *fmt = _NL_CURRENT (LC_TIME, ERA_D_FMT); + + if (*fmt == '\0') + fmt = _NL_CURRENT (LC_TIME, D_FMT); + + if (!recursive (fmt)) + { + if (*decided == loc) + return NULL; + else + rp = rp_backup; + } + else + { + if (strcmp (fmt, HERE_D_FMT)) + *decided = loc; + break; + } + *decided = raw; + } + if (!recursive (HERE_D_FMT)) + return NULL; + break; + case 'X': + if (*decided != raw) + { + const char *fmt = _NL_CURRENT (LC_TIME, ERA_T_FMT); + + if (*fmt == '\0') + fmt = _NL_CURRENT (LC_TIME, T_FMT); + + if (!recursive (fmt)) + { + if (*decided == loc) + return NULL; + else + rp = rp_backup; + } + else + { + if (strcmp (fmt, HERE_T_FMT)) + *decided = loc; + break; + } + *decided = raw; + } + if (!recursive (HERE_T_FMT)) + return NULL; + break; + default: + return NULL; + } + break; +#else + /* We have no information about the era format. Just use + the normal format. */ + if (*fmt != 'c' && *fmt != 'C' && *fmt != 'y' && *fmt != 'Y' + && *fmt != 'x' && *fmt != 'X') + /* This is an illegal format. */ + return NULL; + + goto start_over; +#endif + case 'O': + switch (*fmt++) + { + case 'd': + case 'e': + /* Match day of month using alternate numeric symbols. */ + get_alt_number (1, 31, 2); + tm->tm_mday = val; + have_mday = 1; + want_xday = 1; + break; + case 'H': + /* Match hour in 24-hour clock using alternate numeric + symbols. */ + get_alt_number (0, 23, 2); + tm->tm_hour = val; + have_I = 0; + break; + case 'I': + /* Match hour in 12-hour clock using alternate numeric + symbols. */ + get_alt_number (1, 12, 2); + tm->tm_hour = val - 1; + have_I = 1; + break; + case 'm': + /* Match month using alternate numeric symbols. */ + get_alt_number (1, 12, 2); + tm->tm_mon = val - 1; + have_mon = 1; + want_xday = 1; + break; + case 'M': + /* Match minutes using alternate numeric symbols. */ + get_alt_number (0, 59, 2); + tm->tm_min = val; + break; + case 'S': + /* Match seconds using alternate numeric symbols. */ + get_alt_number (0, 61, 2); + tm->tm_sec = val; + break; + case 'U': + case 'V': + case 'W': + get_alt_number (0, 53, 2); + /* XXX This cannot determine any field in TM without + further information. */ + break; + case 'w': + /* Match number of weekday using alternate numeric symbols. */ + get_alt_number (0, 6, 1); + tm->tm_wday = val; + have_wday = 1; + break; + case 'y': + /* Match year within century using alternate numeric symbols. */ + get_alt_number (0, 99, 2); + tm->tm_year = val >= 69 ? val : val + 100; + want_xday = 1; + break; + default: + return NULL; + } + break; + default: + return NULL; + } + } + + if (have_I && is_pm) + tm->tm_hour += 12; + + if (century != -1) + { + if (want_century) + tm->tm_year = tm->tm_year % 100 + (century - 19) * 100; + else + /* Only the century, but not the year. Strange, but so be it. */ + tm->tm_year = (century - 19) * 100; + } + +#ifdef _NL_CURRENT + if (era_cnt != -1) + { + era = _nl_select_era_entry(era_cnt); + if (want_era) + tm->tm_year = (era->start_date[0] + + ((tm->tm_year - era->offset) + * era->absolute_direction)); + else + /* Era start year assumed. */ + tm->tm_year = era->start_date[0]; + } + else +#endif + if (want_era) + return NULL; + + if (want_xday && !have_wday) + { + if ( !(have_mon && have_mday) && have_yday) + { + /* We don't have tm_mon and/or tm_mday, compute them. */ + int t_mon = 0; + while (__mon_yday[__isleap(1900 + tm->tm_year)][t_mon] <= tm->tm_yday) + t_mon++; + if (!have_mon) + tm->tm_mon = t_mon - 1; + if (!have_mday) + tm->tm_mday = + (tm->tm_yday + - __mon_yday[__isleap(1900 + tm->tm_year)][t_mon - 1] + 1); + } + day_of_the_week (tm); + } + if (want_xday && !have_yday) + day_of_the_year (tm); + + return (char *) rp; +} + + +char * +strptime (buf, format, tm) + const char *buf; + const char *format; + struct tm *tm; +{ + enum locale_status decided; + +#ifdef _NL_CURRENT + decided = not; +#else + decided = raw; +#endif + return strptime_internal (buf, format, tm, &decided, -1); +} + diff -Naur gnucash-1.6.8.orig/src/engine/strptime.h gnucash-1.6.8/src/engine/strptime.h --- gnucash-1.6.8.orig/src/engine/strptime.h Thu Jan 1 09:00:00 1970 +++ gnucash-1.6.8/src/engine/strptime.h Fri Aug 23 21:39:32 2002 @@ -0,0 +1,33 @@ +/* strptime.h + * + * $Id: strptime.h,v 1.1 2002/01/21 13:56:12 peter Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __STRPTIME_H__ +#define __STRPTIME_H__ + +/* + * Version of "strptime()", for the benefit of OSes that don't have it. + */ +extern char *strptime(const char *, const char *, struct tm *); + +#endif + diff -Naur gnucash-1.6.8.orig/src/experimental/Makefile.in gnucash-1.6.8/src/experimental/Makefile.in --- gnucash-1.6.8.orig/src/experimental/Makefile.in Thu Aug 22 12:17:11 2002 +++ gnucash-1.6.8/src/experimental/Makefile.in Sun Aug 25 01:31:14 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -167,9 +171,7 @@ SUBDIRS = cbb gg ofx DIST_SUBDIRS = ${SUBDIRS} cgi-bin -EXTRA_DIST = \ - .cvsignore \ - README +EXTRA_DIST = .cvsignore README mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -179,14 +181,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/experimental/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/experimental/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -285,6 +287,11 @@ subdir = src/experimental distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/experimental/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/experimental/cbb/Makefile.in gnucash-1.6.8/src/experimental/cbb/Makefile.in --- gnucash-1.6.8.orig/src/experimental/cbb/Makefile.in Thu Aug 22 12:17:11 2002 +++ gnucash-1.6.8/src/experimental/cbb/Makefile.in Sun Aug 25 01:31:14 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,9 +170,7 @@ SUBDIRS = cbb-engine -EXTRA_DIST = \ - cbb-old-to-cbb-alpha \ - cbb-to-xacc +EXTRA_DIST = cbb-old-to-cbb-alpha cbb-to-xacc mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -178,14 +180,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/experimental/cbb/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/experimental/cbb/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -284,6 +286,11 @@ subdir = src/experimental/cbb distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/experimental/cbb/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/experimental/cbb/cbb-engine/Makefile.in gnucash-1.6.8/src/experimental/cbb/cbb-engine/Makefile.in --- gnucash-1.6.8.orig/src/experimental/cbb/cbb-engine/Makefile.in Thu Aug 22 12:17:11 2002 +++ gnucash-1.6.8/src/experimental/cbb/cbb-engine/Makefile.in Sun Aug 25 01:31:14 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -164,11 +168,7 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -EXTRA_DIST = \ - CBBlib-auto.pl \ - CBBlib-auto.plp \ - CBBlib.pl \ - common.pl +EXTRA_DIST = CBBlib-auto.pl CBBlib-auto.plp CBBlib.pl common.pl mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../../config.h @@ -178,14 +178,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/experimental/cbb/cbb-engine/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/experimental/cbb/cbb-engine/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -198,6 +198,11 @@ subdir = src/experimental/cbb/cbb-engine distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/experimental/cbb/cbb-engine/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/experimental/cgi-bin/Makefile.in gnucash-1.6.8/src/experimental/cgi-bin/Makefile.in --- gnucash-1.6.8.orig/src/experimental/cgi-bin/Makefile.in Thu Aug 22 12:17:14 2002 +++ gnucash-1.6.8/src/experimental/cgi-bin/Makefile.in Sun Aug 25 01:31:15 2002 @@ -128,6 +128,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -136,6 +137,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -156,8 +158,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -170,42 +174,31 @@ CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} -LDADD = \ - ../../engine/libgncengine.la \ - -lxml -lghttp -lglib -lfcgi +LDADD = ../../engine/libgncengine.la -lxml -lghttp -lglib -lfcgi -hello_SOURCES = \ - hello.c +hello_SOURCES = hello.c -hello2_SOURCES = \ - hello2.c +hello2_SOURCES = hello2.c -hello3_SOURCES = \ - hello3.c +hello3_SOURCES = hello3.c -fastcgi_hello_SOURCES = \ - fastcgi-hello.c +fastcgi_hello_SOURCES = fastcgi-hello.c -gnc_server_SOURCES = \ - gnc-server.c +gnc_server_SOURCES = gnc-server.c noinst_HEADERS = -EXTRA_DIST = \ - .cvsignore \ - README +EXTRA_DIST = .cvsignore README # glib puts its header files in a bizarre place ... -INCLUDES = \ - -I/usr/lib/glib/include \ - -I../../engine +INCLUDES = -I/usr/lib/glib/include -I../../engine mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -250,8 +243,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best +DEP_FILES = .deps/fastcgi-hello.P .deps/gnc-server.P .deps/hello.P \ +.deps/hello2.P .deps/hello3.P SOURCES = $(hello_SOURCES) $(hello2_SOURCES) $(fastcgi_hello_SOURCES) $(hello3_SOURCES) $(gnc_server_SOURCES) OBJECTS = $(hello_OBJECTS) $(hello2_OBJECTS) $(fastcgi_hello_OBJECTS) $(hello3_OBJECTS) $(gnc_server_OBJECTS) @@ -259,9 +254,9 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/experimental/cgi-bin/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/experimental/cgi-bin/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -291,9 +286,6 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -316,9 +308,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -389,6 +378,11 @@ subdir = src/experimental/cgi-bin distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/experimental/cgi-bin/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -400,6 +394,37 @@ fi; \ done +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -437,26 +462,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ - distclean-tags distclean-generic clean-am + distclean-tags distclean-depend distclean-generic \ + clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -467,12 +493,14 @@ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur gnucash-1.6.8.orig/src/experimental/gg/Makefile.in gnucash-1.6.8/src/experimental/gg/Makefile.in --- gnucash-1.6.8.orig/src/experimental/gg/Makefile.in Thu Aug 22 12:17:12 2002 +++ gnucash-1.6.8/src/experimental/gg/Makefile.in Sun Aug 25 01:31:15 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -164,11 +168,7 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -EXTRA_DIST = \ - README \ - canvas-test.scm \ - gnucash-sample.scm \ - hello-world.scm +EXTRA_DIST = README canvas-test.scm gnucash-sample.scm hello-world.scm mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -178,14 +178,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/experimental/gg/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/experimental/gg/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -198,6 +198,11 @@ subdir = src/experimental/gg distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/experimental/gg/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/experimental/ofx/Makefile.in gnucash-1.6.8/src/experimental/ofx/Makefile.in --- gnucash-1.6.8.orig/src/experimental/ofx/Makefile.in Thu Aug 22 12:17:12 2002 +++ gnucash-1.6.8/src/experimental/ofx/Makefile.in Sun Aug 25 01:31:15 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,12 +170,7 @@ SUBDIRS = dtd explore parser -EXTRA_DIST = \ - .cvsignore \ - README \ - basic.ofx \ - ofx-dtd-idl.txt \ - ofx1.5.0.10.dtd +EXTRA_DIST = .cvsignore README basic.ofx ofx-dtd-idl.txt ofx1.5.0.10.dtd mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -181,14 +180,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/experimental/ofx/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/experimental/ofx/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -287,6 +286,11 @@ subdir = src/experimental/ofx distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/experimental/ofx/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/experimental/ofx/dtd/Makefile.in gnucash-1.6.8/src/experimental/ofx/dtd/Makefile.in --- gnucash-1.6.8.orig/src/experimental/ofx/dtd/Makefile.in Thu Aug 22 12:17:13 2002 +++ gnucash-1.6.8/src/experimental/ofx/dtd/Makefile.in Sun Aug 25 01:31:15 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -164,18 +168,7 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -EXTRA_DIST = \ - .cvsignore \ - README \ - ofxact.dtd \ - ofxbank.dtd \ - ofxbill.dtd \ - ofxinv.dtd \ - ofxmail.dtd \ - ofxmain.dtd \ - ofxmain.dtd.original \ - ofxprof.dtd \ - ofxsign.dtd +EXTRA_DIST = .cvsignore README ofxact.dtd ofxbank.dtd ofxbill.dtd ofxinv.dtd ofxmail.dtd ofxmain.dtd ofxmain.dtd.original ofxprof.dtd ofxsign.dtd mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../../config.h @@ -185,14 +178,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/experimental/ofx/dtd/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/experimental/ofx/dtd/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -205,6 +198,11 @@ subdir = src/experimental/ofx/dtd distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/experimental/ofx/dtd/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/experimental/ofx/explore/Makefile.in gnucash-1.6.8/src/experimental/ofx/explore/Makefile.in --- gnucash-1.6.8.orig/src/experimental/ofx/explore/Makefile.in Thu Aug 22 12:17:13 2002 +++ gnucash-1.6.8/src/experimental/ofx/explore/Makefile.in Sun Aug 25 01:31:15 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -164,17 +168,7 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -EXTRA_DIST = \ - .cvsignore \ - README.OFX \ - length.cc \ - parse_error \ - post2.ofx \ - reply_post2 \ - req1 \ - req1_orig \ - req5 \ - req7 +EXTRA_DIST = .cvsignore README.OFX length.cc parse_error post2.ofx reply_post2 req1 req1_orig req5 req7 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../../config.h @@ -184,14 +178,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/experimental/ofx/explore/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/experimental/ofx/explore/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -204,6 +198,11 @@ subdir = src/experimental/ofx/explore distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/experimental/ofx/explore/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/experimental/ofx/parser/Makefile.in gnucash-1.6.8/src/experimental/ofx/parser/Makefile.in --- gnucash-1.6.8.orig/src/experimental/ofx/parser/Makefile.in Thu Aug 22 12:17:13 2002 +++ gnucash-1.6.8/src/experimental/ofx/parser/Makefile.in Sun Aug 25 01:31:15 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -164,23 +168,7 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -EXTRA_DIST = \ - DtdParser.C \ - DtdParser.h \ - LICENSE \ - README \ - example.txt \ - parseDtd.C \ - parseOfx.C \ - pfxBaseTypes.C \ - pfxBaseTypes.h \ - pfxCompTypes.C \ - pfxCompTypes.h \ - pfxLangOut.C \ - pfxLangOut.h \ - pfxUtils.C \ - pfxUtils.h \ - simple.C +EXTRA_DIST = DtdParser.C DtdParser.h LICENSE README example.txt parseDtd.C parseOfx.C pfxBaseTypes.C pfxBaseTypes.h pfxCompTypes.C pfxCompTypes.h pfxLangOut.C pfxLangOut.h pfxUtils.C pfxUtils.h simple.C mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../../config.h @@ -190,14 +178,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/experimental/ofx/parser/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/experimental/ofx/parser/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -210,6 +198,11 @@ subdir = src/experimental/ofx/parser distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/experimental/ofx/parser/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/gnc-ui-util.c gnucash-1.6.8/src/gnc-ui-util.c --- gnucash-1.6.8.orig/src/gnc-ui-util.c Thu Aug 15 13:28:29 2002 +++ gnucash-1.6.8/src/gnc-ui-util.c Fri Aug 23 21:39:33 2002 @@ -912,6 +912,7 @@ g_return_if_fail (locale != NULL); saved_locale = g_strdup (setlocale (LC_ALL, NULL)); + saved_locale = saved_locale ? saved_locale : g_strdup ("C"); locale_stack = g_list_prepend (locale_stack, saved_locale); setlocale (LC_ALL, locale); } @@ -1519,9 +1520,9 @@ #define done_state(state) (((state) == DONE_ST) || ((state) == NO_NUM_ST)) -G_INLINE_FUNC long long int multiplier (int num_decimals); + long long int multiplier (int num_decimals); -G_INLINE_FUNC long long int + long long int multiplier (int num_decimals) { switch (num_decimals) diff -Naur gnucash-1.6.8.orig/src/gnome/Makefile.in gnucash-1.6.8/src/gnome/Makefile.in --- gnucash-1.6.8.orig/src/gnome/Makefile.in Thu Aug 22 12:17:18 2002 +++ gnucash-1.6.8/src/gnome/Makefile.in Sun Aug 25 01:31:15 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,66 +170,7 @@ noinst_LIBRARIES = libgncgnome.a -libgncgnome_a_SOURCES = \ - account-tree.c \ - cursors.c \ - dialog-account-picker.c \ - dialog-account.c \ - dialog-budget.c \ - dialog-column-view.c \ - dialog-commodities.c \ - dialog-commodity.c \ - dialog-dup-trans.c \ - dialog-filebox.c \ - dialog-fincalc.c \ - dialog-find-transactions.c \ - dialog-options.c \ - dialog-price-editor.c \ - dialog-print-check.c \ - dialog-progress.c \ - dialog-style-sheet.c \ - dialog-tax-info.c \ - dialog-totd.c \ - dialog-transfer.c \ - dialog-userpass.c \ - dialog-utils.c \ - druid-euro-conv.c \ - druid-commodity.c \ - druid-qif-import.c \ - druid-stock-split.c \ - druid-utils.c \ - extensions.c \ - file-history.c \ - glade-gnc-dialogs.c \ - glade-support.c \ - gnc-amount-edit.c \ - gnc-commodity-edit.c \ - gnc-currency-edit.c \ - gnc-datedelta.c \ - gnc-dateedit.c \ - gnc-gpg.c \ - gnc-html-history.c \ - gnc-html-guppi.c \ - gnc-html.c \ - gnc-http.c \ - gnc-network.c \ - gnc-splash.c \ - gtkselect.c \ - mainwindow-account-tree.c \ - new-user-callbacks.c \ - new-user-funs.c \ - new-user-interface.c \ - print-session.c \ - query-user.c \ - reconcile-list.c \ - top-level.c \ - window-acct-tree.c \ - window-help.c \ - window-main.c \ - window-main-summarybar.c \ - window-reconcile.c \ - window-register.c \ - window-report.c +libgncgnome_a_SOURCES = account-tree.c cursors.c dialog-account-picker.c dialog-account.c dialog-budget.c dialog-column-view.c dialog-commodities.c dialog-commodity.c dialog-dup-trans.c dialog-filebox.c dialog-fincalc.c dialog-find-transactions.c dialog-options.c dialog-price-editor.c dialog-print-check.c dialog-progress.c dialog-style-sheet.c dialog-tax-info.c dialog-totd.c dialog-transfer.c dialog-userpass.c dialog-utils.c druid-euro-conv.c druid-commodity.c druid-qif-import.c druid-stock-split.c druid-utils.c extensions.c file-history.c glade-gnc-dialogs.c glade-support.c gnc-amount-edit.c gnc-commodity-edit.c gnc-currency-edit.c gnc-datedelta.c gnc-dateedit.c gnc-gpg.c gnc-html-history.c gnc-html-guppi.c gnc-html.c gnc-http.c gnc-network.c gnc-splash.c gtkselect.c mainwindow-account-tree.c new-user-callbacks.c new-user-funs.c new-user-interface.c print-session.c query-user.c reconcile-list.c top-level.c window-acct-tree.c window-help.c window-main.c window-main-summarybar.c window-reconcile.c window-register.c window-report.c gnomeappdir = ${datadir}/gnome/apps/Applications @@ -237,90 +182,16 @@ mimedir = $(datadir)/mime-info mime_DATA = gnucash.keys gnucash.mime -noinst_HEADERS = \ - account-tree.h \ - dialog-account-picker.h \ - dialog-account.h \ - dialog-budget.h \ - dialog-column-view.h \ - dialog-commodity.h \ - dialog-fincalc.h \ - dialog-find-transactions.h \ - dialog-options.h \ - dialog-print-check.h \ - dialog-progress.h \ - dialog-style-sheet.h \ - dialog-totd.h \ - dialog-transfer.h \ - dialog-utils.h \ - druid-commodity.h \ - druid-qif-import.h \ - druid-utils.h \ - extensions.h \ - glade-cb-gnc-dialogs.h \ - glade-gnc-dialogs.h \ - glade-support.h \ - gnc-amount-edit.h \ - gnc-commodity-edit.h \ - gnc-currency-edit.h \ - gnc-datedelta.h \ - gnc-dateedit.h \ - gnc-dir.h \ - gnc-gpg.h \ - gnc-html-history.h \ - gnc-html-guppi.h \ - gnc-html.h \ - gnc-http.h \ - gnc-network.h \ - gnc-splash.h \ - gtkselect.h \ - mainwindow-account-tree.h \ - new-user-callbacks.h \ - new-user-funs.h \ - new-user-interface.h \ - print-session.h \ - query-user.h \ - reconcile-list.h \ - top-level.h \ - window-acct-tree.h \ - window-help.h \ - window-main.h \ - window-main-summarybar.h \ - window-reconcile.h \ - window-register.h \ - window-report.h - - -EXTRA_DIST = \ - .cvsignore \ - gnc-dialogs.glade \ - gnc-dir.h.in \ - gnucash.desktop \ - gnucash.keys.in \ - gnucash.mime \ - new-user.glade - - -CFLAGS = @CFLAGS@ \ - ${G_WRAP_COMPILE_ARGS} \ - ${GNOME_PRINT_CFLAGS} \ - ${GDK_PIXBUF_CFLAGS} \ - ${GTKHTML_CFLAGS} \ - ${GHTTP_CFLAGS} \ - ${GUPPI_CFLAGS} - - -INCLUDES = \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/calculation \ - -I${top_srcdir}/src/engine \ - -I${top_srcdir}/src/g-wrap \ - -I${top_srcdir}/src/guile \ - -I${top_srcdir}/src/register \ - -I${top_srcdir}/src/register/gnome \ - ${GUPPI_CFLAGS} \ - ${GNOME_INCLUDEDIR} \ - ${GUILE_INCS} +noinst_HEADERS = account-tree.h dialog-account-picker.h dialog-account.h dialog-budget.h dialog-column-view.h dialog-commodity.h dialog-fincalc.h dialog-find-transactions.h dialog-options.h dialog-print-check.h dialog-progress.h dialog-style-sheet.h dialog-totd.h dialog-transfer.h dialog-utils.h druid-commodity.h druid-qif-import.h druid-utils.h extensions.h glade-cb-gnc-dialogs.h glade-gnc-dialogs.h glade-support.h gnc-amount-edit.h gnc-commodity-edit.h gnc-currency-edit.h gnc-datedelta.h gnc-dateedit.h gnc-dir.h gnc-gpg.h gnc-html-history.h gnc-html-guppi.h gnc-html.h gnc-http.h gnc-network.h gnc-splash.h gtkselect.h mainwindow-account-tree.h new-user-callbacks.h new-user-funs.h new-user-interface.h print-session.h query-user.h reconcile-list.h top-level.h window-acct-tree.h window-help.h window-main.h window-main-summarybar.h window-reconcile.h window-register.h window-report.h + + +EXTRA_DIST = .cvsignore gnc-dialogs.glade gnc-dir.h.in gnucash.desktop gnucash.keys.in gnucash.mime new-user.glade + + +CFLAGS = @CFLAGS@ ${G_WRAP_COMPILE_ARGS} ${GNOME_PRINT_CFLAGS} ${GDK_PIXBUF_CFLAGS} ${GTKHTML_CFLAGS} ${GHTTP_CFLAGS} ${GUPPI_CFLAGS} + + +INCLUDES = -I${top_srcdir}/src -I${top_srcdir}/src/calculation -I${top_srcdir}/src/engine -I${top_srcdir}/src/g-wrap -I${top_srcdir}/src/guile -I${top_srcdir}/src/register -I${top_srcdir}/src/register/gnome ${GUPPI_CFLAGS} ${GNOME_INCLUDEDIR} ${GUILE_INCS} BUILT_SOURCES = gnc-dir.h @@ -377,8 +248,31 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best +DEP_FILES = .deps/account-tree.P .deps/cursors.P \ +.deps/dialog-account-picker.P .deps/dialog-account.P \ +.deps/dialog-budget.P .deps/dialog-column-view.P \ +.deps/dialog-commodities.P .deps/dialog-commodity.P \ +.deps/dialog-dup-trans.P .deps/dialog-filebox.P .deps/dialog-fincalc.P \ +.deps/dialog-find-transactions.P .deps/dialog-options.P \ +.deps/dialog-price-editor.P .deps/dialog-print-check.P \ +.deps/dialog-progress.P .deps/dialog-style-sheet.P \ +.deps/dialog-tax-info.P .deps/dialog-totd.P .deps/dialog-transfer.P \ +.deps/dialog-userpass.P .deps/dialog-utils.P .deps/druid-commodity.P \ +.deps/druid-euro-conv.P .deps/druid-qif-import.P \ +.deps/druid-stock-split.P .deps/druid-utils.P .deps/extensions.P \ +.deps/file-history.P .deps/glade-gnc-dialogs.P .deps/glade-support.P \ +.deps/gnc-amount-edit.P .deps/gnc-commodity-edit.P \ +.deps/gnc-currency-edit.P .deps/gnc-datedelta.P .deps/gnc-dateedit.P \ +.deps/gnc-gpg.P .deps/gnc-html-guppi.P .deps/gnc-html-history.P \ +.deps/gnc-html.P .deps/gnc-http.P .deps/gnc-network.P \ +.deps/gnc-splash.P .deps/gtkselect.P .deps/mainwindow-account-tree.P \ +.deps/new-user-callbacks.P .deps/new-user-funs.P \ +.deps/new-user-interface.P .deps/print-session.P .deps/query-user.P \ +.deps/reconcile-list.P .deps/top-level.P .deps/window-acct-tree.P \ +.deps/window-help.P .deps/window-main-summarybar.P .deps/window-main.P \ +.deps/window-reconcile.P .deps/window-register.P .deps/window-report.P SOURCES = $(libgncgnome_a_SOURCES) OBJECTS = $(libgncgnome_a_OBJECTS) @@ -386,9 +280,9 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/gnome/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/gnome/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -402,9 +296,6 @@ maintainer-clean-noinstLIBRARIES: -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -427,9 +318,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -523,6 +411,11 @@ subdir = src/gnome distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/gnome/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -534,700 +427,38 @@ fi; \ done $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -account-tree.o: account-tree.c ../../config.h ../../src/AccWindow.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/Group.h \ - ../../src/FileDialog.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - account-tree.h ../../src/gnc-ui-util.h dialog-utils.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - ../../src/engine/gnc-engine-util.h ../../src/guile/gnucash.h \ - ../../src/messages.h window-main.h -cursors.o: cursors.c ../../config.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h -dialog-account-picker.o: dialog-account-picker.c ../../config.h \ - dialog-account-picker.h druid-qif-import.h glade-gnc-dialogs.h \ - glade-cb-gnc-dialogs.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - ../../src/gnc-ui-util.h dialog-utils.h query-user.h -dialog-account.o: dialog-account.c ../../config.h ../../src/AccWindow.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/Group.h \ - ../../src/FileDialog.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - ../../src/MultiLedger.h ../../src/engine/Query.h \ - ../../src/register/splitreg.h ../../src/register/basiccell.h \ - ../../src/gnc-ui-common.h ../../src/register/register-common.h \ - ../../src/register/cellblock.h ../../src/register/gtable.h \ - ../../src/register/combocell.h ../../src/register/datecell.h \ - ../../src/register/quickfillcell.h \ - ../../src/register/QuickFill.h ../../src/register/pricecell.h \ - ../../src/gnc-ui-util.h ../../src/register/numcell.h \ - ../../src/register/recncell.h ../../src/register/table-allgui.h \ - ../../src/SplitLedger.h account-tree.h dialog-account.h \ - dialog-utils.h glade-gnc-dialogs.h \ - ../../src/guile/global-options.h ../../src/guile/option-util.h \ - gnc-amount-edit.h gnc-commodity-edit.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - gnc-dateedit.h ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-engine.h ../../src/gnc-ui.h \ - ../../src/messages.h query-user.h window-help.h gnc-html.h \ - gnc-html-history.h window-main.h -dialog-budget.o: dialog-budget.c ../../config.h dialog-budget.h \ - glade-gnc-dialogs.h dialog-utils.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - gnc-datedelta.h ../../src/guile/guile-util.h \ - ../../src/engine/gnc-book.h ../../src/engine/Group.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - ../../src/messages.h ../../src/engine/gnc-engine-util.h \ - ../../src/gnc-ui-util.h -dialog-column-view.o: dialog-column-view.c ../../config.h \ - dialog-column-view.h dialog-options.h \ - ../../src/guile/option-util.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/gnc-ui-common.h \ - ../../src/engine/date.h dialog-utils.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - glade-cb-gnc-dialogs.h glade-gnc-dialogs.h ../../src/messages.h \ - window-report.h gnc-html.h gnc-html-history.h window-main.h -dialog-commodities.o: dialog-commodities.c ../../config.h \ - ../../src/FileDialog.h ../../src/engine/Group.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - dialog-commodity.h glade-gnc-dialogs.h glade-cb-gnc-dialogs.h \ - ../../src/engine/gnc-engine.h dialog-utils.h glade-support.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - ../../src/engine/gnc-engine-util.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h ../../src/messages.h -dialog-commodity.o: dialog-commodity.c ../../config.h \ - ../../src/FileDialog.h ../../src/engine/Group.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - dialog-commodity.h glade-gnc-dialogs.h glade-cb-gnc-dialogs.h \ - ../../src/engine/gnc-engine.h \ - ../../src/engine/gnc-engine-util.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h ../../src/messages.h query-user.h \ - window-help.h gnc-html.h gnc-html-history.h -dialog-dup-trans.o: dialog-dup-trans.c ../../config.h \ - glade-gnc-dialogs.h gnc-dateedit.h \ - ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/messages.h -dialog-filebox.o: dialog-filebox.c ../../config.h ../../src/FileBox.h \ - ../../src/file-history.h ../../src/messages.h \ - ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h -dialog-fincalc.o: dialog-fincalc.c ../../config.h dialog-fincalc.h \ - glade-gnc-dialogs.h dialog-utils.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - ../../src/calculation/finproto.h ../../src/calculation/finvar.h \ - glade-support.h ../../src/guile/global-options.h \ - ../../src/guile/option-util.h ../../src/gnc-ui-common.h \ - gnc-amount-edit.h ../../src/gnc-ui-util.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - gnc-dateedit.h ../../src/engine/gnc-engine-util.h \ - ../../src/messages.h query-user.h -dialog-find-transactions.o: dialog-find-transactions.c ../../config.h \ - ../../src/FileDialog.h ../../src/engine/Group.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - ../../src/MultiLedger.h ../../src/engine/Query.h \ - ../../src/register/splitreg.h ../../src/register/basiccell.h \ - ../../src/gnc-ui-common.h ../../src/register/register-common.h \ - ../../src/register/cellblock.h ../../src/register/gtable.h \ - ../../src/register/combocell.h ../../src/register/datecell.h \ - ../../src/register/quickfillcell.h \ - ../../src/register/QuickFill.h ../../src/register/pricecell.h \ - ../../src/gnc-ui-util.h ../../src/register/numcell.h \ - ../../src/register/recncell.h ../../src/register/table-allgui.h \ - ../../src/SplitLedger.h ../../src/RegWindow.h account-tree.h \ - dialog-find-transactions.h dialog-utils.h \ - glade-cb-gnc-dialogs.h glade-gnc-dialogs.h gnc-amount-edit.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - gnc-dateedit.h ../../src/engine/gnc-engine-util.h \ - ../../src/gnc-ui.h ../../src/messages.h window-help.h \ - gnc-html.h gnc-html-history.h window-register.h -dialog-options.o: dialog-options.c ../../config.h dialog-options.h \ - ../../src/guile/option-util.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/gnc-ui-common.h \ - ../../src/engine/date.h dialog-utils.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/guile/guile-util.h ../../src/engine/gnc-book.h \ - ../../src/engine/Group.h ../../src/engine/Backend.h \ - ../../src/engine/gnc-pricedb.h query-user.h \ - ../../src/guile/gnc-helpers.h ../../src/gnc-ui-util.h \ - ../../src/engine/Query.h account-tree.h gnc-dateedit.h \ - gnc-commodity-edit.h gnc-currency-edit.h \ - ../../src/engine/gnc-engine.h ../../src/guile/global-options.h \ - window-help.h gnc-html.h gnc-html-history.h \ - ../../src/messages.h ../../src/engine/gnc-engine-util.h \ - ../../src/gnc-ui.h -dialog-price-editor.o: dialog-price-editor.c ../../config.h \ - ../../src/FileDialog.h ../../src/engine/Group.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - dialog-utils.h glade-gnc-dialogs.h glade-support.h \ - ../../src/guile/global-options.h ../../src/guile/option-util.h \ - ../../src/gnc-ui-common.h gnc-amount-edit.h \ - ../../src/gnc-ui-util.h gnc-commodity-edit.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - gnc-currency-edit.h gnc-dateedit.h \ - ../../src/engine/gnc-engine-util.h ../../src/gnc-ui.h \ - ../../src/guile/guile-util.h ../../src/messages.h -dialog-print-check.o: dialog-print-check.c ../../config.h \ - ../../src/messages.h dialog-print-check.h print-session.h \ - glade-gnc-dialogs.h dialog-utils.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - window-help.h gnc-html.h gnc-html-history.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h -dialog-progress.o: dialog-progress.c ../../config.h dialog-progress.h \ - glade-gnc-dialogs.h ../../src/messages.h -dialog-style-sheet.o: dialog-style-sheet.c ../../config.h \ - dialog-style-sheet.h dialog-options.h \ - ../../src/guile/option-util.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/gnc-ui-common.h \ - ../../src/engine/date.h glade-gnc-dialogs.h \ - ../../src/messages.h -dialog-tax-info.o: dialog-tax-info.c ../../config.h account-tree.h \ - ../../src/gnc-ui-util.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - dialog-utils.h glade-gnc-dialogs.h glade-support.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - ../../src/engine/gnc-engine-util.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h ../../src/messages.h -dialog-totd.o: dialog-totd.c ../../config.h dialog-totd.h \ - ../../src/guile/global-options.h ../../src/engine/gnc-common.h \ - ../../src/guile/option-util.h ../../src/engine/gnc-commodity.h \ - ../../src/gnc-ui-common.h ../../src/engine/date.h \ - ../../src/gnc-ui.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/messages.h query-user.h \ - ../../src/guile/tip-of-the-day.h -dialog-transfer.o: dialog-transfer.c ../../config.h \ - ../../src/EuroUtils.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/FileDialog.h \ - ../../src/engine/Group.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - ../../src/engine/gnc-book.h ../../src/engine/Backend.h \ - ../../src/engine/gnc-pricedb.h ../../src/MultiLedger.h \ - ../../src/engine/Query.h ../../src/register/splitreg.h \ - ../../src/register/basiccell.h ../../src/gnc-ui-common.h \ - ../../src/register/register-common.h \ - ../../src/register/cellblock.h ../../src/register/gtable.h \ - ../../src/register/combocell.h ../../src/register/datecell.h \ - ../../src/register/quickfillcell.h \ - ../../src/register/QuickFill.h ../../src/register/pricecell.h \ - ../../src/gnc-ui-util.h ../../src/register/numcell.h \ - ../../src/register/recncell.h ../../src/register/table-allgui.h \ - ../../src/SplitLedger.h account-tree.h dialog-transfer.h \ - dialog-utils.h glade-gnc-dialogs.h \ - ../../src/guile/global-options.h ../../src/guile/option-util.h \ - gnc-amount-edit.h ../../src/gnc-component-manager.h \ - ../../src/engine/gnc-event.h gnc-dateedit.h \ - ../../src/engine/gnc-engine-util.h ../../src/gnc-exp-parser.h \ - ../../src/gnc-ui.h ../../src/messages.h query-user.h \ - window-reconcile.h ../../src/RecnWindow.h -dialog-userpass.o: dialog-userpass.c ../../config.h glade-gnc-dialogs.h \ - glade-support.h ../../src/gnc-ui.h ../../src/gnc-ui-common.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h -dialog-utils.o: dialog-utils.c ../../config.h account-tree.h \ - ../../src/gnc-ui-util.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - dialog-utils.h ../../src/guile/global-options.h \ - ../../src/guile/option-util.h ../../src/gnc-ui-common.h \ - ../../src/messages.h ../../src/EuroUtils.h \ - ../../src/engine/Group.h gnc-dir.h \ - ../../src/engine/gnc-engine-util.h ../../src/gnc-ui.h -druid-commodity.o: druid-commodity.c ../../config.h \ - ../../src/FileDialog.h ../../src/engine/Group.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - druid-commodity.h glade-gnc-dialogs.h glade-cb-gnc-dialogs.h \ - ../../src/engine/gnc-engine.h druid-utils.h dialog-commodity.h \ - query-user.h ../../src/gnc-ui.h ../../src/gnc-ui-common.h \ - ../../src/engine/gnc-pricedb-p.h ../../src/engine/BackendP.h \ - ../../src/engine/Query.h ../../src/engine/gnc-engine-util.h -druid-euro-conv.o: druid-euro-conv.c ../../config.h \ - ../../src/FileDialog.h ../../src/engine/Group.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - account-tree.h ../../src/gnc-ui-util.h dialog-utils.h \ - druid-utils.h glade-gnc-dialogs.h glade-support.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - ../../src/gnc-ui.h ../../src/gnc-ui-common.h \ - ../../src/messages.h query-user.h ../../src/EuroUtils.h -druid-qif-import.o: druid-qif-import.c ../../config.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/FileBox.h \ - ../../src/FileDialog.h ../../src/engine/Group.h \ - ../../src/engine/gnc-book.h ../../src/engine/Backend.h \ - ../../src/engine/gnc-pricedb.h dialog-account-picker.h \ - druid-qif-import.h glade-gnc-dialogs.h glade-cb-gnc-dialogs.h \ - ../../src/gnc-ui.h ../../src/gnc-ui-common.h dialog-commodity.h \ - ../../src/engine/gnc-engine.h dialog-utils.h druid-utils.h \ - ../../src/guile/global-options.h ../../src/guile/option-util.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - ../../src/engine/gnc-engine-util.h ../../src/gnc-ui-util.h \ - ../../src/messages.h query-user.h window-help.h gnc-html.h \ - gnc-html-history.h -druid-stock-split.o: druid-stock-split.c ../../config.h \ - ../../src/FileDialog.h ../../src/engine/Group.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - account-tree.h ../../src/gnc-ui-util.h dialog-utils.h \ - druid-utils.h glade-gnc-dialogs.h glade-support.h \ - gnc-amount-edit.h ../../src/gnc-component-manager.h \ - ../../src/engine/gnc-event.h gnc-currency-edit.h gnc-dateedit.h \ - ../../src/gnc-exp-parser.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h ../../src/messages.h query-user.h -druid-utils.o: druid-utils.c ../../config.h dialog-utils.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h druid-utils.h \ - ../../src/engine/gnc-engine-util.h -extensions.o: extensions.c ../../config.h extensions.h \ - ../../src/guile/guile-util.h ../../src/engine/date.h \ - ../../src/engine/gnc-book.h ../../src/engine/Group.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - ../../src/engine/gnc-engine-util.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h -file-history.o: file-history.c ../../config.h ../../src/file-history.h \ - ../../src/FileDialog.h ../../src/engine/Group.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - ../../src/gnc-ui.h ../../src/gnc-ui-common.h -glade-gnc-dialogs.o: glade-gnc-dialogs.c ../../config.h \ - glade-cb-gnc-dialogs.h glade-gnc-dialogs.h glade-support.h -glade-support.o: glade-support.c ../../config.h glade-support.h -gnc-amount-edit.o: gnc-amount-edit.c ../../config.h gnc-amount-edit.h \ - ../../src/engine/gnc-numeric.h ../../src/gnc-ui-util.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - ../../src/gnc-exp-parser.h ../../src/messages.h query-user.h \ - ../../src/engine/gnc-engine-util.h -gnc-commodity-edit.o: gnc-commodity-edit.c ../../config.h \ - gnc-commodity-edit.h ../../src/engine/gnc-commodity.h \ - dialog-commodity.h glade-gnc-dialogs.h glade-cb-gnc-dialogs.h \ - ../../src/engine/gnc-engine.h ../../src/guile/guile-util.h \ - ../../src/engine/date.h ../../src/engine/gnc-book.h \ - ../../src/engine/Group.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - ../../src/messages.h -gnc-currency-edit.o: gnc-currency-edit.c ../../config.h \ - gnc-currency-edit.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-engine.h ../../src/messages.h -gnc-datedelta.o: gnc-datedelta.c ../../config.h gnc-datedelta.h \ - ../../src/messages.h ../../src/engine/date.h -gnc-dateedit.o: gnc-dateedit.c ../../config.h gnc-dateedit.h \ - ../../src/messages.h ../../src/engine/date.h -gnc-gpg.o: gnc-gpg.c ../../config.h ../../src/guile/global-options.h \ - ../../src/engine/gnc-common.h ../../src/guile/option-util.h \ - ../../src/engine/gnc-commodity.h ../../src/gnc-ui-common.h \ - ../../src/engine/date.h ../../src/gnc-ui.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - gnc-html.h gnc-html-history.h gnc-network.h gnc-gpg.h -gnc-html-guppi.o: gnc-html-guppi.c ../../config.h \ - ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h gnc-html.h gnc-html-history.h \ - gnc-html-guppi.h ../../src/gnc-ui-util.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h -gnc-html-history.o: gnc-html-history.c ../../config.h gnc-html-history.h \ - gnc-html.h -gnc-html.o: gnc-html.c ../../config.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - ../../src/engine/Group.h ../../src/RegWindow.h \ - ../../src/guile/File.h ../../src/FileBox.h \ - ../../src/FileDialog.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - dialog-utils.h window-register.h ../../src/MultiLedger.h \ - ../../src/engine/Query.h ../../src/register/splitreg.h \ - ../../src/register/basiccell.h ../../src/gnc-ui-common.h \ - ../../src/register/register-common.h \ - ../../src/register/cellblock.h ../../src/register/gtable.h \ - ../../src/register/combocell.h ../../src/register/datecell.h \ - ../../src/register/quickfillcell.h \ - ../../src/register/QuickFill.h ../../src/register/pricecell.h \ - ../../src/gnc-ui-util.h ../../src/register/numcell.h \ - ../../src/register/recncell.h ../../src/register/table-allgui.h \ - ../../src/SplitLedger.h print-session.h glade-gnc-dialogs.h \ - ../../src/guile/global-options.h ../../src/guile/option-util.h \ - ../../src/engine/gnc-engine-util.h gnc-gpg.h gnc-html.h \ - gnc-html-history.h gnc-http.h gnc-network.h ../../src/gnc-ui.h \ - query-user.h window-help.h window-main.h window-report.h \ - dialog-options.h ../../src/messages.h -gnc-http.o: gnc-http.c ../../config.h gnc-http.h ../../src/messages.h -gnc-network.o: gnc-network.c ../../config.h \ - ../../src/guile/global-options.h ../../src/engine/gnc-common.h \ - ../../src/guile/option-util.h ../../src/engine/gnc-commodity.h \ - ../../src/gnc-ui-common.h ../../src/engine/date.h \ - ../../src/gnc-ui.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h gnc-gpg.h gnc-html.h \ - gnc-html-history.h gnc-network.h query-user.h \ - ../../src/messages.h -gnc-splash.o: gnc-splash.c ../../config.h dialog-utils.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h gnc-splash.h -gtkselect.o: gtkselect.c gtkselect.h -mainwindow-account-tree.o: mainwindow-account-tree.c ../../config.h \ - mainwindow-account-tree.h account-tree.h \ - ../../src/gnc-ui-util.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h -new-user-callbacks.o: new-user-callbacks.c ../../config.h \ - ../../src/FileDialog.h ../../src/engine/Group.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - dialog-utils.h glade-support.h gnc-commodity-edit.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - gnc-dir.h ../../src/gnc-ui-util.h \ - ../../src/engine/io-example-account.h ../../src/engine/sixtp.h \ - ../../src/engine/gnc-xml-helper.h new-user-callbacks.h \ - new-user-funs.h gnc-amount-edit.h new-user-interface.h \ - query-user.h ../../src/guile/global-options.h \ - ../../src/guile/option-util.h ../../src/gnc-ui-common.h -new-user-funs.o: new-user-funs.c ../../config.h druid-qif-import.h \ - glade-gnc-dialogs.h glade-cb-gnc-dialogs.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - druid-utils.h new-user-callbacks.h new-user-interface.h \ - new-user-funs.h gnc-amount-edit.h ../../src/gnc-ui-util.h \ - gnc-commodity-edit.h ../../src/engine/Group.h glade-support.h \ - gnc-currency-edit.h window-help.h gnc-html.h gnc-html-history.h \ - ../../src/engine/io-example-account.h ../../src/engine/sixtp.h \ - ../../src/engine/gnc-xml-helper.h -new-user-interface.o: new-user-interface.c ../../config.h \ - new-user-callbacks.h new-user-interface.h glade-support.h -print-session.o: print-session.c ../../config.h glade-cb-gnc-dialogs.h \ - ../../src/gnc-ui.h ../../src/gnc-ui-common.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/messages.h print-session.h \ - glade-gnc-dialogs.h window-help.h gnc-html.h gnc-html-history.h -query-user.o: query-user.c ../../config.h ../../src/gnc-ui.h \ - ../../src/gnc-ui-common.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - ../../src/messages.h query-user.h \ - ../../src/engine/gnc-engine-util.h -reconcile-list.o: reconcile-list.c ../../config.h ../../src/FileDialog.h \ - ../../src/engine/Group.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - ../../src/engine/gnc-book.h ../../src/engine/Backend.h \ - ../../src/engine/gnc-pricedb.h dialog-utils.h \ - ../../src/guile/global-options.h ../../src/guile/option-util.h \ - ../../src/gnc-ui-common.h ../../src/gnc-ui-util.h \ - ../../src/messages.h reconcile-list.h ../../src/engine/Query.h -top-level.o: top-level.c ../../config.h ../../src/AccWindow.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/engine/Group.h \ - ../../src/FileBox.h ../../src/FileDialog.h \ - ../../src/engine/gnc-book.h ../../src/engine/Backend.h \ - ../../src/engine/gnc-pricedb.h ../../src/SplitLedger.h \ - ../../src/register/splitreg.h ../../src/register/basiccell.h \ - ../../src/gnc-ui-common.h ../../src/register/register-common.h \ - ../../src/register/cellblock.h ../../src/register/gtable.h \ - ../../src/register/combocell.h ../../src/register/datecell.h \ - ../../src/register/quickfillcell.h \ - ../../src/register/QuickFill.h ../../src/register/pricecell.h \ - ../../src/gnc-ui-util.h ../../src/register/numcell.h \ - ../../src/register/recncell.h ../../src/register/table-allgui.h \ - ../../src/engine/TransLog.h \ - ../../src/guile/argv-list-converters.h dialog-account.h \ - dialog-transfer.h dialog-utils.h extensions.h \ - ../../src/guile/global-options.h ../../src/guile/option-util.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - ../../src/engine/gnc-engine-util.h gnc-splash.h gnc-network.h \ - gnc-html-guppi.h gnc-html.h gnc-html-history.h gnc-gpg.h \ - ../../src/gnc-ui.h ../../src/guile/gnc.h \ - ../../src/register/gnome/gnucash-color.h \ - ../../src/register/gnome/gnucash-sheet.h \ - ../../src/register/gnome/gnucash-style.h \ - ../../src/guile/gnucash.h ../../src/guile/guile-util.h \ - ../../src/messages.h top-level.h window-main.h window-help.h \ - window-acct-tree.h mainwindow-account-tree.h account-tree.h \ - window-report.h dialog-options.h new-user-interface.h \ - new-user-funs.h gnc-amount-edit.h gnc-commodity-edit.h -window-acct-tree.o: window-acct-tree.c ../../config.h \ - ../../src/AccWindow.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - ../../src/engine/Group.h ../../src/RegWindow.h \ - ../../src/FileBox.h ../../src/FileDialog.h \ - ../../src/engine/gnc-book.h ../../src/engine/Backend.h \ - ../../src/engine/gnc-pricedb.h ../../src/engine/Scrub.h \ - account-tree.h ../../src/gnc-ui-util.h dialog-account.h \ - dialog-transfer.h dialog-utils.h ../../src/file-history.h \ - ../../src/guile/global-options.h ../../src/guile/option-util.h \ - ../../src/gnc-ui-common.h ../../src/gnc-component-manager.h \ - ../../src/engine/gnc-event.h ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-engine.h ../../src/gnc-ui.h \ - ../../src/guile/gnucash.h gtkselect.h ../../src/messages.h \ - mainwindow-account-tree.h top-level.h window-main.h \ - window-acct-tree.h window-help.h gnc-html.h gnc-html-history.h \ - window-reconcile.h ../../src/RecnWindow.h window-register.h \ - ../../src/MultiLedger.h ../../src/engine/Query.h \ - ../../src/register/splitreg.h ../../src/register/basiccell.h \ - ../../src/register/register-common.h \ - ../../src/register/cellblock.h ../../src/register/gtable.h \ - ../../src/register/combocell.h ../../src/register/datecell.h \ - ../../src/register/quickfillcell.h \ - ../../src/register/QuickFill.h ../../src/register/pricecell.h \ - ../../src/register/numcell.h ../../src/register/recncell.h \ - ../../src/register/table-allgui.h ../../src/SplitLedger.h \ - window-report.h dialog-options.h \ - ../../src/engine/io-gncxml-v2.h ../../src/guile/gnc.h -window-help.o: window-help.c ../../config.h ../../src/guile/File.h \ - dialog-utils.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - glade-cb-gnc-dialogs.h glade-gnc-dialogs.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - ../../src/engine/gnc-engine-util.h gnc-html-history.h \ - gnc-html.h window-help.h -window-main-summarybar.o: window-main-summarybar.c ../../config.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - ../../src/engine/date.h ../../src/EuroUtils.h \ - ../../src/FileDialog.h ../../src/engine/Group.h \ - ../../src/engine/gnc-book.h ../../src/engine/Backend.h \ - ../../src/engine/gnc-pricedb.h dialog-utils.h \ - ../../src/guile/global-options.h ../../src/guile/option-util.h \ - ../../src/gnc-ui-common.h ../../src/gnc-component-manager.h \ - ../../src/engine/gnc-event.h ../../src/engine/gnc-engine-util.h \ - ../../src/gnc-ui-util.h ../../src/gnc-ui.h gtkselect.h \ - ../../src/messages.h top-level.h window-main.h \ - window-main-summarybar.h -window-main.o: window-main.c ../../config.h ../../src/guile/gfec.h \ - ../../src/engine/gnc-engine.h ../../src/engine/gnc-commodity.h \ - ../../src/gnc-ui.h ../../src/gnc-ui-common.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - ../../src/guile/gnucash.h ../../src/engine/io-utils.h \ - ../../src/engine/gnc-book.h ../../src/engine/Group.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - top-level.h window-main.h extensions.h ../../src/FileBox.h \ - ../../src/FileDialog.h dialog-account.h ../../src/AccWindow.h \ - dialog-fincalc.h glade-gnc-dialogs.h dialog-find-transactions.h \ - ../../src/MultiLedger.h ../../src/engine/Query.h \ - ../../src/register/splitreg.h ../../src/register/basiccell.h \ - ../../src/register/register-common.h \ - ../../src/register/cellblock.h ../../src/register/gtable.h \ - ../../src/register/combocell.h ../../src/register/datecell.h \ - ../../src/register/quickfillcell.h \ - ../../src/register/QuickFill.h ../../src/register/pricecell.h \ - ../../src/gnc-ui-util.h ../../src/register/numcell.h \ - ../../src/register/recncell.h ../../src/register/table-allgui.h \ - ../../src/SplitLedger.h dialog-options.h \ - ../../src/guile/option-util.h dialog-totd.h dialog-transfer.h \ - dialog-utils.h window-help.h gnc-html.h gnc-html-history.h \ - window-main-summarybar.h window-acct-tree.h \ - mainwindow-account-tree.h account-tree.h window-reconcile.h \ - ../../src/RecnWindow.h window-register.h ../../src/RegWindow.h \ - window-report.h ../../src/file-history.h \ - ../../src/guile/global-options.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - query-user.h -window-reconcile.o: window-reconcile.c ../../config.h \ - ../../src/AccWindow.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - ../../src/engine/Group.h ../../src/MultiLedger.h \ - ../../src/engine/Query.h ../../src/register/splitreg.h \ - ../../src/register/basiccell.h ../../src/gnc-ui-common.h \ - ../../src/register/register-common.h \ - ../../src/register/cellblock.h ../../src/register/gtable.h \ - ../../src/register/combocell.h ../../src/register/datecell.h \ - ../../src/register/quickfillcell.h \ - ../../src/register/QuickFill.h ../../src/register/pricecell.h \ - ../../src/gnc-ui-util.h ../../src/register/numcell.h \ - ../../src/register/recncell.h ../../src/register/table-allgui.h \ - ../../src/SplitLedger.h ../../src/RegWindow.h \ - ../../src/engine/Scrub.h dialog-transfer.h dialog-utils.h \ - ../../src/guile/global-options.h ../../src/guile/option-util.h \ - gnc-amount-edit.h ../../src/gnc-component-manager.h \ - ../../src/engine/gnc-event.h gnc-dateedit.h \ - ../../src/engine/gnc-engine-util.h ../../src/gnc-ui.h \ - ../../src/guile/guile-util.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - ../../src/messages.h query-user.h reconcile-list.h \ - window-help.h gnc-html.h gnc-html-history.h window-reconcile.h \ - ../../src/RecnWindow.h window-register.h -window-register.o: window-register.c ../../config.h \ - ../../src/AccWindow.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - ../../src/engine/Group.h ../../src/EuroUtils.h \ - ../../src/FileDialog.h ../../src/engine/gnc-book.h \ - ../../src/engine/Backend.h ../../src/engine/gnc-pricedb.h \ - ../../src/MultiLedger.h ../../src/engine/Query.h \ - ../../src/register/splitreg.h ../../src/register/basiccell.h \ - ../../src/gnc-ui-common.h ../../src/register/register-common.h \ - ../../src/register/cellblock.h ../../src/register/gtable.h \ - ../../src/register/combocell.h ../../src/register/datecell.h \ - ../../src/register/quickfillcell.h \ - ../../src/register/QuickFill.h ../../src/register/pricecell.h \ - ../../src/gnc-ui-util.h ../../src/register/numcell.h \ - ../../src/register/recncell.h ../../src/register/table-allgui.h \ - ../../src/SplitLedger.h ../../src/RegWindow.h \ - ../../src/engine/Scrub.h dialog-find-transactions.h \ - dialog-transfer.h dialog-utils.h \ - ../../src/guile/global-options.h ../../src/guile/option-util.h \ - ../../src/gnc-component-manager.h ../../src/engine/gnc-event.h \ - gnc-dateedit.h ../../src/engine/gnc-engine-util.h \ - ../../src/gnc-ui.h ../../src/register/gnome/gnucash-sheet.h \ - ../../src/messages.h query-user.h window-help.h gnc-html.h \ - gnc-html-history.h window-reconcile.h ../../src/RecnWindow.h \ - window-register.h -window-report.o: window-report.c ../../config.h dialog-options.h \ - ../../src/guile/option-util.h ../../src/engine/gnc-common.h \ - ../../src/engine/gnc-commodity.h ../../src/gnc-ui-common.h \ - ../../src/engine/date.h dialog-utils.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/gnc-numeric.h ../../src/engine/kvp_frame.h \ - glade-gnc-dialogs.h ../../src/gnc-component-manager.h \ - ../../src/engine/gnc-event.h ../../src/engine/gnc-engine-util.h \ - gnc-html-history.h gnc-html.h ../../src/gnc-ui.h query-user.h \ - top-level.h window-main.h window-report.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -1267,27 +498,27 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -1300,11 +531,13 @@ clean-libtool maintainer-clean-libtool uninstall-gnomeappDATA \ install-gnomeappDATA uninstall-mimeDATA install-mimeDATA tags \ mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -distdir info-am info dvi-am dvi check check-am installcheck-am \ -installcheck install-exec-am install-exec install-data-am install-data \ -install-am install uninstall-am uninstall all-redirect all-am all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distdir mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean gnucash.keys: gnucash.keys.in diff -Naur gnucash-1.6.8.orig/src/gnome/new-user-callbacks.c gnucash-1.6.8/src/gnome/new-user-callbacks.c --- gnucash-1.6.8.orig/src/gnome/new-user-callbacks.c Thu Jul 4 07:09:08 2002 +++ gnucash-1.6.8/src/gnome/new-user-callbacks.c Fri Aug 23 21:59:05 2002 @@ -214,8 +214,10 @@ * Mac OS X 10.1 and earlier, not only doesn't have LC_MESSAGES * setlocale can sometimes return NULL instead of "C" */ - locale = g_strdup(setlocale(LC_ALL, NULL) ? - setlocale(LC_ALL, NULL) : "C"); + if (getenv("LANG")) + locale = g_strdup(getenv("LANG")); + else + locale = g_strdup(default_locale); #endif i = strlen(locale); diff -Naur gnucash-1.6.8.orig/src/guile/Makefile.am gnucash-1.6.8/src/guile/Makefile.am --- gnucash-1.6.8.orig/src/guile/Makefile.am Fri Apr 5 16:24:52 2002 +++ gnucash-1.6.8/src/guile/Makefile.am Fri Aug 23 21:39:33 2002 @@ -13,6 +13,9 @@ argv-list-converters.c \ File.c +EXTRA_libgncguile_a_SOURCES = scm_strptime.c +libgncguile_a_LIBADD = @SCM_STRPTIME_O@ +libgncguile_a_DEPENDENCIES = @SCM_STRPTIME_O@ docdir = ${GNC_DOC_INSTALL_DIR} doc_DATA = \ gnc.html diff -Naur gnucash-1.6.8.orig/src/guile/Makefile.in gnucash-1.6.8/src/guile/Makefile.in --- gnucash-1.6.8.orig/src/guile/Makefile.in Thu Aug 22 12:17:16 2002 +++ gnucash-1.6.8/src/guile/Makefile.in Sun Aug 25 01:31:16 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,68 +170,30 @@ noinst_LIBRARIES = libgncguile.a -libgncguile_a_SOURCES = \ - gfec.c \ - gnc.c \ - gnc-helpers.c \ - gnucash.c \ - guile-util.c \ - option-util.c \ - global-options.c \ - tip-of-the-day.c \ - argv-list-converters.c \ - File.c +libgncguile_a_SOURCES = gfec.c gnc.c gnc-helpers.c gnucash.c guile-util.c option-util.c global-options.c tip-of-the-day.c argv-list-converters.c File.c +EXTRA_libgncguile_a_SOURCES = scm_strptime.c +libgncguile_a_LIBADD = @SCM_STRPTIME_O@ +libgncguile_a_DEPENDENCIES = @SCM_STRPTIME_O@ docdir = ${GNC_DOC_INSTALL_DIR} -doc_DATA = \ - gnc.html +doc_DATA = gnc.html configdir = ${GNC_CONFIGDIR} -config_DATA = \ - config +config_DATA = config -noinst_HEADERS = \ - File.h \ - gfec.h \ - global-options.h \ - gnc.h \ - gnc-helpers.h \ - gnucash.h \ - guile-util.h \ - i18n.h \ - tip-of-the-day.h \ - argv-list-converters.h \ - option-util.h - - -EXTRA_DIST = \ - .cvsignore \ - config \ - design.txt \ - gnc.gwp \ - gnucash.c.in \ - i18n.h.in - - -CFLAGS = \ - @CFLAGS@ \ - ${G_WRAP_COMPILE_ARGS} \ - ${GLIB_CFLAGS} \ - ${GNOME_PRINT_CFLAGS} \ - ${GTKHTML_CFLAGS} \ - ${GDK_PIXBUF_CFLAGS} - - -INCLUDES = \ - -I.. \ - -I../engine \ - -I../gnome \ - -I../register \ - ${GNOME_INCLUDEDIR} \ - ${GUILE_INCS} +noinst_HEADERS = File.h gfec.h global-options.h gnc.h gnc-helpers.h gnucash.h guile-util.h i18n.h tip-of-the-day.h argv-list-converters.h option-util.h + + +EXTRA_DIST = .cvsignore config design.txt gnc.gwp gnucash.c.in i18n.h.in + + +CFLAGS = @CFLAGS@ ${G_WRAP_COMPILE_ARGS} ${GLIB_CFLAGS} ${GNOME_PRINT_CFLAGS} ${GTKHTML_CFLAGS} ${GDK_PIXBUF_CFLAGS} + + +INCLUDES = -I.. -I../engine -I../gnome -I../register ${GNOME_INCLUDEDIR} ${GUILE_INCS} # This has to be in BUILT_SOURCES because other files depend on it, # but it's never a target itself. @@ -244,7 +210,6 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libgncguile_a_LIBADD = libgncguile_a_OBJECTS = gfec.$(OBJEXT) gnc.$(OBJEXT) \ gnc-helpers.$(OBJEXT) gnucash.$(OBJEXT) guile-util.$(OBJEXT) \ option-util.$(OBJEXT) global-options.$(OBJEXT) tip-of-the-day.$(OBJEXT) \ @@ -263,18 +228,22 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best -SOURCES = $(libgncguile_a_SOURCES) +DEP_FILES = .deps/File.P .deps/argv-list-converters.P .deps/gfec.P \ +.deps/global-options.P .deps/gnc-helpers.P .deps/gnc.P .deps/gnucash.P \ +.deps/guile-util.P .deps/option-util.P .deps/scm_strptime.P \ +.deps/tip-of-the-day.P +SOURCES = $(libgncguile_a_SOURCES) $(EXTRA_libgncguile_a_SOURCES) OBJECTS = $(libgncguile_a_OBJECTS) all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/guile/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/guile/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -288,9 +257,6 @@ maintainer-clean-noinstLIBRARIES: -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -313,9 +279,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -409,6 +372,11 @@ subdir = src/guile distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/guile/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -420,83 +388,38 @@ fi; \ done $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -argv-list-converters.o: argv-list-converters.c ../../config.h \ - argv-list-converters.h -File.o: File.c ../../config.h File.h ../messages.h \ - ../engine/gnc-engine-util.h ../engine/gnc-common.h \ - ../engine/gnc-commodity.h ../engine/gnc-numeric.h -gfec.o: gfec.c gfec.h -global-options.o: global-options.c ../../config.h global-options.h \ - ../engine/gnc-common.h option-util.h ../engine/gnc-commodity.h \ - ../gnc-ui-common.h ../engine/date.h guile-util.h \ - ../engine/gnc-book.h ../engine/Group.h ../engine/Account.h \ - ../engine/GNCId.h ../engine/guid.h ../engine/Transaction.h \ - ../engine/gnc-numeric.h ../engine/kvp_frame.h \ - ../engine/Backend.h ../engine/gnc-pricedb.h \ - ../engine/gnc-engine-util.h ../gnc-ui-util.h -gnc-helpers.o: gnc-helpers.c ../../config.h ../engine/gnc-engine-util.h \ - ../engine/gnc-common.h ../engine/gnc-commodity.h \ - ../engine/gnc-numeric.h gnc-helpers.h ../gnc-ui-util.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/guid.h \ - ../engine/Transaction.h ../engine/kvp_frame.h ../engine/date.h \ - ../engine/Query.h guile-util.h ../engine/gnc-book.h \ - ../engine/Group.h ../engine/Backend.h ../engine/gnc-pricedb.h \ - gnc.h ../messages.h -gnc.o: gnc.c gnc.h gnucash.h ../FileDialog.h ../../config.h \ - ../engine/Group.h ../engine/Account.h ../engine/GNCId.h \ - ../engine/guid.h ../engine/Transaction.h ../engine/gnc-common.h \ - ../engine/gnc-commodity.h ../engine/gnc-numeric.h \ - ../engine/kvp_frame.h ../engine/date.h ../engine/gnc-book.h \ - ../engine/Backend.h ../engine/gnc-pricedb.h ../FileBox.h \ - ../EuroUtils.h ../gnc-component-manager.h ../engine/gnc-event.h \ - ../gnc-ui.h ../gnc-ui-common.h ../file-history.h \ - ../gnc-exp-parser.h gnc-helpers.h ../gnc-ui-util.h \ - ../engine/Query.h ../gnome/extensions.h \ - ../engine/gnc-engine-util.h guile-util.h ../engine/gnc-engine.h \ - ../gnome/window-main.h global-options.h option-util.h \ - ../gnome/query-user.h ../gnome/print-session.h \ - ../gnome/glade-gnc-dialogs.h ../gnome/dialog-column-view.h \ - ../gnome/dialog-print-check.h ../gnome/dialog-budget.h \ - ../gnome/dialog-progress.h ../gnome/dialog-style-sheet.h \ - ../gnome/dialog-totd.h ../gnome/dialog-commodity.h \ - ../gnome/glade-cb-gnc-dialogs.h ../gnome/druid-commodity.h \ - ../gnome/top-level.h ../gnome/window-help.h ../gnome/gnc-html.h \ - ../gnome/gnc-html-history.h ../gnome/window-report.h \ - ../gnome/dialog-options.h ../gnome/dialog-find-transactions.h \ - ../MultiLedger.h ../register/splitreg.h ../register/basiccell.h \ - ../register/register-common.h ../register/cellblock.h \ - ../register/gtable.h ../register/combocell.h \ - ../register/datecell.h ../register/quickfillcell.h \ - ../register/QuickFill.h ../register/pricecell.h \ - ../register/numcell.h ../register/recncell.h \ - ../register/table-allgui.h ../SplitLedger.h -gnucash.o: gnucash.c ../../config.h ../FileDialog.h ../engine/Group.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/guid.h \ - ../engine/Transaction.h ../engine/gnc-common.h \ - ../engine/gnc-commodity.h ../engine/gnc-numeric.h \ - ../engine/kvp_frame.h ../engine/date.h ../engine/gnc-book.h \ - ../engine/Backend.h ../engine/gnc-pricedb.h \ - ../engine/gnc-engine-util.h ../engine/gnc-engine.h gnc.h \ - gnucash.h i18n.h ../messages.h -guile-util.o: guile-util.c ../../config.h global-options.h \ - ../engine/gnc-common.h option-util.h ../engine/gnc-commodity.h \ - ../gnc-ui-common.h ../engine/date.h ../engine/gnc-engine-util.h \ - ../engine/gnc-numeric.h gnc-helpers.h ../gnc-ui-util.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/guid.h \ - ../engine/Transaction.h ../engine/kvp_frame.h ../engine/Query.h \ - gnc.h guile-util.h ../engine/gnc-book.h ../engine/Group.h \ - ../engine/Backend.h ../engine/gnc-pricedb.h ../messages.h -option-util.o: option-util.c ../../config.h guile-util.h \ - ../engine/date.h ../engine/gnc-book.h ../engine/Group.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/guid.h \ - ../engine/Transaction.h ../engine/gnc-common.h \ - ../engine/gnc-commodity.h ../engine/gnc-numeric.h \ - ../engine/kvp_frame.h ../engine/Backend.h \ - ../engine/gnc-pricedb.h option-util.h ../gnc-ui-common.h \ - gnc-helpers.h ../gnc-ui-util.h ../engine/Query.h gnc.h \ - ../engine/gnc-engine-util.h ../gnc-ui.h -tip-of-the-day.o: tip-of-the-day.c tip-of-the-day.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -536,27 +459,27 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -569,11 +492,13 @@ clean-libtool maintainer-clean-libtool uninstall-configDATA \ install-configDATA uninstall-docDATA install-docDATA tags \ mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -distdir info-am info dvi-am dvi check check-am installcheck-am \ -installcheck install-exec-am install-exec install-data-am install-data \ -install-am install uninstall-am uninstall all-redirect all-am all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distdir mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean gnc.h gnc.c gnc.html: gnc.gwp diff -Naur gnucash-1.6.8.orig/src/guile/gnucash.c.in gnucash-1.6.8/src/guile/gnucash.c.in --- gnucash-1.6.8.orig/src/guile/gnucash.c.in Sat Jul 7 19:22:44 2001 +++ gnucash-1.6.8/src/guile/gnucash.c.in Fri Aug 23 21:39:33 2002 @@ -72,7 +72,9 @@ gnc_engine_init(argc, argv); gnc_gw_init (); - +#ifndef HAVE_STRPTIME + gh_new_procedure("strptime",scm_strptime, 2, 0, 0); +#endif if(!bootstrap_scm) { char *string; @@ -200,7 +202,7 @@ #endif /* It seems we need this so guile can find the locale. */ - setlocale(LC_ALL, ""); + setlocale(LC_ALL, "C"); gh_enter(argc, argv, gnucash_main_helper); /* This will never return. */ diff -Naur gnucash-1.6.8.orig/src/guile/scm_strptime.c gnucash-1.6.8/src/guile/scm_strptime.c --- gnucash-1.6.8.orig/src/guile/scm_strptime.c Thu Jan 1 09:00:00 1970 +++ gnucash-1.6.8/src/guile/scm_strptime.c Fri Aug 23 21:39:33 2002 @@ -0,0 +1,183 @@ +/* Copyright (C) 1995,1996,1997,1998, 1999, 2000 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA + * + * As a special exception, the Free Software Foundation gives permission + * for additional uses of the text contained in its release of GUILE. + * + * The exception is that, if you link the GUILE library with other files + * to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the GUILE library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the + * Free Software Foundation under the name GUILE. If you copy + * code from other Free Software Foundation releases into a copy of + * GUILE, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for GUILE, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. */ + +/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999, + gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */ + + + +#include +#include "libguile/__scm.h" +#include "libguile.h" + +#ifdef HAVE_UNISTD_H +#include +#endif + + +# ifdef HAVE_SYS_TYPES_H +# include +# endif + +# ifdef TIME_WITH_SYS_TIME +# include +# include +# else +# ifdef HAVE_SYS_TIME_H +# include +# else +# ifdef HAVE_TIME_H +# include +# endif +# endif +# endif + +#ifdef HAVE_SYS_TIMES_H +# include +#endif + +#ifdef HAVE_SYS_TIMEB_H +# include +#endif + +#ifndef tzname /* For SGI. */ +extern char *tzname[]; /* RS6000 and others reject char **tzname. */ +#endif + +#ifdef MISSING_STRPTIME_DECL +extern char *strptime (); +#endif + +/* This should be figured out by autoconf. */ +#if ! defined(CLKTCK) && defined(CLK_TCK) +# define CLKTCK CLK_TCK +#endif +#if ! defined(CLKTCK) && defined(CLOCKS_PER_SEC) +# define CLKTCK CLOCKS_PER_SEC +#endif +#if ! defined(CLKTCK) +# define CLKTCK 60 +#endif + +#include "strptime.h" + +#ifdef __STDC__ +# define timet time_t +#else +# define timet long +#endif +static SCM +filltime (struct tm *bd_time, int zoff, char *zname); + +static SCM +filltime (struct tm *bd_time, int zoff, char *zname) +{ + SCM result = scm_make_vector (SCM_MAKINUM(11), SCM_UNDEFINED); + + SCM_VELTS (result)[0] = SCM_MAKINUM (bd_time->tm_sec); + SCM_VELTS (result)[1] = SCM_MAKINUM (bd_time->tm_min); + SCM_VELTS (result)[2] = SCM_MAKINUM (bd_time->tm_hour); + SCM_VELTS (result)[3] = SCM_MAKINUM (bd_time->tm_mday); + SCM_VELTS (result)[4] = SCM_MAKINUM (bd_time->tm_mon); + SCM_VELTS (result)[5] = SCM_MAKINUM (bd_time->tm_year); + SCM_VELTS (result)[6] = SCM_MAKINUM (bd_time->tm_wday); + SCM_VELTS (result)[7] = SCM_MAKINUM (bd_time->tm_yday); + SCM_VELTS (result)[8] = SCM_MAKINUM (bd_time->tm_isdst); + SCM_VELTS (result)[9] = SCM_MAKINUM (zoff); + SCM_VELTS (result)[10] = zname ? scm_makfrom0str (zname) : SCM_BOOL_F; + return result; +} + +#ifndef HAVE_STRPTIME +SCM_DEFINE (scm_strptime, "strptime", 2, 0, 0, + (SCM format, SCM string), + "Performs the reverse action to @code{strftime}, parsing @var{string}\n" + "according to the specification supplied in @var{template}. The\n" + "interpretation of month and day names is dependent on the current\n" + "locale. The\n" + "value returned is a pair. The CAR has an object with time components \n" + "in the form returned by @code{localtime} or @code{gmtime},\n" + "but the time zone components\n" + "are not usefully set.\n" + "The CDR reports the number of characters from @var{string} which\n" + "vwere used for the conversion.") +#define FUNC_NAME s_scm_strptime +{ + struct tm t; + char *fmt, *str, *rest; + + SCM_VALIDATE_ROSTRING (1,format); + SCM_VALIDATE_ROSTRING (2,string); + + SCM_COERCE_SUBSTR (format); + SCM_COERCE_SUBSTR (string); + fmt = SCM_ROCHARS (format); + str = SCM_ROCHARS (string); + + /* initialize the struct tm */ +#define tm_init(field) t.field = 0 + tm_init (tm_sec); + tm_init (tm_min); + tm_init (tm_hour); + tm_init (tm_mday); + tm_init (tm_mon); + tm_init (tm_year); + tm_init (tm_wday); + tm_init (tm_yday); +#undef tm_init + + t.tm_isdst = -1; + SCM_DEFER_INTS; + if ((rest = strptime (str, fmt, &t)) == NULL) + SCM_SYSERROR; + + SCM_ALLOW_INTS; + return scm_cons (filltime (&t, 0, NULL), SCM_MAKINUM (rest - str)); +} +#undef FUNC_NAME +#endif /* HAVE_STRPTIME */ + +/* + Local Variables: + c-file-style: "gnu" + End: +*/ + diff -Naur gnucash-1.6.8.orig/src/optional/Makefile.in gnucash-1.6.8/src/optional/Makefile.in --- gnucash-1.6.8.orig/src/optional/Makefile.in Thu Aug 22 12:17:22 2002 +++ gnucash-1.6.8/src/optional/Makefile.in Sun Aug 25 01:31:16 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -164,8 +168,7 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -EXTRA_DIST = \ - .cvsignore +EXTRA_DIST = .cvsignore # N.B. Do *not* specify subdirs, since we do *not* want the swig subdirs @@ -181,14 +184,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/optional/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/optional/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -201,6 +204,11 @@ subdir = src/optional distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/optional/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/pixmaps/Makefile.in gnucash-1.6.8/src/pixmaps/Makefile.in --- gnucash-1.6.8.orig/src/pixmaps/Makefile.in Thu Aug 22 12:17:21 2002 +++ gnucash-1.6.8/src/pixmaps/Makefile.in Sun Aug 25 01:31:16 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,17 +170,10 @@ gncpixmapdir = ${GNC_PIXMAP_DIR} -gncpixmap_DATA = \ - gnucash_splash.png \ - stock_split_title.png \ - stock_split_watermark.png \ - one-euro.png \ - euro-notes.png +gncpixmap_DATA = gnucash_splash.png stock_split_title.png stock_split_watermark.png one-euro.png euro-notes.png -EXTRA_DIST = \ - .cvsignore \ - ${gncpixmap_DATA} +EXTRA_DIST = .cvsignore ${gncpixmap_DATA} mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -188,14 +185,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/pixmaps/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/pixmaps/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -227,6 +224,11 @@ subdir = src/pixmaps distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/pixmaps/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/quotes/Makefile.in gnucash-1.6.8/src/quotes/Makefile.in --- gnucash-1.6.8.orig/src/quotes/Makefile.in Thu Aug 22 12:17:21 2002 +++ gnucash-1.6.8/src/quotes/Makefile.in Sun Aug 25 01:31:16 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -169,13 +173,7 @@ bin_SCRIPTS = gnc-prices update-finance-quote gncshare_SCRIPTS = finance-quote-helper -EXTRA_DIST = \ - .cvsignore \ - Quote_example.pl \ - finance-quote-helper.in \ - gnc-prices \ - update-finance-quote.in \ - value_portfolio +EXTRA_DIST = .cvsignore Quote_example.pl finance-quote-helper.in gnc-prices update-finance-quote.in value_portfolio CLEANFILES = finance-quote-helper update-finance-quote mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -188,14 +186,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/quotes/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/quotes/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -246,6 +244,11 @@ subdir = src/quotes distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/quotes/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/register/Makefile.in gnucash-1.6.8/src/register/Makefile.in --- gnucash-1.6.8.orig/src/register/Makefile.in Thu Aug 22 12:17:14 2002 +++ gnucash-1.6.8/src/register/Makefile.in Sun Aug 25 01:31:16 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,54 +170,18 @@ noinst_LIBRARIES = libgncregister.a -libgncregister_a_SOURCES = \ - QuickFill.c \ - basiccell.c \ - cellblock.c \ - gtable.c \ - numcell.c \ - pricecell.c \ - quickfillcell.c \ - recncell.c \ - register-common.c \ - splitreg.c \ - table-allgui.c \ - table-gnome.c \ - textcell.c - - -noinst_HEADERS = \ - QuickFill.h \ - basiccell.h \ - cellblock.h \ - combocell.h \ - datecell.h \ - gtable.h \ - numcell.h \ - pricecell.h \ - quickfillcell.h \ - recncell.h \ - register-common.h \ - splitreg.h \ - table-allgui.h \ - textcell.h - - -EXTRA_DIST = \ - .cvsignore \ - table-html.c \ - table-html.h +libgncregister_a_SOURCES = QuickFill.c basiccell.c cellblock.c gtable.c numcell.c pricecell.c quickfillcell.c recncell.c register-common.c splitreg.c table-allgui.c table-gnome.c textcell.c + + +noinst_HEADERS = QuickFill.h basiccell.h cellblock.h combocell.h datecell.h gtable.h numcell.h pricecell.h quickfillcell.h recncell.h register-common.h splitreg.h table-allgui.h textcell.h + + +EXTRA_DIST = .cvsignore table-html.c table-html.h CFLAGS = @CFLAGS@ -INCLUDES = \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/engine \ - -I${top_srcdir}/src/guile \ - -I${top_srcdir}/src/register/gnome \ - ${GNOME_INCLUDEDIR} \ - ${GUILE_INCS} +INCLUDES = -I${top_srcdir}/src -I${top_srcdir}/src/engine -I${top_srcdir}/src/guile -I${top_srcdir}/src/register/gnome ${GNOME_INCLUDEDIR} ${GUILE_INCS} SUBDIRS = gnome @@ -245,8 +213,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best +DEP_FILES = .deps/QuickFill.P .deps/basiccell.P .deps/cellblock.P \ +.deps/gtable.P .deps/numcell.P .deps/pricecell.P .deps/quickfillcell.P \ +.deps/recncell.P .deps/register-common.P .deps/splitreg.P \ +.deps/table-allgui.P .deps/table-gnome.P .deps/textcell.P SOURCES = $(libgncregister_a_SOURCES) OBJECTS = $(libgncregister_a_OBJECTS) @@ -254,9 +226,9 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/register/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/register/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -270,9 +242,6 @@ maintainer-clean-noinstLIBRARIES: -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -295,9 +264,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -413,6 +379,11 @@ subdir = src/register distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/register/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -433,82 +404,38 @@ || exit 1; \ fi; \ done -basiccell.o: basiccell.c basiccell.h ../../src/engine/gnc-common.h \ - ../../config.h ../../src/gnc-ui-common.h register-common.h \ - ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h -cellblock.o: cellblock.c cellblock.h basiccell.h \ - ../../src/engine/gnc-common.h ../../config.h \ - ../../src/gnc-ui-common.h register-common.h gtable.h -gtable.o: gtable.c ../../config.h gtable.h -numcell.o: numcell.c numcell.h basiccell.h ../../src/engine/gnc-common.h \ - ../../config.h ../../src/gnc-ui-common.h register-common.h \ - ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h -pricecell.o: pricecell.c ../../config.h ../../src/engine/gnc-common.h \ - ../../src/gnc-exp-parser.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-commodity.h ../../src/gnc-ui-util.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - basiccell.h ../../src/gnc-ui-common.h register-common.h \ - pricecell.h -QuickFill.o: QuickFill.c ../../config.h QuickFill.h basiccell.h \ - ../../src/engine/gnc-common.h ../../src/gnc-ui-common.h \ - register-common.h ../../src/engine/gnc-engine.h \ - ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-numeric.h ../../src/gnc-ui-util.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h -quickfillcell.o: quickfillcell.c ../../config.h basiccell.h \ - ../../src/engine/gnc-common.h ../../src/gnc-ui-common.h \ - register-common.h ../../src/gnc-ui-util.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - ../../src/engine/Account.h ../../src/engine/GNCId.h \ - ../../src/engine/guid.h ../../src/engine/Transaction.h \ - ../../src/engine/kvp_frame.h ../../src/engine/date.h \ - quickfillcell.h QuickFill.h -recncell.o: recncell.c ../../config.h basiccell.h \ - ../../src/engine/gnc-common.h ../../src/gnc-ui-common.h \ - register-common.h ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h \ - recncell.h ../../src/engine/Transaction.h \ - ../../src/engine/kvp_frame.h ../../src/engine/guid.h \ - ../../src/engine/GNCId.h ../../src/engine/date.h -register-common.o: register-common.c register-common.h -splitreg.o: splitreg.c ../../config.h ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-common.h ../../src/engine/gnc-commodity.h \ - ../../src/engine/gnc-numeric.h ../../src/messages.h recncell.h \ - basiccell.h ../../src/gnc-ui-common.h register-common.h \ - splitreg.h cellblock.h gtable.h combocell.h datecell.h \ - ../../src/engine/date.h quickfillcell.h QuickFill.h pricecell.h \ - ../../src/gnc-ui-util.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/kvp_frame.h \ - numcell.h table-allgui.h textcell.h -table-allgui.o: table-allgui.c ../../config.h table-allgui.h \ - ../../src/engine/gnc-common.h basiccell.h \ - ../../src/gnc-ui-common.h register-common.h cellblock.h \ - gtable.h ../../src/engine/gnc-engine-util.h \ - ../../src/engine/gnc-commodity.h ../../src/engine/gnc-numeric.h -table-gnome.o: table-gnome.c ../../config.h \ - ../../src/guile/global-options.h ../../src/engine/gnc-common.h \ - ../../src/guile/option-util.h ../../src/engine/gnc-commodity.h \ - ../../src/gnc-ui-common.h ../../src/engine/date.h \ - gnome/gnucash-sheet.h splitreg.h basiccell.h register-common.h \ - cellblock.h gtable.h combocell.h datecell.h quickfillcell.h \ - QuickFill.h pricecell.h ../../src/engine/gnc-numeric.h \ - ../../src/gnc-ui-util.h ../../src/engine/Account.h \ - ../../src/engine/GNCId.h ../../src/engine/guid.h \ - ../../src/engine/Transaction.h ../../src/engine/kvp_frame.h \ - numcell.h recncell.h table-allgui.h gnome/gnucash-style.h -textcell.o: textcell.c basiccell.h ../../src/engine/gnc-common.h \ - ../../config.h ../../src/gnc-ui-common.h register-common.h \ - textcell.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-recursive dvi-am: @@ -546,27 +473,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-recursive clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-recursive distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-recursive maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -582,12 +509,14 @@ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur gnucash-1.6.8.orig/src/register/gnome/Makefile.in gnucash-1.6.8/src/register/gnome/Makefile.in --- gnucash-1.6.8.orig/src/register/gnome/Makefile.in Thu Aug 22 12:17:15 2002 +++ gnucash-1.6.8/src/register/gnome/Makefile.in Sun Aug 25 01:31:16 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,47 +170,18 @@ noinst_LIBRARIES = libgncregistergnome.a -libgncregistergnome_a_SOURCES = \ - combocell-gnome.c \ - datecell-gnome.c \ - gnucash-color.c \ - gnucash-cursor.c \ - gnucash-date-picker.c \ - gnucash-grid.c \ - gnucash-header.c \ - gnucash-item-edit.c \ - gnucash-item-list.c \ - gnucash-scrolled-window.c \ - gnucash-sheet.c \ - gnucash-style.c \ - quickfillcell-gnome.c \ - pricecell-gnome.c - - -noinst_HEADERS = \ - gnucash-color.h \ - gnucash-cursor.h \ - gnucash-date-picker.h \ - gnucash-grid.h \ - gnucash-header.h \ - gnucash-item-edit.h \ - gnucash-item-list.h \ - gnucash-scrolled-window.h \ - gnucash-sheet.h \ - gnucash-style.h +libgncregistergnome_a_SOURCES = combocell-gnome.c datecell-gnome.c gnucash-color.c gnucash-cursor.c gnucash-date-picker.c gnucash-grid.c gnucash-header.c gnucash-item-edit.c gnucash-item-list.c gnucash-scrolled-window.c gnucash-sheet.c gnucash-style.c quickfillcell-gnome.c pricecell-gnome.c -EXTRA_DIST = \ - .cvsignore +noinst_HEADERS = gnucash-color.h gnucash-cursor.h gnucash-date-picker.h gnucash-grid.h gnucash-header.h gnucash-item-edit.h gnucash-item-list.h gnucash-scrolled-window.h gnucash-sheet.h gnucash-style.h + + +EXTRA_DIST = .cvsignore CFLAGS = @CFLAGS@ ${GTK_XIM_FLAGS} ${GNOME_INCLUDEDIR} ${GLIB_CFLAGS} -INCLUDES = \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/engine \ - -I${top_srcdir}/src/register \ - ${GNOME_INCLUDEDIR} +INCLUDES = -I${top_srcdir}/src -I${top_srcdir}/src/engine -I${top_srcdir}/src/register ${GNOME_INCLUDEDIR} mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h @@ -239,8 +214,15 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best +DEP_FILES = .deps/combocell-gnome.P .deps/datecell-gnome.P \ +.deps/gnucash-color.P .deps/gnucash-cursor.P \ +.deps/gnucash-date-picker.P .deps/gnucash-grid.P .deps/gnucash-header.P \ +.deps/gnucash-item-edit.P .deps/gnucash-item-list.P \ +.deps/gnucash-scrolled-window.P .deps/gnucash-sheet.P \ +.deps/gnucash-style.P .deps/pricecell-gnome.P \ +.deps/quickfillcell-gnome.P SOURCES = $(libgncregistergnome_a_SOURCES) OBJECTS = $(libgncregistergnome_a_OBJECTS) @@ -248,9 +230,9 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/register/gnome/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/register/gnome/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -264,9 +246,6 @@ maintainer-clean-noinstLIBRARIES: -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -289,9 +268,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -347,6 +323,11 @@ subdir = src/register/gnome distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/register/gnome/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -357,204 +338,38 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -combocell-gnome.o: combocell-gnome.c ../../../config.h \ - ../../../src/register/combocell.h \ - ../../../src/register/basiccell.h \ - ../../../src/engine/gnc-common.h ../../../src/gnc-ui-common.h \ - ../../../src/register/register-common.h \ - ../../../src/engine/gnc-engine-util.h \ - ../../../src/engine/gnc-commodity.h \ - ../../../src/engine/gnc-numeric.h ../../../src/gnc-ui-util.h \ - ../../../src/engine/Account.h ../../../src/engine/GNCId.h \ - ../../../src/engine/guid.h ../../../src/engine/Transaction.h \ - ../../../src/engine/kvp_frame.h ../../../src/engine/date.h \ - gnucash-item-edit.h gnucash-date-picker.h gnucash-item-list.h \ - gnucash-sheet.h ../../../src/register/splitreg.h \ - ../../../src/register/cellblock.h \ - ../../../src/register/gtable.h ../../../src/register/datecell.h \ - ../../../src/register/quickfillcell.h \ - ../../../src/register/QuickFill.h \ - ../../../src/register/pricecell.h \ - ../../../src/register/numcell.h \ - ../../../src/register/recncell.h \ - ../../../src/register/table-allgui.h ../../../src/messages.h -datecell-gnome.o: datecell-gnome.c ../../../config.h \ - ../../../src/register/datecell.h \ - ../../../src/register/basiccell.h \ - ../../../src/engine/gnc-common.h ../../../src/gnc-ui-common.h \ - ../../../src/register/register-common.h \ - ../../../src/engine/date.h \ - ../../../src/engine/gnc-engine-util.h \ - ../../../src/engine/gnc-commodity.h \ - ../../../src/engine/gnc-numeric.h ../../../src/gnc-ui-util.h \ - ../../../src/engine/Account.h ../../../src/engine/GNCId.h \ - ../../../src/engine/guid.h ../../../src/engine/Transaction.h \ - ../../../src/engine/kvp_frame.h gnucash-date-picker.h \ - gnucash-item-edit.h gnucash-item-list.h gnucash-sheet.h \ - ../../../src/register/splitreg.h \ - ../../../src/register/cellblock.h \ - ../../../src/register/gtable.h \ - ../../../src/register/combocell.h \ - ../../../src/register/quickfillcell.h \ - ../../../src/register/QuickFill.h \ - ../../../src/register/pricecell.h \ - ../../../src/register/numcell.h \ - ../../../src/register/recncell.h \ - ../../../src/register/table-allgui.h -gnucash-color.o: gnucash-color.c gnucash-color.h -gnucash-cursor.o: gnucash-cursor.c ../../../config.h gnucash-color.h \ - gnucash-cursor.h gnucash-grid.h \ - ../../../src/register/table-allgui.h \ - ../../../src/engine/gnc-common.h \ - ../../../src/register/basiccell.h ../../../src/gnc-ui-common.h \ - ../../../src/register/register-common.h \ - ../../../src/register/cellblock.h \ - ../../../src/register/gtable.h gnucash-sheet.h \ - ../../../src/register/splitreg.h \ - ../../../src/register/combocell.h \ - ../../../src/register/datecell.h ../../../src/engine/date.h \ - ../../../src/register/quickfillcell.h \ - ../../../src/register/QuickFill.h \ - ../../../src/register/pricecell.h \ - ../../../src/engine/gnc-numeric.h ../../../src/gnc-ui-util.h \ - ../../../src/engine/gnc-commodity.h \ - ../../../src/engine/Account.h ../../../src/engine/GNCId.h \ - ../../../src/engine/guid.h ../../../src/engine/Transaction.h \ - ../../../src/engine/kvp_frame.h ../../../src/register/numcell.h \ - ../../../src/register/recncell.h gnucash-style.h -gnucash-date-picker.o: gnucash-date-picker.c gnucash-date-picker.h -gnucash-grid.o: gnucash-grid.c ../../../config.h gnucash-sheet.h \ - ../../../src/register/splitreg.h \ - ../../../src/register/basiccell.h \ - ../../../src/engine/gnc-common.h ../../../src/gnc-ui-common.h \ - ../../../src/register/register-common.h \ - ../../../src/register/cellblock.h \ - ../../../src/register/gtable.h \ - ../../../src/register/combocell.h \ - ../../../src/register/datecell.h ../../../src/engine/date.h \ - ../../../src/register/quickfillcell.h \ - ../../../src/register/QuickFill.h \ - ../../../src/register/pricecell.h \ - ../../../src/engine/gnc-numeric.h ../../../src/gnc-ui-util.h \ - ../../../src/engine/gnc-commodity.h \ - ../../../src/engine/Account.h ../../../src/engine/GNCId.h \ - ../../../src/engine/guid.h ../../../src/engine/Transaction.h \ - ../../../src/engine/kvp_frame.h ../../../src/register/numcell.h \ - ../../../src/register/recncell.h \ - ../../../src/register/table-allgui.h gnucash-grid.h \ - gnucash-color.h gnucash-style.h -gnucash-header.o: gnucash-header.c ../../../config.h gnucash-sheet.h \ - ../../../src/register/splitreg.h \ - ../../../src/register/basiccell.h \ - ../../../src/engine/gnc-common.h ../../../src/gnc-ui-common.h \ - ../../../src/register/register-common.h \ - ../../../src/register/cellblock.h \ - ../../../src/register/gtable.h \ - ../../../src/register/combocell.h \ - ../../../src/register/datecell.h ../../../src/engine/date.h \ - ../../../src/register/quickfillcell.h \ - ../../../src/register/QuickFill.h \ - ../../../src/register/pricecell.h \ - ../../../src/engine/gnc-numeric.h ../../../src/gnc-ui-util.h \ - ../../../src/engine/gnc-commodity.h \ - ../../../src/engine/Account.h ../../../src/engine/GNCId.h \ - ../../../src/engine/guid.h ../../../src/engine/Transaction.h \ - ../../../src/engine/kvp_frame.h ../../../src/register/numcell.h \ - ../../../src/register/recncell.h \ - ../../../src/register/table-allgui.h gnucash-color.h \ - gnucash-style.h gnucash-grid.h gnucash-cursor.h \ - gnucash-item-edit.h gnucash-date-picker.h gnucash-item-list.h \ - gnucash-header.h -gnucash-item-edit.o: gnucash-item-edit.c ../../../config.h \ - gnucash-color.h gnucash-cursor.h gnucash-grid.h \ - ../../../src/register/table-allgui.h \ - ../../../src/engine/gnc-common.h \ - ../../../src/register/basiccell.h ../../../src/gnc-ui-common.h \ - ../../../src/register/register-common.h \ - ../../../src/register/cellblock.h \ - ../../../src/register/gtable.h gnucash-sheet.h \ - ../../../src/register/splitreg.h \ - ../../../src/register/combocell.h \ - ../../../src/register/datecell.h ../../../src/engine/date.h \ - ../../../src/register/quickfillcell.h \ - ../../../src/register/QuickFill.h \ - ../../../src/register/pricecell.h \ - ../../../src/engine/gnc-numeric.h ../../../src/gnc-ui-util.h \ - ../../../src/engine/gnc-commodity.h \ - ../../../src/engine/Account.h ../../../src/engine/GNCId.h \ - ../../../src/engine/guid.h ../../../src/engine/Transaction.h \ - ../../../src/engine/kvp_frame.h ../../../src/register/numcell.h \ - ../../../src/register/recncell.h gnucash-item-edit.h \ - gnucash-date-picker.h gnucash-item-list.h gnucash-style.h -gnucash-item-list.o: gnucash-item-list.c \ - ../../../src/engine/gnc-engine-util.h ../../../config.h \ - ../../../src/engine/gnc-common.h \ - ../../../src/engine/gnc-commodity.h \ - ../../../src/engine/gnc-numeric.h gnucash-item-list.h \ - gnucash-scrolled-window.h -gnucash-scrolled-window.o: gnucash-scrolled-window.c ../../../config.h \ - gnucash-scrolled-window.h -gnucash-sheet.o: gnucash-sheet.c ../../../config.h gnucash-sheet.h \ - ../../../src/register/splitreg.h \ - ../../../src/register/basiccell.h \ - ../../../src/engine/gnc-common.h ../../../src/gnc-ui-common.h \ - ../../../src/register/register-common.h \ - ../../../src/register/cellblock.h \ - ../../../src/register/gtable.h \ - ../../../src/register/combocell.h \ - ../../../src/register/datecell.h ../../../src/engine/date.h \ - ../../../src/register/quickfillcell.h \ - ../../../src/register/QuickFill.h \ - ../../../src/register/pricecell.h \ - ../../../src/engine/gnc-numeric.h ../../../src/gnc-ui-util.h \ - ../../../src/engine/gnc-commodity.h \ - ../../../src/engine/Account.h ../../../src/engine/GNCId.h \ - ../../../src/engine/guid.h ../../../src/engine/Transaction.h \ - ../../../src/engine/kvp_frame.h ../../../src/register/numcell.h \ - ../../../src/register/recncell.h \ - ../../../src/register/table-allgui.h gnucash-color.h \ - gnucash-grid.h gnucash-cursor.h gnucash-style.h \ - gnucash-header.h gnucash-item-edit.h gnucash-date-picker.h \ - gnucash-item-list.h ../../../src/engine/gnc-engine-util.h -gnucash-style.o: gnucash-style.c ../../../config.h gnucash-color.h \ - gnucash-grid.h ../../../src/register/table-allgui.h \ - ../../../src/engine/gnc-common.h \ - ../../../src/register/basiccell.h ../../../src/gnc-ui-common.h \ - ../../../src/register/register-common.h \ - ../../../src/register/cellblock.h \ - ../../../src/register/gtable.h gnucash-sheet.h \ - ../../../src/register/splitreg.h \ - ../../../src/register/combocell.h \ - ../../../src/register/datecell.h ../../../src/engine/date.h \ - ../../../src/register/quickfillcell.h \ - ../../../src/register/QuickFill.h \ - ../../../src/register/pricecell.h \ - ../../../src/engine/gnc-numeric.h ../../../src/gnc-ui-util.h \ - ../../../src/engine/gnc-commodity.h \ - ../../../src/engine/Account.h ../../../src/engine/GNCId.h \ - ../../../src/engine/guid.h ../../../src/engine/Transaction.h \ - ../../../src/engine/kvp_frame.h ../../../src/register/numcell.h \ - ../../../src/register/recncell.h gnucash-item-edit.h \ - gnucash-date-picker.h gnucash-item-list.h gnucash-style.h \ - ../../../src/messages.h -pricecell-gnome.o: pricecell-gnome.c ../../../config.h \ - ../../../src/register/pricecell.h \ - ../../../src/register/basiccell.h \ - ../../../src/engine/gnc-common.h ../../../src/gnc-ui-common.h \ - ../../../src/register/register-common.h \ - ../../../src/engine/gnc-numeric.h ../../../src/gnc-ui-util.h \ - ../../../src/engine/gnc-commodity.h \ - ../../../src/engine/Account.h ../../../src/engine/GNCId.h \ - ../../../src/engine/guid.h ../../../src/engine/Transaction.h \ - ../../../src/engine/kvp_frame.h ../../../src/engine/date.h \ - ../../../src/gnc-exp-parser.h -quickfillcell-gnome.o: quickfillcell-gnome.c ../../../config.h \ - ../../../src/register/quickfillcell.h \ - ../../../src/register/basiccell.h \ - ../../../src/engine/gnc-common.h ../../../src/gnc-ui-common.h \ - ../../../src/register/register-common.h \ - ../../../src/register/QuickFill.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am dvi-am: @@ -591,27 +406,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-am clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am + clean-depend clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-am maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -622,12 +437,14 @@ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur gnucash-1.6.8.orig/src/scm/Makefile.in gnucash-1.6.8/src/scm/Makefile.in --- gnucash-1.6.8.orig/src/scm/Makefile.in Thu Aug 22 12:17:19 2002 +++ gnucash-1.6.8/src/scm/Makefile.in Sun Aug 25 01:31:17 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -171,70 +175,15 @@ #gncscmmod_DATA = process.scm -gnc_autogen_scm_files = \ - bootstrap.scm +gnc_autogen_scm_files = bootstrap.scm -gnc_regular_scm_files = \ - c-interface.scm \ - command-line.scm \ - commodity-import.scm \ - commodity-table.scm \ - commodity-utilities.scm \ - config-var.scm \ - date-utilities.scm \ - depend.scm \ - doc.scm \ - engine-init.scm \ - engine-interface.scm \ - engine-utilities.scm \ - extensions.scm \ - graph.scm \ - gnc-numeric.scm \ - help-topics-index.scm \ - hooks.scm \ - html-barchart.scm \ - html-document.scm \ - html-piechart.scm \ - html-scatter.scm \ - html-style-info.scm \ - html-style-sheet.scm \ - html-text.scm \ - html-table.scm \ - html-utilities.scm \ - iso-4217-currencies.scm \ - main.scm \ - main-window.scm \ - options.scm \ - options-utilities.scm \ - path.scm \ - prefs.scm \ - price-quotes.scm \ - process.scm \ - report.scm \ - report-html.scm \ - report-utilities.scm \ - slib-backup.scm \ - startup.scm \ - structure.scm \ - substring-search.scm \ - testbed.scm \ - text-export.scm \ - tip-list.scm \ - tip-of-the-day.scm \ - utilities.scm \ - xgettext.scm \ - xml-generator.scm +gnc_regular_scm_files = c-interface.scm command-line.scm commodity-import.scm commodity-table.scm commodity-utilities.scm config-var.scm date-utilities.scm depend.scm doc.scm engine-init.scm engine-interface.scm engine-utilities.scm extensions.scm graph.scm gnc-numeric.scm help-topics-index.scm hooks.scm html-barchart.scm html-document.scm html-piechart.scm html-scatter.scm html-style-info.scm html-style-sheet.scm html-text.scm html-table.scm html-utilities.scm iso-4217-currencies.scm main.scm main-window.scm options.scm options-utilities.scm path.scm prefs.scm price-quotes.scm process.scm report.scm report-html.scm report-utilities.scm slib-backup.scm startup.scm structure.scm substring-search.scm testbed.scm text-export.scm tip-list.scm tip-of-the-day.scm utilities.scm xgettext.scm xml-generator.scm gncscm_DATA = ${gnc_autogen_scm_files} ${gnc_regular_scm_files} -EXTRA_DIST = \ - .cvsignore \ - bootstrap.scm.in \ - design.txt \ - startup-design.txt \ - ${gnc_regular_scm_files} +EXTRA_DIST = .cvsignore bootstrap.scm.in design.txt startup-design.txt ${gnc_regular_scm_files} CLEANFILES = guile-strings.c bootstrap.scm mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -247,14 +196,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/scm/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/scm/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -372,6 +321,11 @@ subdir = src/scm distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/scm/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/scm/gnumeric/Makefile.in gnucash-1.6.8/src/scm/gnumeric/Makefile.in --- gnucash-1.6.8.orig/src/scm/gnumeric/Makefile.in Thu Aug 22 12:17:20 2002 +++ gnucash-1.6.8/src/scm/gnumeric/Makefile.in Sun Aug 25 01:31:17 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,14 +170,10 @@ gncscmdir = ${GNC_SCM_INSTALL_DIR}/gnumeric -gncscm_DATA = \ - gnumeric-utilities.scm \ - table-utils.scm +gncscm_DATA = gnumeric-utilities.scm table-utils.scm -EXTRA_DIST = \ - .cvsignore \ - ${gncscm_DATA} +EXTRA_DIST = .cvsignore ${gncscm_DATA} CLEANFILES = guile-strings.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -186,14 +186,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/scm/gnumeric/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/scm/gnumeric/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -225,6 +225,11 @@ subdir = src/scm/gnumeric distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/scm/gnumeric/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/scm/path.scm gnucash-1.6.8/src/scm/path.scm --- gnucash-1.6.8.orig/src/scm/path.scm Mon Mar 4 17:22:13 2002 +++ gnucash-1.6.8/src/scm/path.scm Fri Aug 23 21:39:33 2002 @@ -16,7 +16,7 @@ ;; Boston, MA 02111-1307, USA gnu@gnu.org (define (gnc:locale-prefixes) - (let* ((locale (setlocale LC_MESSAGES)) + (let* ((locale (getenv "LANG")) (strings (cond ((not (string? locale)) ()) ((equal? locale "C") ()) ((<= (string-length locale) 4) (list locale)) diff -Naur gnucash-1.6.8.orig/src/scm/printing/Makefile.in gnucash-1.6.8/src/scm/printing/Makefile.in --- gnucash-1.6.8.orig/src/scm/printing/Makefile.in Thu Aug 22 12:17:20 2002 +++ gnucash-1.6.8/src/scm/printing/Makefile.in Sun Aug 25 01:31:17 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,14 +170,10 @@ gncscmdir = ${GNC_SCM_INSTALL_DIR}/printing -gncscm_DATA = \ - number-to-words.scm \ - print-check.scm +gncscm_DATA = number-to-words.scm print-check.scm -EXTRA_DIST = \ - .cvsignore \ - ${gncscm_DATA} +EXTRA_DIST = .cvsignore ${gncscm_DATA} CLEANFILES = guile-strings.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -186,14 +186,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/scm/printing/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/scm/printing/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -225,6 +225,11 @@ subdir = src/scm/printing distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/scm/printing/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/scm/qif-import/Makefile.in gnucash-1.6.8/src/scm/qif-import/Makefile.in --- gnucash-1.6.8.orig/src/scm/qif-import/Makefile.in Thu Aug 22 12:17:20 2002 +++ gnucash-1.6.8/src/scm/qif-import/Makefile.in Sun Aug 25 01:31:17 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,23 +170,10 @@ gncscmdir = ${GNC_SCM_INSTALL_DIR}/qif-import -gncscm_DATA = \ - qif-dialog-utils.scm \ - qif-file.scm \ - qif-guess-map.scm \ - qif-import.scm \ - qif-merge-groups.scm \ - qif-objects.scm \ - qif-parse.scm \ - qif-to-gnc.scm \ - qif-utils.scm \ - simple-obj.scm - - -EXTRA_DIST = \ - .cvsignore \ - ${gncscm_DATA} \ - file-format.txt +gncscm_DATA = qif-dialog-utils.scm qif-file.scm qif-guess-map.scm qif-import.scm qif-merge-groups.scm qif-objects.scm qif-parse.scm qif-to-gnc.scm qif-utils.scm simple-obj.scm + + +EXTRA_DIST = .cvsignore ${gncscm_DATA} file-format.txt CLEANFILES = guile-strings.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -195,14 +186,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/scm/qif-import/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/scm/qif-import/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -234,6 +225,11 @@ subdir = src/scm/qif-import distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/scm/qif-import/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/scm/report/Makefile.in gnucash-1.6.8/src/scm/report/Makefile.in --- gnucash-1.6.8.orig/src/scm/report/Makefile.in Thu Aug 22 12:17:21 2002 +++ gnucash-1.6.8/src/scm/report/Makefile.in Sun Aug 25 01:31:17 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -166,40 +170,17 @@ gncscmdir = ${GNC_SCM_INSTALL_DIR}/report -gncscm_DATA = \ - report-list.scm \ - stylesheet-fancy.scm \ - stylesheet-plain.scm \ - txf-export-help.scm \ - txf-export.scm \ - view-column.scm \ - welcome-to-gnucash.scm +gncscm_DATA = report-list.scm stylesheet-fancy.scm stylesheet-plain.scm txf-export-help.scm txf-export.scm view-column.scm welcome-to-gnucash.scm gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report -gncscmmod_DATA = \ - account-piecharts.scm \ - account-summary.scm \ - average-balance.scm \ - balance-sheet.scm \ - category-barchart.scm \ - hello-world.scm \ - iframe-url.scm \ - net-barchart.scm \ - pnl.scm \ - portfolio.scm \ - price-scatter.scm \ - register.scm \ - taxtxf.scm \ - transaction.scm +gncscmmod_DATA = account-piecharts.scm account-summary.scm average-balance.scm balance-sheet.scm category-barchart.scm hello-world.scm iframe-url.scm net-barchart.scm pnl.scm portfolio.scm price-scatter.scm register.scm taxtxf.scm transaction.scm SCM_FILES = ${gncscm_DATA} ${gncscmmod_DATA} -EXTRA_DIST = \ - .cvsignore \ - ${SCM_FILES} +EXTRA_DIST = .cvsignore ${SCM_FILES} CLEANFILES = guile-strings.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -212,14 +193,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/scm/report/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/scm/report/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -270,6 +251,11 @@ subdir = src/scm/report distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/scm/report/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/test/Makefile.in gnucash-1.6.8/src/test/Makefile.in --- gnucash-1.6.8.orig/src/test/Makefile.in Thu Aug 22 12:17:22 2002 +++ gnucash-1.6.8/src/test/Makefile.in Sun Aug 25 01:31:17 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -168,53 +172,21 @@ LDADD = ../engine/libgncengine.la ${GNOME_XML_LIB} ${GHTTP_LIBS} ${GLIB_LIBS} ${DL_LIB} ${INTLLIBS} ${EFENCE_LIBS} -LDALL = \ - ../EuroUtils.o \ - ../FileDialog.o \ - ../MultiLedger.o \ - ../SplitLedger.o \ - ../gnc-component-manager.o \ - ../gnc-exp-parser.o \ - ../gnc-ui-util.o \ - ../gnome/libgncgnome.a \ - ../register/libgncregister.a \ - ../register/gnome/libgncregistergnome.a \ - ../guile/libgncguile.a \ - ../gnome/libgncgnome.a \ - ../calculation/libgnccalc.a \ - ../engine/libgncengine.la \ - ${GUPPI_LIBS} \ - ${GNOMEUI_LIBS} \ - ${GNOME_LIBDIR} \ - ${GNOME_PRINT_LIBS} \ - ${G_WRAP_LINK_ARGS} \ - ${GUILE_LIBS} \ - ${GTKHTML_LIBS} \ - ${GHTTP_LIBS} \ - ${DB_LIBS} \ - ${INTLLIBS} \ - ${EFENCE_LIBS} +LDALL = ../EuroUtils.o ../FileDialog.o ../MultiLedger.o ../SplitLedger.o ../gnc-component-manager.o ../gnc-exp-parser.o ../gnc-ui-util.o ../gnome/libgncgnome.a ../register/libgncregister.a ../register/gnome/libgncregistergnome.a ../guile/libgncguile.a ../gnome/libgncgnome.a ../calculation/libgnccalc.a ../engine/libgncengine.la ${GUPPI_LIBS} ${GNOMEUI_LIBS} ${GNOME_LIBDIR} ${GNOME_PRINT_LIBS} ${G_WRAP_LINK_ARGS} ${GUILE_LIBS} ${GTKHTML_LIBS} ${GHTTP_LIBS} ${DB_LIBS} ${INTLLIBS} ${EFENCE_LIBS} CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} ${GNOME_XML_CFLAGS} ${GHTTP_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_INCS} INCLUDES = -I.. -I../engine -I../guile -STUFF = test-commodities test-dom-converters1 test-date-converting \ - test-kvp-frames test-string-converters test-xml-account \ - test-xml-commodity test-xml-transaction test-split-vs-account \ - test-xml2-is-file test-load-xml2 test-exp-parser \ - test-load-example-account test-scm-query +STUFF = test-commodities test-dom-converters1 test-date-converting test-kvp-frames test-string-converters test-xml-account test-xml-commodity test-xml-transaction test-split-vs-account test-xml2-is-file test-load-xml2 test-exp-parser test-load-example-account test-scm-query TESTS = ${STUFF} test-real-data.sh noinst_PROGRAMS = ${STUFF} test-save-in-lang noinst_SCRIPTS = test-real-data.sh -EXTRA_DIST = \ - README \ - grab-types.pl \ - test-real-data.sh +EXTRA_DIST = README grab-types.pl test-real-data.sh #test_dom_parser1_SOURCES = test-dom-parser1.c test-stuff.c gnc-test-stuff.c @@ -366,8 +338,16 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best +DEP_FILES = .deps/gnc-test-stuff.P .deps/test-commodities.P \ +.deps/test-date-converting.P .deps/test-dom-converters1.P \ +.deps/test-exp-parser.P .deps/test-kvp-frames.P \ +.deps/test-load-example-account.P .deps/test-load-xml2.P \ +.deps/test-save-in-lang.P .deps/test-scm-query.P \ +.deps/test-split-vs-account.P .deps/test-string-converters.P \ +.deps/test-stuff.P .deps/test-xml-account.P .deps/test-xml-commodity.P \ +.deps/test-xml-transaction.P .deps/test-xml2-is-file.P SOURCES = $(test_commodities_SOURCES) $(test_dom_converters1_SOURCES) $(test_date_converting_SOURCES) $(test_kvp_frames_SOURCES) $(test_string_converters_SOURCES) $(test_xml_account_SOURCES) $(test_xml_commodity_SOURCES) $(test_xml_transaction_SOURCES) $(test_split_vs_account_SOURCES) $(test_xml2_is_file_SOURCES) $(test_load_xml2_SOURCES) $(test_exp_parser_SOURCES) $(test_load_example_account_SOURCES) $(test_scm_query_SOURCES) $(test_save_in_lang_SOURCES) OBJECTS = $(test_commodities_OBJECTS) $(test_dom_converters1_OBJECTS) $(test_date_converting_OBJECTS) $(test_kvp_frames_OBJECTS) $(test_string_converters_OBJECTS) $(test_xml_account_OBJECTS) $(test_xml_commodity_OBJECTS) $(test_xml_transaction_OBJECTS) $(test_split_vs_account_OBJECTS) $(test_xml2_is_file_OBJECTS) $(test_load_xml2_OBJECTS) $(test_exp_parser_OBJECTS) $(test_load_example_account_OBJECTS) $(test_scm_query_OBJECTS) $(test_save_in_lang_OBJECTS) @@ -375,9 +355,9 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/test/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/test/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -391,9 +371,6 @@ maintainer-clean-noinstPROGRAMS: -.c.o: - $(COMPILE) -c $< - # FIXME: We should only use cygpath when building on Windows, # and only if it is available. .c.obj: @@ -416,9 +393,6 @@ maintainer-clean-compile: -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -589,6 +563,11 @@ subdir = src/test distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/test/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ @@ -609,147 +588,38 @@ || exit 1; \ fi; \ done -gnc-test-stuff.o: gnc-test-stuff.c ../../config.h \ - ../engine/gnc-engine-util.h ../engine/gnc-common.h \ - ../engine/gnc-commodity.h ../engine/gnc-numeric.h \ - gnc-test-stuff.h test-stuff.h ../engine/gnc-xml-helper.h \ - ../engine/io-gncxml-gen.h ../engine/sixtp.h ../engine/guid.h \ - ../engine/kvp_frame.h ../engine/date.h ../engine/Account.h \ - ../engine/GNCId.h ../engine/Transaction.h ../engine/Query.h \ - ../engine/sixtp-dom-parsers.h ../engine/sixtp-parsers.h \ - ../engine/sixtp-utils.h -test-commodities.o: test-commodities.c ../engine/gnc-engine-util.h \ - ../../config.h ../engine/gnc-common.h ../engine/gnc-commodity.h \ - ../engine/gnc-numeric.h gnc-test-stuff.h test-stuff.h \ - ../engine/gnc-xml-helper.h ../engine/io-gncxml-gen.h \ - ../engine/sixtp.h ../engine/guid.h ../engine/kvp_frame.h \ - ../engine/date.h ../engine/Account.h ../engine/GNCId.h \ - ../engine/Transaction.h ../engine/Query.h -test-date-converting.o: test-date-converting.c ../../config.h \ - gnc-test-stuff.h test-stuff.h ../engine/gnc-xml-helper.h \ - ../engine/io-gncxml-gen.h ../engine/sixtp.h \ - ../engine/gnc-commodity.h ../engine/guid.h \ - ../engine/kvp_frame.h ../engine/gnc-numeric.h ../engine/date.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/Transaction.h \ - ../engine/gnc-common.h ../engine/Query.h \ - ../engine/sixtp-utils.h ../engine/sixtp-dom-generators.h -test-dom-converters1.o: test-dom-converters1.c ../../config.h \ - gnc-test-stuff.h test-stuff.h ../engine/gnc-xml-helper.h \ - ../engine/io-gncxml-gen.h ../engine/sixtp.h \ - ../engine/gnc-commodity.h ../engine/guid.h \ - ../engine/kvp_frame.h ../engine/gnc-numeric.h ../engine/date.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/Transaction.h \ - ../engine/gnc-common.h ../engine/Query.h \ - ../engine/gnc-engine-util.h ../engine/sixtp-parsers.h \ - ../engine/sixtp-utils.h ../engine/sixtp-dom-parsers.h \ - ../engine/sixtp-dom-generators.h -test-exp-parser.o: test-exp-parser.c ../gnc-exp-parser.h ../../config.h \ - ../engine/gnc-numeric.h test-stuff.h -test-kvp-frames.o: test-kvp-frames.c ../../config.h gnc-test-stuff.h \ - test-stuff.h ../engine/gnc-xml-helper.h \ - ../engine/io-gncxml-gen.h ../engine/sixtp.h \ - ../engine/gnc-commodity.h ../engine/guid.h \ - ../engine/kvp_frame.h ../engine/gnc-numeric.h ../engine/date.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/Transaction.h \ - ../engine/gnc-common.h ../engine/Query.h \ - ../engine/sixtp-dom-generators.h ../engine/sixtp-dom-parsers.h -test-load-example-account.o: test-load-example-account.c \ - ../engine/gnc-engine-util.h ../../config.h \ - ../engine/gnc-common.h ../engine/gnc-commodity.h \ - ../engine/gnc-numeric.h ../engine/io-gncxml-v2.h \ - ../engine/gnc-book.h ../engine/Group.h ../engine/Account.h \ - ../engine/GNCId.h ../engine/guid.h ../engine/Transaction.h \ - ../engine/kvp_frame.h ../engine/date.h ../engine/Backend.h \ - ../engine/gnc-pricedb.h ../engine/gnc-engine.h \ - ../engine/io-example-account.h ../engine/sixtp.h \ - ../engine/gnc-xml-helper.h gnc-test-stuff.h test-stuff.h \ - ../engine/io-gncxml-gen.h ../engine/Query.h -test-load-xml2.o: test-load-xml2.c ../engine/io-gncxml-v2.h \ - ../engine/gnc-book.h ../engine/Group.h ../../config.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/guid.h \ - ../engine/Transaction.h ../engine/gnc-common.h \ - ../engine/gnc-commodity.h ../engine/gnc-numeric.h \ - ../engine/kvp_frame.h ../engine/date.h ../engine/Backend.h \ - ../engine/gnc-pricedb.h ../engine/gnc-engine.h \ - ../engine/TransLog.h gnc-test-stuff.h test-stuff.h \ - ../engine/gnc-xml-helper.h ../engine/io-gncxml-gen.h \ - ../engine/sixtp.h ../engine/Query.h -test-save-in-lang.o: test-save-in-lang.c gnc-test-stuff.h ../../config.h \ - test-stuff.h ../engine/gnc-xml-helper.h \ - ../engine/io-gncxml-gen.h ../engine/sixtp.h \ - ../engine/gnc-commodity.h ../engine/guid.h \ - ../engine/kvp_frame.h ../engine/gnc-numeric.h ../engine/date.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/Transaction.h \ - ../engine/gnc-common.h ../engine/Query.h ../engine/gnc-book.h \ - ../engine/Group.h ../engine/Backend.h ../engine/gnc-pricedb.h \ - ../engine/gnc-engine.h ../engine/TransLog.h \ - ../engine/io-gncxml-v2.h -test-scm-query.o: test-scm-query.c ../guile/gnucash.h gnc-test-stuff.h \ - ../../config.h test-stuff.h ../engine/gnc-xml-helper.h \ - ../engine/io-gncxml-gen.h ../engine/sixtp.h \ - ../engine/gnc-commodity.h ../engine/guid.h \ - ../engine/kvp_frame.h ../engine/gnc-numeric.h ../engine/date.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/Transaction.h \ - ../engine/gnc-common.h ../engine/Query.h ../guile/gnc-helpers.h \ - ../gnc-ui-util.h -test-split-vs-account.o: test-split-vs-account.c ../engine/GNCIdP.h \ - ../engine/GNCId.h ../engine/guid.h ../../config.h \ - ../engine/Account.h ../engine/Transaction.h \ - ../engine/gnc-common.h ../engine/gnc-commodity.h \ - ../engine/gnc-numeric.h ../engine/kvp_frame.h ../engine/date.h \ - gnc-test-stuff.h test-stuff.h ../engine/gnc-xml-helper.h \ - ../engine/io-gncxml-gen.h ../engine/sixtp.h ../engine/Query.h -test-string-converters.o: test-string-converters.c ../../config.h \ - ../engine/sixtp-dom-parsers.h ../engine/gnc-xml-helper.h \ - ../engine/gnc-commodity.h ../engine/kvp_frame.h \ - ../engine/gnc-numeric.h ../engine/guid.h ../engine/date.h \ - ../engine/GNCId.h ../engine/sixtp-dom-generators.h \ - ../engine/gnc-engine-util.h ../engine/gnc-common.h \ - gnc-test-stuff.h test-stuff.h ../engine/io-gncxml-gen.h \ - ../engine/sixtp.h ../engine/Account.h ../engine/Transaction.h \ - ../engine/Query.h -test-stuff.o: test-stuff.c ../../config.h test-stuff.h -test-xml-account.o: test-xml-account.c ../../config.h \ - ../engine/gnc-xml-helper.h ../engine/gnc-xml.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/guid.h \ - ../engine/Transaction.h ../engine/gnc-common.h \ - ../engine/gnc-commodity.h ../engine/gnc-numeric.h \ - ../engine/kvp_frame.h ../engine/date.h ../engine/sixtp.h \ - ../engine/gnc-pricedb.h ../engine/gnc-engine-util.h \ - ../engine/gnc-engine.h ../engine/sixtp-parsers.h \ - ../engine/sixtp-dom-parsers.h gnc-test-stuff.h test-stuff.h \ - ../engine/io-gncxml-gen.h ../engine/Query.h ../engine/GNCIdP.h \ - ../engine/Group.h ../engine/gnc-book.h ../engine/Backend.h -test-xml-commodity.o: test-xml-commodity.c ../../config.h \ - ../engine/gnc-xml-helper.h ../engine/gnc-xml.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/guid.h \ - ../engine/Transaction.h ../engine/gnc-common.h \ - ../engine/gnc-commodity.h ../engine/gnc-numeric.h \ - ../engine/kvp_frame.h ../engine/date.h ../engine/sixtp.h \ - ../engine/gnc-pricedb.h ../engine/gnc-engine-util.h \ - ../engine/sixtp-parsers.h ../engine/sixtp-utils.h \ - ../engine/sixtp-dom-parsers.h ../engine/io-gncxml-gen.h \ - gnc-test-stuff.h test-stuff.h ../engine/Query.h -test-xml-transaction.o: test-xml-transaction.c ../../config.h \ - ../engine/gnc-xml-helper.h ../engine/gnc-xml.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/guid.h \ - ../engine/Transaction.h ../engine/gnc-common.h \ - ../engine/gnc-commodity.h ../engine/gnc-numeric.h \ - ../engine/kvp_frame.h ../engine/date.h ../engine/sixtp.h \ - ../engine/gnc-pricedb.h ../engine/gnc-engine-util.h \ - ../engine/sixtp-parsers.h ../engine/sixtp-dom-parsers.h \ - ../engine/TransLog.h ../engine/io-gncxml-gen.h gnc-test-stuff.h \ - test-stuff.h ../engine/Query.h ../engine/GNCIdP.h -test-xml2-is-file.o: test-xml2-is-file.c ../engine/io-gncxml-v2.h \ - ../engine/gnc-book.h ../engine/Group.h ../../config.h \ - ../engine/Account.h ../engine/GNCId.h ../engine/guid.h \ - ../engine/Transaction.h ../engine/gnc-common.h \ - ../engine/gnc-commodity.h ../engine/gnc-numeric.h \ - ../engine/kvp_frame.h ../engine/date.h ../engine/Backend.h \ - ../engine/gnc-pricedb.h gnc-test-stuff.h test-stuff.h \ - ../engine/gnc-xml-helper.h ../engine/io-gncxml-gen.h \ - ../engine/sixtp.h ../engine/Query.h +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp check-TESTS: $(TESTS) @failed=0; all=0; \ srcdir=$(srcdir); export srcdir; \ @@ -813,27 +683,27 @@ maintainer-clean-generic: mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ mostlyclean-generic mostlyclean: mostlyclean-recursive clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am clean-local + clean-depend clean-generic mostlyclean-am clean-local clean: clean-recursive distclean-am: distclean-noinstPROGRAMS distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am -rm -f libtool distclean: distclean-recursive maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -849,12 +719,14 @@ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir check-TESTS \ -info-am info dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend check-TESTS info-am info dvi-am dvi check \ +check-am installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean clean-local: diff -Naur gnucash-1.6.8.orig/src/test/test-files/Makefile.in gnucash-1.6.8/src/test/test-files/Makefile.in --- gnucash-1.6.8.orig/src/test/test-files/Makefile.in Thu Aug 22 12:17:23 2002 +++ gnucash-1.6.8/src/test/test-files/Makefile.in Sun Aug 25 01:31:18 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -173,14 +177,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/test/test-files/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/test/test-files/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -279,6 +283,11 @@ subdir = src/test/test-files distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/test/test-files/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff -Naur gnucash-1.6.8.orig/src/test/test-files/xml2/Makefile.in gnucash-1.6.8/src/test/test-files/xml2/Makefile.in --- gnucash-1.6.8.orig/src/test/test-files/xml2/Makefile.in Thu Aug 22 12:17:23 2002 +++ gnucash-1.6.8/src/test/test-files/xml2/Makefile.in Sun Aug 25 01:31:18 2002 @@ -126,6 +126,7 @@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LC_MESSAGES_ENUM = @LC_MESSAGES_ENUM@ LIB = @LIB@ LIBGUPPI_CFLAGS = @LIBGUPPI_CFLAGS@ LIBGUPPI_LIBS = @LIBGUPPI_LIBS@ @@ -134,6 +135,7 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LOCALE_DIR = @LOCALE_DIR@ +LOCALTIME_R_O = @LOCALTIME_R_O@ LTLIB = @LTLIB@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ @@ -154,8 +156,10 @@ RANLIB = @RANLIB@ READLINE_LIB = @READLINE_LIB@ RPC_DIR = @RPC_DIR@ +SCM_STRPTIME_O = @SCM_STRPTIME_O@ SQL_DIR = @SQL_DIR@ STRIP = @STRIP@ +STRPTIME_O = @STRPTIME_O@ TERMCAP_LIB = @TERMCAP_LIB@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ @@ -164,21 +168,7 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ -EXTRA_DIST = \ - Money95bank_fr.gml2 \ - Money95invst.gml2 \ - Money95mutual.gml2 \ - Money95stocks.gml2 \ - abc.gml2 \ - abcall.gml2 \ - carols-data-file.gml2 \ - cbb-export.gml2 \ - conrads-file.gml2 \ - every.gml2 \ - goonies-file.gml2 \ - hierachical-data-file.gml2 \ - ms-money.gml2 \ - pricedb1.gml2 +EXTRA_DIST = Money95bank_fr.gml2 Money95invst.gml2 Money95mutual.gml2 Money95stocks.gml2 abc.gml2 abcall.gml2 carols-data-file.gml2 cbb-export.gml2 conrads-file.gml2 every.gml2 goonies-file.gml2 hierachical-data-file.gml2 ms-money.gml2 pricedb1.gml2 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../../config.h @@ -188,14 +178,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = gnutar GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/test/test-files/xml2/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/test/test-files/xml2/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -208,6 +198,11 @@ subdir = src/test/test-files/xml2 distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/test/test-files/xml2/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \