IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge robs patches from branch

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1367 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 1998-10-28 05:55:38 +00:00
parent a53653753f
commit de98df10c5
15 changed files with 189 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -1,4 +1,5 @@
Makefile
Makefile.init
config.cache
config.log
config.status

14
Makefile.common
View File

@ -64,19 +64,21 @@ obj/qt/%.o: %.cpp
$(CC) -Wp,-MD,$(basename $@).d.tmp -c $(CFLAGS) ${QT_CFLAGS} -DKDE -o $@ $<
${cleanupdeps}
clean:
$(foreach dir,${CLEAN_SUBDIRS},(cd ${dir} && $(MAKE) clean);)
clean-files:
rm -f *~ *.bak \#* $(TRASH)
rm -rf obj
-rm -rf ${TRASH}
distclean: clean
clean: clean-files
$(foreach dir,${CLEAN_SUBDIRS},(cd ${dir} && $(MAKE) clean);)
distclean: clean-files
$(foreach dir,${CLEAN_SUBDIRS},(cd ${dir} && $(MAKE) distclean);)
rm -f Makefile.bak
rm -f $(foreach f,$(wildcard *.in),$(f:.in=))
rm -f ${DIST_TRASH}
rm -f $(foreach f,$(wildcard *.in),$(filter-out configure,$(f:.in=)))
-rm -rf ${DIST_TRASH}
.PHONY: clean distclean
.PHONY: clean clean-files distclean
# Get dependencies (if existent).

47
Makefile.in
View File

@ -1,4 +1,5 @@
# Makefile -- makefile for gnucash
# @configure_input@
# Copyright (C) 1997 Robin Clark
# Copyright (C) 1998 Rob Browning <rlb@cs.utexas.edu>
#
@ -21,30 +22,7 @@
# Address: 609 8th Street
# Huntington Beach, CA 92648-4632
SHELL=/bin/bash
export SHELL
srcdir = @srcdir@
VPATH = @srcdir@
prefix=@prefix@
datadir=@datadir@
# i.e. /usr/share
localstatedir=@localstatedir@
# i.e. /var/
sysconfdir=@sysconfdir@
# i.e. /etc/
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
CPU = @target_cpu@
LIBS=@LIBS@
GNC_DOCDIR := @GNC_DOCDIR@
GNC_BINDIR := @GNC_BINDIR@
GNC_CONFIGDIR := @GNC_CONFIGDIR@
GNC_SHAREDIR := @GNC_SHAREDIR@
include @top_srcdir@/Makefile.init
######################################################################
# Description of targets:
@ -65,6 +43,10 @@ default:
@echo "qt kde/qt version"
@echo " "
# This inclusion must come after the first target, and after the
# definitions of *_SRCS, etc., but before the usage of *_OBJS.
include @top_srcdir@/Makefile.common
# Aliases
motif-static: motif.static
gnome-static: gnome.static
@ -94,18 +76,13 @@ qt:
depend:
@echo make depend is now superfluous.
clean:
rm -f *~ *.o *.bak
@cd lib; $(MAKE) clean
@cd src; $(MAKE) clean
CLEAN_SUBDIRS += lib src
TRASH += *~ *.o *.bak
distclean: clean
rm -f Makefile *~ *.o *.bak share/scm gnucash.bin
rm -f gnucash.motif gnucash.motif.static \
gnucash.gnome gnucash.gnome.static gnucash.qt gnucash-shell
rm -f config.cache config.log config.status config.h
@cd lib; $(MAKE) distclean
@cd src; $(MAKE) distclean
DIST_TRASH += Makefile *~ *.o *.bak share/scm gnucash.bin
DIST_TRASH += gnucash.motif gnucash.motif.static
DIST_TRASH += gnucash.gnome gnucash.gnome.static gnucash.qt gnucash-shell
DIST_TRASH += config.cache config.log config.status config.h
tagsfiles := $(shell find -name "*.[ch]")

34
Makefile.init.in Normal file
View File

