rename evoab2 back to evoab

Repository.mk

@@ -264,7 +264,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     ept \
     era \
     eti \
-	evoab2 \
+    evoab \
     exp \
 	file \
 	filterconfig \

connectivity/Configuration_evoab2.mk → 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 \
 ))
 

connectivity/Library_evoab2.mk → 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 \

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
 

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 += \