Commits

Anonymous committed d0e9847

gnumake4: oox, writerfilter, CppunitTest.mk: adapt to changes in gnumake4

  • Participants
  • Parent commits 8f3bb53

Comments (0)

Files changed (6)

File oox/Library_oox.mk

 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_defs,oox,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,oox,\
 	-DOOX_DLLIMPLEMENTATION \
 ))
 

File solenv/gbuild/CppunitTest.mk

 define gb_CppunitTest__CppunitTest_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
-$(call gb_LinkTarget_set_defs,$(2),\
-	$$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_CppunitTest_DEFS) \
 )
 $(call gb_LinkTarget_add_linked_libs,$(2),cppunit)

File writerfilter/JunitTest_writerfilter_complex.mk

 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex))
+$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\
 	$$(DEFS) \

File writerfilter/Library_writerfilter.mk

 	-I$(SRCDIR)/writerfilter/source/ooxml \
 ))
 
-$(eval $(call gb_Library_set_defs,writerfilter,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,writerfilter,\
 	-DWRITERFILTER_DLLIMPLEMENTATION \
 ))
 

File writerfilter/Library_writerfilter_debug.mk

 	-I$(SRCDIR)/writerfilter/inc \
 ))
 
-$(eval $(call gb_Library_set_defs,writerfilter_debug,\
-	$$(DEFS) \
-))
-
 $(eval $(call gb_Library_add_linked_libs,writerfilter_debug,\
 	writerfilter \
 	comphelper \

File writerfilter/Module_writerfilter.mk

 	Library_writerfilter_debug \
 ))
 
-# does not build
 $(eval $(call gb_Module_add_check_targets,writerfilter,\
 	CppunitTest_writerfilter_doctok \
 ))
 
-# does not run
 $(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\
 	JunitTest_writerfilter_complex \
 ))