gnumake4: fix buildbreakers from merge

Repository.mk

@@ -42,17 +42,20 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-    adabasui \
-    AppleRemote \
 	adabas \
 	adabasui \
 	agg \
-    avmedia \
 	basebmp \
-    basegfx \
-    basebmp \
 	canvastools \
-	cppcanvas \
+	forui \
+	odbc \
+	odbcbase \
+	oox \
+	ooxml \
+	sdbc \
+    AppleRemote \
+    avmedia \
+    basegfx \
     chartcontroller \
     chartmodel \
     charttools \
@@ -64,13 +67,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     dbmm \
     dbtools \
     dbu \
-
     desktop_detector \
     doctok \
     drawinglayer \
     editeng \
     for \
-	forui \
     frm \
     fwe \
     fwi \
@@ -84,10 +85,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     lwpft \
     msfilter \
     msword \
-	odbc \
-	odbcbase \
-	oox \
-	ooxml \
     qstart_gtk \
     resourcemodel \
     rpt \
@@ -97,8 +94,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     sb \
     sc \
     scd \
-	sdbc \
-	sdbt \
     scfilt \
     scui \
     sd \
@@ -125,7 +120,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     unoxml \
     utl \
     vbahelper \
-	writerfilter \
     vcl \
     vclplug_gen \
     vclplug_gtk \
@@ -146,12 +140,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	test \
     cppunit \
-    crypto \
     fileacc \
     icui18n \
-    icule \
-    graphite2_off \
-    ssl \
 ))
 
 
@@ -202,13 +192,10 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	basegfx_s \
-    crypto \
-    graphite2_off \
     libeay32 \
     ssleay32 \
     ooopathutils \
     salcpprt \
-    ssl \
     toolshelpers \
 	vclmain \
 ))

RepositoryExternal.mk

@@ -272,11 +272,11 @@ endef
 else # !SYSTEM_GRAPHITE
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-    graphite \
+	graphite2_off \
 ))
 define gb_LinkTarget__use_graphite
 $(call gb_LinkTarget_add_linked_static_libs,$(1),\
-    graphite \
+    graphite2_off \
 )
 endef
 

RepositoryFixes.mk

@@ -36,35 +36,27 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-
+endif
-
-endif # ifeq ($(OS),LINUX)
 
 ifeq ($(OS),SOLARIS)
-
 gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-#$(info libnames: $(gb_Library_FILENAMES))
-
 endif
 
 ifeq ($(OS),MACOSX)
-
 gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-
 endif # ifeq ($(OS),MACOSX)
 
 ifeq ($(OS),WNT)
 
 ifneq ($(USE_MINGW),)
-
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
@@ -112,7 +104,6 @@ gb_Library_DLLFILENAMES := $(patsubst ssl:ssl%,ssl:ssleay32%,$(gb_Library_DLLFIL
 gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
-
 else #ifneq ($(USE_MINGW),)
 
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
@@ -159,24 +150,5 @@ endif # ifneq ($(USE_MINGW),)
 
 endif # ifeq ($(OS),WNT)
 
-gb_Library_FILENAMES := $(patsubst writerfilter_uno:writerfilter_uno%,writerfilter_uno:writerfilter%,$(gb_Library_FILENAMES))
-
-# we do not require a known rule for these, when using system libs
-ifeq ($(SYSTEM_OPENSSL),YES)
-gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
-endif
-
-gb_Library_TARGETS := $(filter-out icudata,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icui18n,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icuio,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icule,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out iculx,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icutu,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_CPPUNIT),YES)
-gb_Library_TARGETS := $(filter-out cppunit,$(gb_Library_TARGETS))
-endif
 
 # vim: set noet sw=4 ts=4:

solenv/gbuild/CppunitTest.mk

@@ -98,8 +98,7 @@ $(call gb_LinkTarget_add_defs,$(2),\
 )
 $(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
 $(call gb_LinkTarget_add_includes,$(2),$(filter -I%,$(CPPUNIT_CFLAGS)))
-$(call gb_LinkTarget_set_defs,$(2), \
+$(call gb_LinkTarget_add_defs,$(2), \
-    $$(DEFS) \
     $(filter-out -I%,$(CPPUNIT_CFLAGS)) \
 )
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))

solenv/gbuild/JavaClassSet.mk

@@ -14,12 +14,12 @@
 #
 # OpenOffice.org is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
 # GNU Lesser General Public License version 3 for more details
 # (a copy is included in the LICENSE file that accompanied this code).
 #
 # You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
+# version 3 along with OpenOffice.org.	If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
@@ -39,8 +39,8 @@ $(call gb_Helper_abbreviate_dirs_native,\
 endef
 
 $(call gb_JavaClassSet_get_clean_target,%) :
-   $(call gb_Output_announce,$*,$(true),JCS,3)
+	$(call gb_Output_announce,$*,$(true),JCS,3)
-   $(call gb_JavaClassSet__command,$@,$*,$?,$^)
+	$(call gb_JavaClassSet__command,$@,$*,$?,$^)
 
 $(call gb_JavaClassSet_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),JCS,3)