@ -0,0 +1,34 @@
# -*-makefile-*-
@SET_MAKE@
export SHELL=/bin/bash
srcdir = @srcdir@
VPATH = @srcdir@
prefix=@prefix@
datadir=@datadir@
# i.e. /usr/share
localstatedir=@localstatedir@
# i.e. /var/
sysconfdir=@sysconfdir@
# i.e. /etc/
includedir=@includedir@
CC = @CC@
INSTALL = @INSTALL@
RANLIB = @RANLIB@
INSTALL_DATA = @INSTALL_DATA@
CPU = @target_cpu@
OPT_STYLE_INSTALL=@OPT_STYLE_INSTALL@
# These are *only* to be used at *install* time.
GNC_DOCDIR=@GNC_DOCDIR@
GNC_BINDIR=@GNC_BINDIR@
GNC_CONFIGDIR=@GNC_CONFIGDIR@
GNC_SHAREDIR=@GNC_SHAREDIR@
HAVE_PLOTUTILS=@HAVE_PLOTUTILS@

67
configure vendored
View File

@ -2476,16 +2476,15 @@ fi
if test ${OPT_STYLE_INSTALL} = 1
then
GNC_DOCDIR=${prefix}/doc
GNC_BINDIR=${prefix}/bin
GNC_DOCDIR='${prefix}/doc'
GNC_BINDIR='${prefix}/bin'
GNC_CONFIGDIR=${sysconfdir}
GNC_SHAREDIR=${datadir}
else
GNC_DOCDIR=${prefix}/doc/gnucash
GNC_BINDIR=${prefix}/bin
GNC_DOCDIR='${prefix}/doc/gnucash'
GNC_BINDIR='${prefix}/bin'
GNC_CONFIGDIR=${sysconfdir}/gnucash
GNC_SHAREDIR=${datadir}/gnucash
GNC_STARTUP_FILE=`eval echo ${datadir}/startup.scm`
fi
@ -2493,7 +2492,7 @@ fi
# We have to eval these because they are the *runtime* (not install
# We have to handle these here because they are the *runtime* (not install
# time) defaults, and they're substituted into startup.scm and gnucash.h
# directly, so:
# 1) We don't want them to change if you do
@ -2501,15 +2500,9 @@ fi
# 2) They are normally defined in terms of $prefix so we need to expand
# that before substituting into those source files. I wish I knew how
# to force a recursive expansion...
#
GNC_STARTUP_FILE=`eval echo ${GNC_SHAREDIR}/scm/startup.scm`
GNC_DOC_DIR_DEFAULT=`eval echo ${GNC_DOCDIR}`
GNC_HTML_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}/Docs`
GNC_REPORT_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}/Reports`
GNC_SHARE_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}`
GNC_CONFIG_DIR_DEFAULT=`eval echo ${GNC_CONFIGDIR}`
GNC_RUNTIME_SHAREDIR=`eval echo ${GNC_SHAREDIR}`
GNC_RUNTIME_CONFIGDIR=`eval echo ${GNC_CONFIGDIR}`
@ -2618,7 +2611,25 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "Makefile src/Makefile src/engine/Makefile src/guile/Makefile src/guile/gnucash.h src/scm/startup.scm src/gnome/Makefile src/motif/Makefile src/qt/Makefile src/register/Makefile src/reports/Makefile src/swig/Makefile src/swig/guile/Makefile lib/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
trap 'rm -fr `echo "Makefile
Makefile.init
src/Makefile
src/engine/Makefile
src/guile/Makefile
src/guile/gnucash.h
src/scm/Makefile
src/scm/startup.scm
src/gnome/Makefile
src/motif/Makefile
src/qt/Makefile
src/register/Makefile
src/reports/Makefile
src/swig/Makefile
src/swig/guile/Makefile
lib/Makefile
lib/Xbae-4.6.2-linas/Makefile
lib/Xbae-4.6.2-linas/src/Makefile
lib/ComboBox-1.33/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@ -2670,10 +2681,8 @@ s%@GNC_DOCDIR@%$GNC_DOCDIR%g
s%@GNC_BINDIR@%$GNC_BINDIR%g
s%@GNC_CONFIGDIR@%$GNC_CONFIGDIR%g
s%@GNC_SHAREDIR@%$GNC_SHAREDIR%g
s%@GNC_STARTUP_FILE@%$GNC_STARTUP_FILE%g
s%@GNC_DOC_DIR_DEFAULT@%$GNC_DOC_DIR_DEFAULT%g
s%@GNC_SHARE_DIR_DEFAULT@%$GNC_SHARE_DIR_DEFAULT%g
s%@GNC_CONFIG_DIR_DEFAULT@%$GNC_CONFIG_DIR_DEFAULT%g
s%@GNC_RUNTIME_SHAREDIR@%$GNC_RUNTIME_SHAREDIR%g
s%@GNC_RUNTIME_CONFIGDIR@%$GNC_RUNTIME_CONFIGDIR%g
CEOF
EOF
@ -2715,7 +2724,25 @@ EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile src/engine/Makefile src/guile/Makefile src/guile/gnucash.h src/scm/startup.scm src/gnome/Makefile src/motif/Makefile src/qt/Makefile src/register/Makefile src/reports/Makefile src/swig/Makefile src/swig/guile/Makefile lib/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile"}
CONFIG_FILES=\${CONFIG_FILES-"Makefile
Makefile.init
src/Makefile
src/engine/Makefile
src/guile/Makefile
src/guile/gnucash.h
src/scm/Makefile
src/scm/startup.scm
src/gnome/Makefile
src/motif/Makefile
src/qt/Makefile
src/register/Makefile
src/reports/Makefile
src/swig/Makefile
src/swig/guile/Makefile
lib/Makefile
lib/Xbae-4.6.2-linas/Makefile
lib/Xbae-4.6.2-linas/src/Makefile
lib/ComboBox-1.33/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

49
configure.in
View File

@ -192,26 +192,23 @@ AC_SUBST(MOTIF_LIBS)
if test ${OPT_STYLE_INSTALL} = 1
then
GNC_DOCDIR=${prefix}/doc
GNC_BINDIR=${prefix}/bin
GNC_DOCDIR='${prefix}/doc'
GNC_BINDIR='${prefix}/bin'
GNC_CONFIGDIR=${sysconfdir}
GNC_SHAREDIR=${datadir}
GNC_STARTUP_FILE=`eval echo ${datadir}/startup.scm`
else
GNC_DOCDIR=${prefix}/doc/gnucash
GNC_BINDIR=${prefix}/bin
GNC_DOCDIR='${prefix}/doc/gnucash'
GNC_BINDIR='${prefix}/bin'
GNC_CONFIGDIR=${sysconfdir}/gnucash
GNC_SHAREDIR=${datadir}/gnucash
GNC_STARTUP_FILE=`eval echo ${datadir}/scm/startup.scm`
fi
AC_SUBST(GNC_DOCDIR)
AC_SUBST(GNC_BINDIR)
AC_SUBST(GNC_CONFIGDIR)
AC_SUBST(GNC_SHAREDIR)
# We have to eval these because they are the *runtime* (not install
# We have to handle these here because they are the *runtime* (not install
# time) defaults, and they're substituted into startup.scm and gnucash.h
# directly, so:
# 1) We don't want them to change if you do
@ -219,22 +216,34 @@ AC_SUBST(GNC_SHAREDIR)
# 2) They are normally defined in terms of $prefix so we need to expand
# that before substituting into those source files. I wish I knew how
# to force a recursive expansion...
#
# GNC_STARTUP_FILE=`eval echo ${GNC_SHAREDIR}/scm/startup.scm`
GNC_DOC_DIR_DEFAULT=`eval echo ${GNC_DOCDIR}`
GNC_HTML_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}/Docs`
GNC_REPORT_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}/Reports`
GNC_SHARE_DIR_DEFAULT=`eval echo ${GNC_SHAREDIR}`
GNC_CONFIG_DIR_DEFAULT=`eval echo ${GNC_CONFIGDIR}`
AC_SUBST(GNC_STARTUP_FILE)
AC_SUBST(GNC_DOC_DIR_DEFAULT)
AC_SUBST(GNC_SHARE_DIR_DEFAULT)
AC_SUBST(GNC_CONFIG_DIR_DEFAULT)
GNC_RUNTIME_SHAREDIR=`eval echo ${GNC_SHAREDIR}`
GNC_RUNTIME_CONFIGDIR=`eval echo ${GNC_CONFIGDIR}`
AC_SUBST(GNC_RUNTIME_SHAREDIR)
AC_SUBST(GNC_RUNTIME_CONFIGDIR)
# *******************************************
AC_CONFIG_HEADER(config.h)
AC_OUTPUT(Makefile src/Makefile src/engine/Makefile src/guile/Makefile src/guile/gnucash.h src/scm/startup.scm src/gnome/Makefile src/motif/Makefile src/qt/Makefile src/register/Makefile src/reports/Makefile src/swig/Makefile src/swig/guile/Makefile lib/Makefile lib/Xbae-4.6.2-linas/Makefile lib/Xbae-4.6.2-linas/src/Makefile lib/ComboBox-1.33/Makefile)
AC_OUTPUT(Makefile
Makefile.init
src/Makefile
src/engine/Makefile
src/guile/Makefile
src/guile/gnucash.h
src/scm/Makefile
src/scm/startup.scm
src/gnome/Makefile
src/motif/Makefile
src/qt/Makefile
src/register/Makefile
src/reports/Makefile
src/swig/Makefile
src/swig/guile/Makefile
lib/Makefile
lib/Xbae-4.6.2-linas/Makefile
lib/Xbae-4.6.2-linas/src/Makefile
lib/ComboBox-1.33/Makefile)
chmod +x gnucash

