Rename module and related cmake rules from tax-us to locale-tax

gnucash/report/reports/CMakeLists.txt

@@ -96,7 +96,7 @@ set(scm_rpt_locale_specific_GUILE_DEPENDS
   scm-gnc-module
   scm-scm
   scm-test-core
-  scm-tax-us
+  scm-locale-tax
   scm-report
   scm-gnome-utils
   )

libgnucash/tax/CMakeLists.txt

@@ -2,4 +2,4 @@
 add_subdirectory(us)
 
 set_local_dist(tax_DIST_local CMakeLists.txt )
-set(tax_DIST ${tax_DIST_local} ${tax_us_DIST} PARENT_SCOPE)
+set(tax_DIST ${tax_DIST_local} ${locale_tax_DIST} PARENT_SCOPE)

libgnucash/tax/us/CMakeLists.txt

@@ -1,21 +1,21 @@
 add_subdirectory(test)
 
-set(tax_us_SOURCES gncmod-tax-us.c)
+set(locale_tax_SOURCES gncmod-locale-tax.c)
 
 # Add dependency on config.h
-set_source_files_properties (${tax_us_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${locale_tax_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-add_library(gncmod-tax-us ${tax_us_SOURCES})
-target_link_libraries(gncmod-tax-us gnc-module ${GLIB2_LDFLAGS} ${GUILE_LDFLAGS})
+add_library(gncmod-locale-tax ${locale_tax_SOURCES})
+target_link_libraries(gncmod-locale-tax gnc-module ${GLIB2_LDFLAGS} ${GUILE_LDFLAGS})
 
-target_include_directories(gncmod-tax-us
+target_include_directories(gncmod-locale-tax
     PRIVATE ${CMAKE_BINARY_DIR}/common ${GUILE_INCLUDE_DIRS})
 
 if (APPLE)
-  set_target_properties (gncmod-tax-us PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-locale-tax PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
 endif()
 
-install(TARGETS gncmod-tax-us
+install(TARGETS gncmod-locale-tax
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -61,10 +61,10 @@ gnc_add_scheme_targets(scm-tax-de_DE-2
 gnc_add_scheme_deprecated_module ("gnucash tax de_DE" "gnucash tax-de_DE" "scm-tax-de_DE-2" "")
 gnc_add_scheme_deprecated_module ("gnucash tax us" "gnucash tax-us" "scm-tax-us-2" "")
 
-add_custom_target(scm-tax-us ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-de_DE-1 scm-tax-de_DE-2 )
+add_custom_target(scm-locale-tax ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-de_DE-1 scm-tax-de_DE-2 )
 
-set_local_dist(tax_us_DIST_local CMakeLists.txt ${tax_us_SOURCES}
+set_local_dist(locale_tax_DIST_local CMakeLists.txt ${locale_tax_SOURCES}
     ${gncmod_tax_us_SCHEME_1} ${gncmod_tax_us_SCHEME_2}
     ${gncmod_tax_de_DE_SCHEME_1} ${gncmod_tax_de_DE_SCHEME_2})
-set(tax_us_DIST ${tax_us_DIST_local} ${test_tax_us_DIST} PARENT_SCOPE)
+set(locale_tax_DIST ${locale_tax_DIST_local} ${test_locale_tax_DIST} PARENT_SCOPE)
 

libgnucash/tax/us/gncmod-locale-tax.c

@@ -1,5 +1,5 @@
 /*********************************************************************
- * gncmod-tax-us.c
+ * gncmod-locale-tax.c
  * module definition/initialization for us tax info
  *
  * Copyright (c) 2001 Linux Developers Group, Inc.
@@ -34,25 +34,25 @@
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
-GNC_MODULE_API_DECL(libgncmod_tax_us)
+GNC_MODULE_API_DECL(libgncmod_locale_tax)
 
 /* version of the gnc module system interface we require */
-int libgncmod_tax_us_gnc_module_system_interface = 0;
+int libgncmod_locale_tax_gnc_module_system_interface = 0;
 
 /* module versioning uses libtool semantics. */
-int libgncmod_tax_us_gnc_module_current  = 0;
-int libgncmod_tax_us_gnc_module_revision = 0;
-int libgncmod_tax_us_gnc_module_age      = 0;
+int libgncmod_locale_tax_gnc_module_current  = 0;
+int libgncmod_locale_tax_gnc_module_revision = 0;
+int libgncmod_locale_tax_gnc_module_age      = 0;
 
 
 char *
-libgncmod_tax_us_gnc_module_path(void)
+libgncmod_locale_tax_gnc_module_path(void)
 {
     return g_strdup("gnucash/locale/tax");
 }
 
 char *
-libgncmod_tax_us_gnc_module_description(void)
+libgncmod_locale_tax_gnc_module_description(void)
 {
     return g_strdup("Locale dependent income tax information. Currently supported are 'us' and 'de_DE'. Default is 'us'");
 }
@@ -66,7 +66,7 @@ lmod(char * mn)
 }
 
 int
-libgncmod_tax_us_gnc_module_init(int refcount)
+libgncmod_locale_tax_gnc_module_init(int refcount)
 {
     /* This is a very simple hack that loads the (new, special) German
        tax definition file in a German locale, or (default) loads the
@@ -87,7 +87,7 @@ libgncmod_tax_us_gnc_module_init(int refcount)
 }
 
 int
-libgncmod_tax_us_gnc_module_end(int refcount)
+libgncmod_locale_tax_gnc_module_end(int refcount)
 {
     return TRUE;
 }

libgnucash/tax/us/test/CMakeLists.txt

@@ -1,8 +1,8 @@
-set(TAX_US_TEST_INCLUDE_DIRS "")
-set(TAX_US_TEST_LIBS "")
+set(LOCALE_TAX_TEST_INCLUDE_DIRS "")
+set(LOCALE_TAX_TEST_LIBS "")
 
 gnc_add_test(test-link-module-tax-us test-link-module.c
-  TAX_US_TEST_INCLUDE_DIRS TAX_US_TEST_LIBS
+  LOCALE_TAX_TEST_INCLUDE_DIRS LOCALE_TAX_TEST_LIBS
 )
 
 # FIXME why is this test not run ?
@@ -12,11 +12,11 @@ gnc_add_test(test-link-module-tax-us test-link-module.c
 #)
 #
 #gnc_add_scheme_test_targets(scm-test-load-tax-us-module
-#  "test-load-tax-us-module.scm"
+#  "test-load-locale-tax-module.scm"
 #  "tests"
 #  "${GUILE_DEPENDS}"
 #  FALSE
 #)
-#gnc_add_scheme_test(test-load-tax-us-module.scm)
+#gnc_add_scheme_test(test-load-locale-tax-module.scm)
 
-set_dist_list(test_tax_us_DIST CMakeLists.txt test-link-module.c test-load-tax-us-module.scm)
+set_dist_list(test_locale_tax_DIST CMakeLists.txt test-link-module.c test-load-locale-tax-module.scm)

libgnucash/tax/us/test/test-load-locale-tax-module.scm

@@ -1,4 +1,4 @@
-(display "  testing US tax info module load ... ")
+(display "  testing locale tax info module load ... ")
 (use-modules (gnucash gnc-module))
 (gnc:module-system-init)
 

po/POTFILES.in

@@ -695,7 +695,7 @@ libgnucash/gnc-module/gnc-module.c
 libgnucash/gnc-module/gnc-module.scm
 libgnucash/scm/price-quotes.scm
 libgnucash/scm/utilities.scm
-libgnucash/tax/us/gncmod-tax-us.c
+libgnucash/tax/us/gncmod-locale-tax.c
 libgnucash/tax/us/tax-de_DE.scm
 libgnucash/tax/us/tax-us.scm
 libgnucash/tax/us/txf-de_DE.scm