gnumake4: postmerge fixes in dbaccess reportdesign

12 files changed, 19 insertions, 83 deletions

diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index fc7fbe1b8..2162eea0c 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
     dbaccess/source/ui/dlg/admincontrols.src \
     dbaccess/source/ui/dlg/adtabdlg.src \
     dbaccess/source/ui/dlg/advancedsettings.src \
-    dbaccess/source/ui/dlg/AutoControls.src \
     dbaccess/source/ui/dlg/CollectionView.src \
     dbaccess/source/ui/dlg/ConnectionPage.src \
     dbaccess/source/ui/dlg/dbadmin2.src \
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
index b5071bd4f..8fdb81d74 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -86,71 +86,11 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbui,\
 	dbaccess/source/ui/uno/dbinteraction.src \
 ))
 
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/admincontrols.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/AutoControls.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/ConnectionPage.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadmin.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadmin2.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadminsetup.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/textconnectionsettings.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/app/app.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/browser/sbabrw.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/browser/sbagrid.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadmin2.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/queryfilter.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/querydesign/query.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/tabledesign/table.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-
-# hack !!!
-# just a temporary - globlmn.hrc about to be removed!
-ifeq ($(strip $(WITH_LANG)),)
-$(WORKDIR)/inc/dbaccess/AutoControls.hrc : $(SRCDIR)/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
-	echo copying $@
-	-mkdir -p $(WORKDIR)/inc/dbaccess
-	cp $(SRCDIR)/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
-
-$(WORKDIR)/inc/dbaccess/toolbox.hrc : $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc
-	echo copying $@
-	-mkdir -p $(WORKDIR)/inc/dbaccess
-	cp $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc $(WORKDIR)/inc/dbaccess/toolbox.hrc
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
-else
--include $(WORKDIR)/inc/dbaccess/lastrun.mk
-ifneq ($(gb_lastrun_globlmn),MERGED)
-.PHONY : $(WORKDIR)/inc/dbaccess/toolbox.hrc $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-endif
-
-$(WORKDIR)/inc/dbaccess/AutoControls.hrc : $(SRCDIR)/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
-	echo merging $@
-	-mkdir -p $(WORKDIR)/inc/dbaccess
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
-	echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/dbaccess/lastrun.mk
-	$(call gb_Helper_abbreviate_dirs_native, \
-		$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-		-p svx \
-		 -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
-
-$(WORKDIR)/inc/dbaccess/toolbox.hrc : $(SRCDIR)/dbaccess/source/ui/inc/toolbox.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
-	echo merging $@
-	-mkdir -p $(WORKDIR)/inc/dbaccess
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
-	echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/dbaccess/lastrun.mk
-	$(call gb_Helper_abbreviate_dirs_native, \
-		$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-		-p svx \
-		 -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
-
-endif
-
-.PHONY : $(WORKDIR)/inc/dbaccess/toolbox.hrc_clean $(WORKDIR)/inc/dbaccess/AutoControls.hrc_clean
-$(WORKDIR)/inc/dbaccess/AutoControls.hrc_clean :
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk \
-		$(WORKDIR)/inc/dbaccess/AutoControls.hrc
+$(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\
+    dbaccess/source/ui/dlg/AutoControls_tmpl.hrc \
+    dbaccess/source/ui/inc/toolbox_tmpl.hrc \
+))
 
-$(WORKDIR)/inc/dbaccess/toolbox.hrc_clean :
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk \
-		$(WORKDIR)/inc/dbaccess/toolbox.hrc
+$(call gb_SrsTarget_get_target,dbaccess/dbui) :| $(OUTDIR)/inc/svx/globlmn.hrc
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk
index f51d38208..44ff86c53 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\
     $$(DEFS) \
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 7f8c6db47..bce5e77db 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -40,15 +40,13 @@ $(eval $(call gb_Library_set_include,dbu,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,dbu,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,dbu,\
     -DDBACCESS_DLLIMPLEMENTATION \
     $(if $(filter YES,$(SYSTEM_ODBC_HEADERS)),-DSYSTEM_ODBC_HEADERS) \
 ))
 
 ifeq (,$(strip $(PROF_EDITION)))
-$(eval $(call gb_Library_set_defs,dbu,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,dbu,\
     -DWINDOWS_VISTA_PSDK \
 ))
 endif
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 92ab4eb88..5e44b29d3 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Library_set_componentfile,dbui,dbaccess/util/dbu))
 $(eval $(call gb_Library_set_include,dbui,\
 	-I$(SRCDIR)/dbaccess/inc \
 	-I$(SRCDIR)/dbaccess/source/ui/inc \
+	-I$(SRCDIR)/dbaccess/source/ui/dlg \
 	-I$(SRCDIR)/dbaccess/source/inc \
 	-I$(SRCDIR)/dbaccess/inc/pch \
 	$$(SOLARINC) \
@@ -83,6 +84,7 @@ $(eval $(call gb_Library_add_linked_libs,dbui,\
 	cppuhelper \
 	cppu \
 	dbtools \
+	editeng \
 	i18nisolang1 \
 	fwe \
 	sal \
@@ -90,7 +92,6 @@ $(eval $(call gb_Library_add_linked_libs,dbui,\
 	sfx \
 	svl \
 	svt \
-	stl \
 	vcl \
 	tl \
 	utl \
@@ -100,7 +101,6 @@ $(eval $(call gb_Library_add_linked_libs,dbui,\
 	tk \
 	sot \
 	dba \
-	vos3 \
     $(gb_STDLIBS) \
 ))
 ifeq ($(OS),WNT)
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 51fe77bd9..a44d27c45 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -29,20 +29,20 @@ $(eval $(call gb_Module_Module,dbaccess))
 
 $(eval $(call gb_Module_add_targets,dbaccess,\
     $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \
-    AllLangResTarget_adabasui \
     AllLangResTarget_dba \
     AllLangResTarget_dbmm \
-    AllLangResTarget_dbu \
+    AllLangResTarget_dbui \
     AllLangResTarget_sdbt \
-    Library_adabasui \
     Library_dba \
     Library_dbaxml \
     Library_dbmm \
-    Library_dbu \
+    Library_dbui \
     Library_sdbt \
     Package_inc \
     Package_uiconfig \
 ))
+    #AllLangResTarget_adabasui \
+    Library_adabasui \
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
 	JunitTest_dbaccess_complex \
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 334d97135..d68f57daa 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -28,6 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
+#include "SharedConnection.hxx"
 
 #include "datasource.hxx"
 #include "module_dba.hxx"
@@ -37,7 +38,6 @@
 #include "core_resource.hxx"
 #include "core_resource.hrc"
 #include "connection.hxx"
-#include "SharedConnection.hxx"
 #include "databasedocument.hxx"
 #include "OAuthenticationContinuation.hxx"
 
diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src
index e43e2a13a..a286cdf33 100644
--- a/dbaccess/source/ui/dlg/AutoControls.src
+++ b/dbaccess/source/ui/dlg/AutoControls.src
@@ -25,9 +25,7 @@
  *
  ************************************************************************/
 
-#ifndef _DBAUI_AUTOCONTROLS_HRC_
 #include "AutoControls.hrc"
-#endif
 
 String STR_DBASE_PATH_OR_FILE
 {
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 17fb0ee2f..084fae643 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -69,6 +69,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <sfx2/docfilt.hxx>
+#include <AutoControlsDef.hrc>
 
 #ifdef _ADO_DATALINK_BROWSE_
 #include <vcl/sysdata.hxx>
diff --git a/dbaccess/source/ui/dlg/admincontrols.src b/dbaccess/source/ui/dlg/admincontrols.src
index 5e5ceda60..da7bbc578 100644
--- a/dbaccess/source/ui/dlg/admincontrols.src
+++ b/dbaccess/source/ui/dlg/admincontrols.src
@@ -24,7 +24,7 @@
  *
 ************************************************************************/
 
-#include "AutoControls.hrc"
+#include "AutoControlsDef.hrc"
 #include "dbu_dlg.hrc"
 #include "admincontrols.hrc"
 
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index 832ab7880..a717e372c 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,rpt,\
     cppu \
     cppuhelper \
     dbtools \
-    dbu \
+    dbui \
     editeng \
     fwe \
     i18nisolang1 \
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index c532117ce..8fcfb7161 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_linked_libs,rptui,\
     cppu \
     cppuhelper \
     dbtools \
-    dbu \
+    dbui \
     editeng \
     for \
     forui \