8
lib/Makefile.in
View File

@ -21,11 +21,7 @@
# Address: 609 8th Street
# Huntington Beach, CA 92648-4632
# These three lines are suggested defs for autoconf (see the info pages).
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
include @top_srcdir@/Makefile.init
######################################################################
# Description of targets:
@ -51,7 +47,7 @@ all:
# This inclusion must come after the first target, and after the
# definitions of *_SRCS, etc., but before the usage of *_OBJS.
include $(top_srcdir)/Makefile.common
include @top_srcdir@/Makefile.common
motif:
@cd ComboBox-1.33; $(MAKE) default

10
src/Makefile.in
View File

@ -21,12 +21,8 @@
# Address: 609 8th Street
# Huntington Beach, CA 92648-4632
# These three lines are suggested defs for autoconf (see the info pages).
@SET_MAKE@
srcdir = @srcdir@
VPATH = @srcdir@
include @top_srcdir@/Makefile.init
CC = @CC@
INCLPATH = -I.. -I./engine -I./register -Ireports -I@srcdir@/../include -I@prefix@/include
CFLAGS = @CFLAGS@ @X_CFLAGS@ ${INCLPATH}
@ -34,14 +30,14 @@ CFLAGS = @CFLAGS@ @X_CFLAGS@ ${INCLPATH}
######################################################################
# See Makefile.common for information about these variables.
COMMON_SRCS := MultiLedger.c SplitLedger.c
CLEAN_SUBDIRS := engine gnome motif register guile reports swig qt
CLEAN_SUBDIRS := engine gnome motif register guile reports swig qt scm
######################################################################
all: default
# This inclusion must come after the first target, and after the
# definitions of *_SRCS, etc., but before the usage of *_OBJS.
include ../Makefile.common
include @top_srcdir@/Makefile.common
default: $(OBJS)

