fixing rebase errors

9 files changed, 10 insertions, 36 deletions

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index d5c16e6326d5..abe4ceb3167f 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/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 \
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 2b06d65b371f..511fdf659945 100644
--- a/solenv/gbuild/Executable.mk
+++ b/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 \
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 184a14a8b4d8..ba9e445026fb 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/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)))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 421cce54ac63..a5e5eb08fa90 100644
--- a/solenv/gbuild/Library.mk
+++ b/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 \
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index db16663fc2d4..5ee2e5791663 100755
--- a/solenv/gbuild/TargetLocations.mk
+++ b/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,\
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index a8da2d5dc799..47d173054328 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/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)) \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 063860371719..32ee2328ac91 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -265,8 +265,6 @@ gb_Library_PLAINLIBS_NONE += \
 	nsl \
     pthread \
 	socket \
-    ICE \
-    SM \
     X11 \
     Xext \
     SM \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 8e5e0f9e6513..3f655675a393 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/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,\
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 025a9d2a7054..babeb36917fd 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/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 =