[related patch] [makedist2.diff] FURTHER attempt at getting
make dist to succeed
Chris Shoemaker
c.shoemaker at cox.net
Tue Oct 11 17:27:51 EDT 2005
Here's a related patch. With these applied, I am able to 'make dist'
and compile and install from the tarball.
* src/bin/Makefile.am | 2 +-
* src/business/business-core/file/Makefile.am | 3 ++-
* src/business/business-gnome/Makefile.am | 1 +
* src/business/business-gnome/schemas/Makefile.am | 6 +++---
* src/engine/Makefile.am | 1 +
* src/gnome-utils/schemas/Makefile.am | 6 +++---
* src/gnome/Makefile.am | 1 +
* src/gnome/schemas/Makefile.am | 6 +++---
* src/import-export/hbci/schemas/Makefile.am | 6 +++---
* src/import-export/log-replay/Makefile.am | 2 +-
* src/import-export/schemas/Makefile.am | 6 +++---
* src/report/stylesheets/Makefile.am | 2 +-
- Add files to distribution needed for compile of tarball.
src/bin/Makefile.am | 2 +-
src/business/business-core/file/Makefile.am | 3 ++-
src/business/business-gnome/Makefile.am | 1 +
src/business/business-gnome/schemas/Makefile.am | 6 +++---
src/engine/Makefile.am | 1 +
src/gnome-utils/schemas/Makefile.am | 6 +++---
src/gnome/Makefile.am | 1 +
src/gnome/schemas/Makefile.am | 6 +++---
src/import-export/hbci/schemas/Makefile.am | 6 +++---
src/import-export/log-replay/Makefile.am | 2 +-
src/import-export/schemas/Makefile.am | 6 +++---
src/report/stylesheets/Makefile.am | 2 +-
12 files changed, 23 insertions(+), 19 deletions(-)
Index: gnucash/src/bin/Makefile.am
===================================================================
--- gnucash.orig/src/bin/Makefile.am
+++ gnucash/src/bin/Makefile.am
@@ -25,7 +25,7 @@ bin_SCRIPTS = ${gnc_common_scripts} upda
# if you change gncoverridedir, make sure you change ./overrides/Makefile.am too.
gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
-EXTRA_DIST = .cvsignore generate-gnc-script
+EXTRA_DIST = .cvsignore generate-gnc-script update-gnucash-gconf.in
## Gnucash scripts -- real code is in overrides, these just get you there.
${gnc_common_scripts}: generate-gnc-script
Index: gnucash/src/business/business-core/file/Makefile.am
===================================================================
--- gnucash.orig/src/business/business-core/file/Makefile.am
+++ gnucash/src/business/business-core/file/Makefile.am
@@ -37,7 +37,8 @@ noinst_HEADERS = \
gnc-order-xml-v2.h \
gnc-owner-xml-v2.h \
gnc-tax-table-xml-v2.h \
- gnc-vendor-xml-v2.h
+ gnc-vendor-xml-v2.h \
+ xml-helpers.h
libgncmod_business_backend_file_la_LDFLAGS = -module
libgncmod_business_backend_file_la_LIBADD = \
Index: gnucash/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash.orig/src/business/business-gnome/Makefile.am
+++ gnucash/src/business/business-gnome/Makefile.am
@@ -60,6 +60,7 @@ noinst_HEADERS = \
dialog-payment.h \
dialog-vendor.h \
gnc-plugin-business.h \
+ gnc-plugin-page-invoice.h \
search-owner.h \
gw-business-gnome.h
Index: gnucash/src/business/business-gnome/schemas/Makefile.am
===================================================================
--- gnucash.orig/src/business/business-gnome/schemas/Makefile.am
+++ gnucash/src/business/business-gnome/schemas/Makefile.am
@@ -1,15 +1,15 @@
schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = \
+dist_schema_DATA = \
apps_gnucash_dialog_business_common.schemas
install-data-local:
if GCONF_SCHEMAS_INSTALL
-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(dist_schema_DATA)
endif
uninstall-local:
if GCONF_SCHEMAS_INSTALL
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(dist_schema_DATA)
endif
Index: gnucash/src/engine/Makefile.am
===================================================================
--- gnucash.orig/src/engine/Makefile.am
+++ gnucash/src/engine/Makefile.am
@@ -85,6 +85,7 @@ gncinclude_HEADERS = \
TransLog.h \
Transaction.h \
cap-gains.h \
+ cashobjects.h \
engine-helpers.h \
glib-helpers.h \
gnc-associate-account.h \
Index: gnucash/src/gnome-utils/schemas/Makefile.am
===================================================================
--- gnucash.orig/src/gnome-utils/schemas/Makefile.am
+++ gnucash/src/gnome-utils/schemas/Makefile.am
@@ -1,15 +1,15 @@
schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = \
+dist_schema_DATA = \
apps_gnucash_history.schemas
install-data-local:
if GCONF_SCHEMAS_INSTALL
-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(dist_schema_DATA)
endif
uninstall-local:
if GCONF_SCHEMAS_INSTALL
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(dist_schema_DATA)
endif
Index: gnucash/src/gnome/Makefile.am
===================================================================
--- gnucash.orig/src/gnome/Makefile.am
+++ gnucash/src/gnome/Makefile.am
@@ -73,6 +73,7 @@ noinst_HEADERS = \
dialog-budget-category.h \
dialog-budget-list.h \
dialog-budget-workbench.h \
+ dialog-chart-export.h \
dialog-fincalc.h \
dialog-find-transactions.h \
dialog-new-user.h \
Index: gnucash/src/gnome/schemas/Makefile.am
===================================================================
--- gnucash.orig/src/gnome/schemas/Makefile.am
+++ gnucash/src/gnome/schemas/Makefile.am
@@ -1,5 +1,5 @@
schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = \
+dist_schema_DATA = \
apps_gnucash_dialog_common.schemas \
apps_gnucash_dialog_commodities.schemas \
apps_gnucash_dialog_prices.schemas \
@@ -13,11 +13,11 @@ schema_DATA = \
install-data-local:
if GCONF_SCHEMAS_INSTALL
-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(dist_schema_DATA)
endif
uninstall-local:
if GCONF_SCHEMAS_INSTALL
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(dist_schema_DATA)
endif
Index: gnucash/src/import-export/hbci/schemas/Makefile.am
===================================================================
--- gnucash.orig/src/import-export/hbci/schemas/Makefile.am
+++ gnucash/src/import-export/hbci/schemas/Makefile.am
@@ -1,15 +1,15 @@
schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = \
+dist_schema_DATA = \
apps_gnucash_dialog_hbci.schemas
install-data-local:
if GCONF_SCHEMAS_INSTALL
-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(dist_schema_DATA)
endif
uninstall-local:
if GCONF_SCHEMAS_INSTALL
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(dist_schema_DATA)
endif
Index: gnucash/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash.orig/src/import-export/log-replay/Makefile.am
+++ gnucash/src/import-export/log-replay/Makefile.am
@@ -36,7 +36,7 @@ AM_CFLAGS = \
${GLIB_CFLAGS}
uidir = $(GNC_UI_DIR)
-ui_DATA = \
+dist_ui_DATA = \
gnc-plugin-log-replay-ui.xml
EXTRA_DIST = \
Index: gnucash/src/import-export/schemas/Makefile.am
===================================================================
--- gnucash.orig/src/import-export/schemas/Makefile.am
+++ gnucash/src/import-export/schemas/Makefile.am
@@ -1,15 +1,15 @@
schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = \
+dist_schema_DATA = \
apps_gnucash_import_generic_matcher.schemas
install-data-local:
if GCONF_SCHEMAS_INSTALL
-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(dist_schema_DATA)
endif
uninstall-local:
if GCONF_SCHEMAS_INSTALL
- -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(dist_schema_DATA)
endif
Index: gnucash/src/report/stylesheets/Makefile.am
===================================================================
--- gnucash.orig/src/report/stylesheets/Makefile.am
+++ gnucash/src/report/stylesheets/Makefile.am
@@ -41,7 +41,7 @@ gncscmmod_DATA = \
stylesheet-easy.scm
uidir = $(GNC_UI_DIR)
-ui_DATA = \
+dist_ui_DATA = \
gnc-plugin-stylesheets-ui.xml
EXTRA_DIST = ${gncscmmod_DATA}
More information about the gnucash-patches
mailing list