9
src/engine/Makefile.in
View File

@ -22,13 +22,8 @@
# Address: 609 8th Street
# Huntington Beach, CA 92648-4632
# These three lines are suggested defs for autoconf (see the info pages).
@SET_MAKE@
srcdir = @srcdir@
VPATH = @srcdir@
include @top_srcdir@/Makefile.init
CC = @CC@
RANLIB = @RANLIB@
INCLPATH = -I@srcdir@/../../include -I@srcdir@/../..
CFLAGS = @CFLAGS@ ${INCLPATH}
@ -42,7 +37,7 @@ all: default
# This inclusion must come after the first target, and after the
# definitions of *_SRCS, etc., but before the usage of *_OBJS.
include ../../Makefile.common
include @top_srcdir@/Makefile.common
default: ../libengine.a

12
src/gnome/Makefile.in
View File

@ -22,15 +22,7 @@
# Address: 609 8th Street
# Huntington Beach, CA 92648-4632
# These three lines are suggested defs for autoconf (see the info pages).
@SET_MAKE@
prefix = @prefix@
srcdir = @srcdir@
VPATH = @srcdir@
includedir=@includedir@
CC = @CC@
include @top_srcdir@/Makefile.init
INCLPATH = -I.. -I../.. -I../engine -I../register -I../guile \
-I@srcdir@/../../include \
@ -62,7 +54,7 @@ default: $(TARGET)
# This inclusion must come after the first target, and after the
# definitions of *_SRCS, etc., but before the usage of *_OBJS.
include ../../Makefile.common
include @top_srcdir@/Makefile.common
gnome: default

