From cadcef87aa31dd763c17438b0c1c75c6ee9bd098 Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Wed, 21 Jun 2000 22:41:06 +0000 Subject: [PATCH] Remove table-html.c as a compile target. typedef gncBoolean as gboolean. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2492 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 10 ++++++++++ src/engine/gnc-common.h | 7 ++++--- src/gnome/window-register.c | 1 - src/register/Makefile.am | 6 +++--- src/register/Makefile.in | 11 +++++------ 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3c085ea2a..69207670e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-06-21 Dave Peticolas + + * src/register/Makefile.am: don't compile table-html.c, it is + not needed for linking. + + * src/gnome/window-register.c: remove include of table-html.c + + * src/engine/gnc-common.h: use 'gboolean' to typedef gncBoolean. + We should probably just phase out the use of gncBoolean. + 2000-06-20 Dave Peticolas * src/engine/util.c (xaccParseAmount): accept 8 decimal places diff --git a/src/engine/gnc-common.h b/src/engine/gnc-common.h index 8fba36810f..42177590d7 100644 --- a/src/engine/gnc-common.h +++ b/src/engine/gnc-common.h @@ -26,9 +26,10 @@ #define __GNC_COMMON_H__ #include "config.h" +#include -typedef char gncBoolean; -#define GNC_F 0 -#define GNC_T (! GNC_F) +typedef gboolean gncBoolean; +#define GNC_F (FALSE) +#define GNC_T (TRUE) #endif diff --git a/src/gnome/window-register.c b/src/gnome/window-register.c index b5eecca287..e0c1cabefd 100644 --- a/src/gnome/window-register.c +++ b/src/gnome/window-register.c @@ -47,7 +47,6 @@ #include "query-user.h" #include "enriched-messages.h" #include "table-gnome.h" -#include "table-html.h" #include "gnucash-sheet.h" #include "global-options.h" #include "dialog-find-transactions.h" diff --git a/src/register/Makefile.am b/src/register/Makefile.am index 1d74529bcc..29c10f3513 100644 --- a/src/register/Makefile.am +++ b/src/register/Makefile.am @@ -13,7 +13,6 @@ libgncregister_a_SOURCES = \ splitreg.c \ table-allgui.c \ table-gnome.c \ - table-html.c \ textcell.c noinst_HEADERS = \ @@ -29,12 +28,13 @@ noinst_HEADERS = \ splitreg.h \ table-allgui.h \ table-gnome.h \ - table-html.h \ textcell.h EXTRA_DIST = \ .cvsignore \ - design.txt + design.txt \ + table-html.c \ + table-html.h CFLAGS = @CFLAGS@ ${GNOME_CFLAGS} ${GUILE_COMPILE_ARGS} diff --git a/src/register/Makefile.in b/src/register/Makefile.in index b57c95742f..fb875449d1 100644 --- a/src/register/Makefile.in +++ b/src/register/Makefile.in @@ -118,13 +118,13 @@ l = @l@ noinst_LIBRARIES = libgncregister.a -libgncregister_a_SOURCES = QuickFill.c basiccell.c cellblock.c datecell.c numcell.c pricecell.c quickfillcell.c recncell.c splitreg.c table-allgui.c table-gnome.c table-html.c textcell.c +libgncregister_a_SOURCES = QuickFill.c basiccell.c cellblock.c datecell.c numcell.c pricecell.c quickfillcell.c recncell.c splitreg.c table-allgui.c table-gnome.c textcell.c -noinst_HEADERS = QuickFill.h basiccell.h cellblock.h combocell.h datecell.h numcell.h pricecell.h quickfillcell.h recncell.h splitreg.h table-allgui.h table-gnome.h table-html.h textcell.h +noinst_HEADERS = QuickFill.h basiccell.h cellblock.h combocell.h datecell.h numcell.h pricecell.h quickfillcell.h recncell.h splitreg.h table-allgui.h table-gnome.h textcell.h -EXTRA_DIST = .cvsignore design.txt +EXTRA_DIST = .cvsignore design.txt table-html.c table-html.h CFLAGS = @CFLAGS@ ${GNOME_CFLAGS} ${GUILE_COMPILE_ARGS} @@ -150,7 +150,7 @@ X_PRE_LIBS = @X_PRE_LIBS@ libgncregister_a_LIBADD = libgncregister_a_OBJECTS = QuickFill.o basiccell.o cellblock.o \ datecell.o numcell.o pricecell.o quickfillcell.o recncell.o splitreg.o \ -table-allgui.o table-gnome.o table-html.o textcell.o +table-allgui.o table-gnome.o textcell.o AR = ar COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -168,8 +168,7 @@ GZIP_ENV = --best DEP_FILES = .deps/QuickFill.P .deps/basiccell.P .deps/cellblock.P \ .deps/datecell.P .deps/numcell.P .deps/pricecell.P \ .deps/quickfillcell.P .deps/recncell.P .deps/splitreg.P \ -.deps/table-allgui.P .deps/table-gnome.P .deps/table-html.P \ -.deps/textcell.P +.deps/table-allgui.P .deps/table-gnome.P .deps/textcell.P SOURCES = $(libgncregister_a_SOURCES) OBJECTS = $(libgncregister_a_OBJECTS)