fixing rebase errors

Module_ooo.mk

@@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,ooo))
 $(eval $(call gb_Module_add_moduledirs,ooo,\
 	basebmp \
 	basegfx \
+    dbaccess \
 	canvas \
     comphelper \
 	cppcanvas \
@@ -55,6 +56,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     unotools \
     unoxml \
     vbahelper \
+    wizards \
     writerfilter \
     vcl \
     xmloff \

Repository.mk

@@ -178,26 +178,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     ooopathutils \
     salcpprt \
 	vclmain \
-    zlib \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-    crypto \
-    ssl \
-))
-else
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-    crypto \
-    ssl \
-))
-endif
-
-ifeq ($(SYSTEM_OPENSSL),YES)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
-	crypto \
-	ssl \
-))
-endif
-
 # vim: set noet sw=4 ts=4:

RepositoryFixes.mk

@@ -105,7 +105,9 @@ endif
 # these are libraries built by OOo, but only a few of them
 # all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library
 # we link against their dlls in gcc format directly
-gb_Library_NOILIBFILENAMES:= icule icuuc
+gb_Library_NOILIBFILENAMES:=\
+	icuuc \
+	uwinapi \
 
 gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
@@ -113,8 +115,8 @@ gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib
 # some Windows platform libraries are missing in mingw library set
 # we have to use them from the PSDK by linking against their ilibs
 gb_Library_ILIBFILENAMES:=\
-    unicows \
-    uuid \
+	unicows \
+	uuid \
 	winmm \
 
 gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
@@ -144,10 +146,13 @@ gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)
 gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
 gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+
 ifeq ($(gb_PRODUCT),$(true))
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
 else
@@ -156,11 +161,7 @@ endif
 
 # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
 gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
-gb_Library_NOILIBFILENAMES += icuuc \
-    icule \
-    imm32\
-    msimg32 \
-    winspool \
+gb_Library_NOILIBFILENAMES += icule icuuc
 
 gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
@@ -185,11 +186,4 @@ ifeq ($(USE_SYSTEM_STL),YES)
 gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
 endif
 
-ifeq ($(SYSTEM_OPENSSL),YES)
-gb_StaticLibrary_TARGETS := $(filter-out crypto,$(gb_StaticLibrary_TARGETS))
-gb_StaticLibrary_TARGETS := $(filter-out ssl,$(gb_StaticLibrary_TARGETS))
-gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
-endif
-
 # vim: set noet sw=4 ts=4:

solenv/gbuild/CppunitTest.mk

@@ -88,7 +88,6 @@ $(eval $(foreach method,\
     set_cflags \
 	add_cxxflags \
 	set_yaccflags \
-    set_cxxflags \
 	add_objcxxflags \
     set_objcxxflags \
 	add_defs \

solenv/gbuild/Executable.mk

@@ -80,7 +80,6 @@ $(eval $(foreach method,\
     add_generated_exception_objects \
 	add_cflags \
     set_cflags \
-	set_yaccflags \
 	add_cxxflags \
     set_cxxflags \
 	add_objcxxflags \

solenv/gbuild/JavaClassSet.mk

@@ -38,18 +38,18 @@ $(call gb_Helper_abbreviate_dirs_native,\
 
 endef
 
-$(call gb_JavaClassSet_get_clean_target,%) : vaClassSet_get_target,%) :
+$(call gb_JavaClassSet_get_clean_target,%) :
    $(call gb_Output_announce,$*,$(true),JCS,3)
    $(call gb_JavaClassSet__command,$@,$*,$?,$^)
 
-$(call gb_Output_announce,$*,$(false),JCS,3)
+$(call gb_JavaClassSet_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),JCS,3)
     $(call gb_Helper_abbreviate_dirs,\
         rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
 
 # no initialization of scoped variable CLASSPATH as it is "inherited" from controlling instance (e.g. JUnitTest, Jar)
 # UGLY: cannot use target local variable for REPO because it's needed in prereq
 define gb_JavaClassSet_JavaClassSet
-$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
 $(if $(filter $(2),$(gb_JavaClassSet_REPOSITORYNAMES)),,\
   $(error JavaClassSet: no or invalid repository given; known repositories: \
   $(gb_JavaClassSet_REPOSITORYNAMES)))

solenv/gbuild/Library.mk

@@ -116,7 +116,6 @@ $(eval $(foreach method,\
     add_generated_exception_objects \
 	add_cflags \
     set_cflags \
-	set_yaccflags \
 	add_cxxflags \
     set_cxxflags \
 	add_objcxxflags \

solenv/gbuild/TargetLocations.mk

@@ -111,10 +111,10 @@ $(eval $(call gb_Helper_make_clean_targets,\
     AllLangResTarget \
     ComponentTarget \
     JavaClassSet \
+	Jar \
     JunitTest \
     LinkTarget \
     Module \
-    WinResTarget \
     NoexPrecompiledHeader \
     PackagePart \
     PrecompiledHeader \
@@ -124,6 +124,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
     CppunitTest \
     CustomTarget \
     WinResTarget \
+	Zip \
 ))
 
 $(eval $(call gb_Helper_make_outdir_clean_targets,\

solenv/gbuild/platform/linux.mk

@@ -291,7 +291,6 @@ gb_Library_PLAINLIBS_NONE += \
     X11 \
     Xext \
 	Xrender \
-    ICE \
 
 gb_Library_FILENAMES := \
     $(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \

solenv/gbuild/platform/solaris.mk

@@ -265,8 +265,6 @@ gb_Library_PLAINLIBS_NONE += \
 	nsl \
     pthread \
 	socket \
-    ICE \
-    SM \
     X11 \
     Xext \
     SM \

solenv/gbuild/platform/windows.mk

@@ -244,7 +244,7 @@ endef
 # CObject class
 
 ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_deponcompile
+define gb_Object__command_deponcompile
 $(call gb_Helper_abbreviate_dirs_native,\
     $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
         $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
@@ -258,10 +258,10 @@ $(call gb_Helper_abbreviate_dirs_native,\
         -v WORKDIR=$(WORKDIR)/ \
         -v SRCDIR=$(SRCDIR)/ \
         -v REPODIR=$(REPODIR)/ \
-    > $(call gb_CObject_get_dep_target,$(2)))
+    > $((2))
 endef
 else
-CObject__command_deponcompile =
+gb_Object__command_deponcompile =
 endif
 
 define gb_CObject__command
@@ -278,33 +278,12 @@ $(call gb_Helper_abbreviate_dirs_native,\
         $(INCLUDE) \
         -c $(3) \
         -Fo$(1))
-$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
 endef
 
 
 # CxxObject class
 
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_CxxObject__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
-    $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
-        $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
-        -I$(dir $(3)) \
-        $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME)%,$(6)) \
-        $(3) \
-        -f - \
-    | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-        -v OBJECTFILE=$(1) \
-        -v OUTDIR=$(OUTDIR)/ \
-        -v WORKDIR=$(WORKDIR)/ \
-        -v SRCDIR=$(SRCDIR)/ \
-        -v REPODIR=$(REPODIR)/ \
-    > $(call gb_CxxObject_get_dep_target,$(2)))
- endef
-else
-gb_CxxObject__command_deponcompile =
-endif
-
 define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs_native,\

solenv/gbuild/platform/winmingw.mk

@@ -227,7 +227,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
         -v WORKDIR=$(WORKDIR)/ \
         -v SRCDIR=$(SRCDIR)/ \
         -v REPODIR=$(REPODIR)/ \
-+	> $(2))
+	> $(2))
 endef
 else
 gb_Object__command_deponcompile =