diff options
author | David Tardon <dtardon@redhat.com> | 2012-04-14 09:53:48 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:24:47 +0200 |
commit | b7c152e14d9b96e8f1ac6ebc45158601ab49f912 (patch) | |
tree | 5c3406350c18d96feeec0fce640df2e87e7d3212 | |
parent | 978f343e6dda68e3e38fe6a3c3c79b6490857c05 (diff) |
rename evoab2 back to evoab
-rw-r--r-- | Repository.mk | 2 | ||||
-rw-r--r-- | connectivity/Configuration_evoab.mk (renamed from connectivity/Configuration_evoab2.mk) | 6 | ||||
-rw-r--r-- | connectivity/Library_evoab.mk (renamed from connectivity/Library_evoab2.mk) | 14 | ||||
-rw-r--r-- | connectivity/Module_connectivity.mk | 4 | ||||
-rw-r--r-- | postprocess/packregistry/makefile.mk | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/Repository.mk b/Repository.mk index 8dfa2d76a4c0..45b89f9d8d0a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -264,7 +264,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ ept \ era \ eti \ - evoab2 \ + evoab \ exp \ file \ filterconfig \ diff --git a/connectivity/Configuration_evoab2.mk b/connectivity/Configuration_evoab.mk index 9221efe0ed58..ad822687842b 100644 --- a/connectivity/Configuration_evoab2.mk +++ b/connectivity/Configuration_evoab.mk @@ -25,13 +25,13 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Configuration_Configuration,driver_evoab2)) +$(eval $(call gb_Configuration_Configuration,driver_evoab)) -$(eval $(call gb_Configuration_add_spool_modules,driver_evoab2,connectivity/registry/evoab2,\ +$(eval $(call gb_Configuration_add_spool_modules,driver_evoab,connectivity/registry/evoab2,\ org/openoffice/Office/DataAccess/Drivers-evoab2.xcu \ )) -$(eval $(call gb_Configuration_add_localized_datas,driver_evoab2,connectivity/registry/evoab2,\ +$(eval $(call gb_Configuration_add_localized_datas,driver_evoab,connectivity/registry/evoab2,\ org/openoffice/Office/DataAccess/Drivers.xcu \ )) diff --git a/connectivity/Library_evoab2.mk b/connectivity/Library_evoab.mk index 05973c7859ec..3f41de254fbe 100644 --- a/connectivity/Library_evoab2.mk +++ b/connectivity/Library_evoab.mk @@ -25,30 +25,30 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Library_Library,evoab2)) +$(eval $(call gb_Library_Library,evoab)) $(eval $(call gb_Library_use_packages,calc,\ connectivity_generated \ )) -$(eval $(call gb_Library_set_include,evoab2,\ +$(eval $(call gb_Library_set_include,evoab,\ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ )) -$(eval $(call gb_Library_use_externals,evoab2,\ +$(eval $(call gb_Library_use_externals,evoab,\ gtk \ gobject \ )) -$(eval $(call gb_Library_set_componentfile,evoab2,connectivity/source/drivers/evoab2/evoab)) +$(eval $(call gb_Library_set_componentfile,evoab,connectivity/source/drivers/evoab2/evoab)) -$(eval $(call gb_Library_use_api,evoab2,\ +$(eval $(call gb_Library_use_api,evoab,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_use_libraries,evoab2,\ +$(eval $(call gb_Library_use_libraries,evoab,\ comphelper \ cppu \ cppuhelper \ @@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_libraries,evoab2,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_exception_objects,evoab2,\ +$(eval $(call gb_Library_add_exception_objects,evoab,\ connectivity/source/drivers/evoab2/NDriver \ connectivity/source/drivers/evoab2/NTable \ connectivity/source/drivers/evoab2/NColumns \ diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index fff5c1c382a8..38c7124b5dcd 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -92,8 +92,8 @@ endif ifeq ($(ENABLE_EVOAB2),TRUE) $(eval $(call gb_Module_add_targets,connectivity,\ - Configuration_evoab2 \ - Library_evoab2 \ + Configuration_evoab \ + Library_evoab \ )) endif diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index c54f3fa48c59..1644fff6ec76 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -331,7 +331,7 @@ ERROR : unknown-GUIBASE .IF "$(ENABLE_EVOAB2)" == "TRUE" MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu -MY_DRIVERS += evoab2 +MY_DRIVERS += evoab .END .IF "$(SOLAR_JAVA)" == "TRUE" MY_FILES_main += \ |