8
src/register/Makefile.in
View File

@ -21,10 +21,8 @@
# Address: 609 8th Street
# Huntington Beach, CA 92648-4632
srcdir = @srcdir@
VPATH = @srcdir@
CC = @CC@
RANLIB = @RANLIB@
include @top_srcdir@/Makefile.init
INCLPATH = -I@srcdir@/../.. \
-I@srcdir@/../../include \
-I@srcdir@/../engine \
@ -56,7 +54,7 @@ all:
# This inclusion must come after the first target, and after the
# definitions of *_SRCS, etc., but before the usage of *_OBJS.
include ../../Makefile.common
include @top_srcdir@/Makefile.common
motif: ${MOTIF_OBJS}

38
src/scm/Makefile.in Normal file
View File

@ -0,0 +1,38 @@
# Makefile -- makefile for gnucash/scm
# Copyright (C) 1998 Rob Browning <rlb@cs.utexas.edu>
#
# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
include @top_srcdir@/Makefile.init
######################################################################
# See Makefile.common for information about these variables.
#
######################################################################
all: default
# This inclusion must come after the first target, and after the
# definitions of *_SRCS, etc., but before the usage of *_OBJS.
include @top_srcdir@/Makefile.common
default:
@echo Nothing to do.
.PHONY: default
# Local Variables:
# tab-width: 2
# End:

14
src/scm/startup.scm.in
View File

@ -16,10 +16,8 @@
(primitive-load boot-file))
;; Automatically generated defaults...
(define gnc:_config-dir-default_ "@GNC_CONFIG_DIR_DEFAULT@")
(define gnc:_share-dir-default_ "@GNC_SHARE_DIR_DEFAULT@")
(define gnc:_doc-dir-default_ "@GNC_SHARE_DIR_DEFAULT@/Docs
@GNC_SHARE_DIR_DEFAULT@/Reports")
(define gnc:_config-dir-default_ "@GNC_RUNTIME_CONFIGDIR@")
(define gnc:_share-dir-default_ "@GNC_RUNTIME_SHAREDIR@")
(define gnc:*command-line-files* #f)
@ -368,10 +366,10 @@ default directory. i.e. (gnc:config-var-value-set! gnc:*doc-path*
(list result)
#f))))
equal?
(list
(string-append "(" (getenv "HOME") "/.gnucash/doc)")
(string-append "(" gnc:_doc-dir-default_ ")"))))
(list
(string-append "(" (getenv "HOME") "/.gnucash/doc)")
(string-append "(" gnc:_share-dir-default_ "/Docs)")
(string-append "(" gnc:_share-dir-default_ "/Reports)"))))
(define gnc:*prefs*
(list

5
src/swig/Makefile.in
View File

@ -16,11 +16,8 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# These three lines are suggested defs for autoconf (see the info pages).
@SET_MAKE@
srcdir = @srcdir@
VPATH = @srcdir@
HAVE_PLOTUTILS=@HAVE_PLOTUTILS@
include @top_srcdir@/Makefile.init
######################################################################
# See Makefile.common for information about these variables.

8
src/swig/guile/Makefile.in
View File

@ -17,12 +17,8 @@
# These three lines are suggested defs for autoconf (see the info pages).
@SET_MAKE@
srcdir = @top_srcdir@
prefix = @prefix@
VPATH = @top_srcdir@
include @top_srcdir@/Makefile.init
CC = @CC@
INCLPATH = \
-I. \
-I@top_srcdir@/src \
@ -38,8 +34,6 @@ INCLPATH = \
CFLAGS = @CFLAGS@ @X_CFLAGS@ -DCELL_WIDGETS=1 ${INCLPATH}
HAVE_PLOTUTILS=@HAVE_PLOTUTILS@
######################################################################
# SEE Makefile.common for information about these variables.
INDEP_SRCS = gnucash-all-guile_wrap.c gnucash-engine-guile_wrap.c