incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1394326 [10/15] - in /incubator/ooo/branches/buildsys/main: ./ basebmp/inc/basebmp/ basebmp/prj/ basebmp/test/ basegfx/inc/basegfx/color/ basegfx/inc/basegfx/curve/ basegfx/inc/basegfx/matrix/ basegfx/inc/basegfx/numeric/ basegfx/inc/baseg...
Date Thu, 04 Oct 2012 23:16:58 GMT
Modified: incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/columninfo/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/columninfo/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/columninfo/makefile.mk Thu Oct  4 23:16:35 2012
@@ -51,5 +51,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 .INCLUDE :  set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
-.INCLUDE :  tg_wntx64.mk
\ No newline at end of file
+
+.INCLUDE :  tg_wntx64.mk

Modified: incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/infotips/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/infotips/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/infotips/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/infotips/makefile.mk Thu Oct  4 23:16:35 2012
@@ -52,5 +52,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE 
-.INCLUDE :	tg_wntx64.mk
\ No newline at end of file
+ 
+.INCLUDE :	tg_wntx64.mk

Modified: incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/makefile.mk Thu Oct  4 23:16:35 2012
@@ -148,6 +148,6 @@ DEF1EXPORTFILE_X64=exports.dxp
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
 .INCLUDE :	tg_wntx64.mk
 

Modified: incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk Thu Oct  4 23:16:35 2012
@@ -133,5 +133,5 @@ DEF1EXPORTFILE_X64=exports.dxp
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
 .INCLUDE :	tg_wntx64.mk

Modified: incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/prophdl/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/prophdl/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/prophdl/makefile.mk Thu Oct  4 23:16:35 2012
@@ -134,5 +134,5 @@ DEF1EXPORTFILE_X64=exports.dxp
 .INCLUDE :  set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
 .INCLUDE :  tg_wntx64.mk

Modified: incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/propsheets/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/propsheets/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/propsheets/makefile.mk Thu Oct  4 23:16:35 2012
@@ -57,5 +57,5 @@ SLOFILES_X64=$(SLO_X64)$/propsheets.obj\
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
-.INCLUDE :	tg_wntx64.mk
\ No newline at end of file
+
+.INCLUDE :	tg_wntx64.mk

Modified: incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk Thu Oct  4 23:16:35 2012
@@ -53,6 +53,6 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE 
+ 
 .INCLUDE :	tg_wntx64.mk
 

Modified: incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/util/makefile.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/util/makefile.mk (original)
+++ incubator/ooo/branches/buildsys/main/shell/source/win32/shlxthandler/util/makefile.mk Thu Oct  4 23:16:35 2012
@@ -59,6 +59,6 @@ SLOFILES_X64=$(SLO_X64)$/dbgmacros.obj\
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
 .INCLUDE :	tg_wntx64.mk
 

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/ComponentTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/ComponentTarget.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/ComponentTarget.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/ComponentTarget.mk Thu Oct  4 23:16:35 2012
@@ -33,19 +33,27 @@ $(call gb_Helper_abbreviate_dirs_native,
 	$(gb_XSLTPROC) --nonet --stringparam uri \
     	'$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
 		$(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
-
 endef
 
+# creates 2 componentfiles: the first is for the installation set,
+# the second is for using the component during the build.
+# bit of a hack, hopefully inbuild can be removed when solver layout is fixed.
 define gb_ComponentTarget__rules
-$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
+$$(call gb_ComponentTarget_get_inbuild_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
 	$$(call gb_ComponentTarget__command,$$@,$$<,$$*)
 
-$$(call gb_ComponentTarget_get_clean_target,%) :
-	$$(call gb_Output_announce,$$*,$(false),CMP,1)
-	rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*)
+$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
+	$$(call gb_ComponentTarget__command,$$@,$$<,$$*)
 
 endef
 
+$(call gb_ComponentTarget_get_clean_target,%) :
+	$(call gb_Output_announce,$$*,$(false),CMP,1)
+	rm -f $(call gb_ComponentTarget_get_outdir_target,$*) \
+		$(call gb_ComponentTarget_get_target,$*) \
+		$(call gb_ComponentTarget_get_outdir_inbuild_target,$*) \
+		$(call gb_ComponentTarget_get_inbuild_target,$*) \
+
 $(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
 
 $(call gb_ComponentTarget_get_target,%) :
@@ -56,9 +64,13 @@ $(call gb_ComponentTarget_get_external_t
 
 define gb_ComponentTarget_ComponentTarget
 $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
+$(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3)
 $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
+$(call gb_ComponentTarget_get_inbuild_target,$(1)) : COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE)
 $(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1))
+$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : $(call gb_ComponentTarget_get_inbuild_target,$(1))
 $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)),$(1))
 
 endef
 

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/CppunitTest.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/CppunitTest.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/CppunitTest.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/CppunitTest.mk Thu Oct  4 23:16:35 2012
@@ -55,6 +55,9 @@ endef
 define gb_CppunitTest__CppunitTest_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
+$(call gb_LinkTarget_add_defs,$(2),\
+	$(gb_CppunitTest_DEFS) \
+)
 $(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
@@ -77,15 +80,24 @@ $(eval $(foreach method,\
 	add_objcxxobjects \
 	add_exception_objects \
 	add_noexception_objects \
+	set_yaccflags \
+	add_cflags \
 	set_cflags \
+	add_cxxflags \
 	set_cxxflags \
+	add_objcxxflags \
 	set_objcxxflags \
+	add_defs \
 	set_defs \
 	set_include \
+	add_ldflags \
 	set_ldflags \
+	add_libs \
 	set_library_path_flags \
 	add_linked_libs \
 	add_linked_static_libs \
+	use_external \
+	use_externals \
 	add_package_headers \
 	add_sdi_headers \
 	add_precompiled_header \

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/CustomTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/CustomTarget.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/CustomTarget.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/CustomTarget.mk Thu Oct  4 23:16:35 2012
@@ -32,56 +32,44 @@ define gb_CustomTarget__command
 
 endef
 
-define gb_CustomTarget__rules
-$$(call gb_CustomTarget_get_repo_target,$(1),%) :
-	$$(call gb_Output_announce,$$*,$$(true),MAK,3)
-	$$(call gb_CustomTarget__command,$$@,$$*)
-
-$$(call gb_CustomTarget_get_target,%) : $$(call gb_CustomTarget_get_repo_target,$(1),%)
-	$$(call gb_Helper_abbreviate_dirs,\
-		touch $$@)
-
-endef
+$(call gb_CustomTarget_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),MAK,3)
+	$(call gb_CustomTarget__command,$@,$*)
 
 .PHONY: $(call gb_CustomTarget_get_clean_target,%)
 $(call gb_CustomTarget_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),MAK,3)
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -rf $(call gb_CustomTarget_get_workdir,$*) && \
-		rm -f $(call gb_CustomTarget_get_target,$*) \
-			$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(call gb_CustomTarget_get_repo_target,$(reponame),$*)))
-
-
-$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(eval $(call gb_CustomTarget__rules,$(reponame))))
+		rm -f $(call gb_CustomTarget_get_target,$*))
 
 define gb_CustomTarget__get_makefile
 $(1)/$(2)/Makefile
 endef
 
 define gb_CustomTarget_CustomTarget
-$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\
-	$(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(call gb_CustomTarget__get_makefile,$($(reponame)),$(1))))
-
-$(call gb_CustomTarget_get_workdir,$(1))/% : $(call gb_CustomTarget_get_target,$(1))
-
+$(if $(filter $(2),$(gb_CustomTarget_REPOSITORYNAMES)),,\
+ $(error CustomTarget: no or invalid repository given; known repositories: \
+  $(gb_JavaClassSet_REPOSITORYNAMES)))
+gb_CustomTarget_REPO_$(1) := $(2)
+$(call gb_CustomTarget_get_target,$(1)) : \
+  $(call gb_CustomTarget__get_makefile,$($(2)),$(1))
+$(call gb_CustomTarget_get_workdir,$(1))/% : \
+  $(call gb_CustomTarget_get_target,$(1))
 endef
 
 
 define gb_CustomTarget_add_dependency
-$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\
-	$(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $($(reponame))/$(2)))
-
+$(eval $(call gb_CustomTarget_get_target,$(1)) : \
+	$($(gb_CustomTarget_REPO_$(1)))/$(2))
 endef
 
 define gb_CustomTarget_add_dependencies
 $(foreach dependency,$(2),$(call gb_CustomTarget_add_dependency,$(1),$(dependency)))
-
 endef
 
 define gb_CustomTarget_add_outdir_dependency
-$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\
-	$(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(2)))
-
+$(eval $(call gb_CustomTarget_get_target,$(1)) : $(2))
 endef
 
 define gb_CustomTarget_add_outdir_dependencies

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/Deliver.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/Deliver.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/Deliver.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/Deliver.mk Thu Oct  4 23:16:35 2012
@@ -40,15 +40,21 @@ $(if $(gb_HIRESTIME),,.LOW_RESOLUTION_TI
 endef
 
 ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
-define gb_Deliver_deliver
+define gb_Deliver__deliver
 mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) cp -f $(1) $(2) && touch -r $(1) $(2)
 endef
 else
-define gb_Deliver_deliver
+define gb_Deliver__deliver
 mkdir -p $(dir $(2)) && $(gb_Deliver_GNUCOPY) $(if $(gb_Deliver_CLEARONDELIVER),--remove-destination) --force --preserve=timestamps $(1) $(2)
 endef
 endif
 
+define gb_Deliver_deliver
+$(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\
+ $(error gb_Deliver_deliver:\
+  file does not exist in solver, and cannot be delivered: $(2)))
+endef
+
 
 # We are currently only creating a deliver.log, if only one module gets build.
 # As it is possible to add gbuild modules into other (which is done for example for

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/Executable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/Executable.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/Executable.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/Executable.mk Thu Oct  4 23:16:35 2012
@@ -43,6 +43,7 @@ $(call gb_Executable__Executable_impl,$(
 endef
 
 define gb_Executable__Executable_impl
+$(call gb_Executable_set_targettype_gui,$(2))
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),Executable)
 $(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
@@ -53,6 +54,11 @@ $(call gb_Deliver_add_deliverable,$(call
 
 endef
 
+define gb_Executable_set_targettype_gui
+$(call gb_Executable_get_target,$(1)) : gb_Executable_TARGETGUI := $(2)
+endef
+
+
 define gb_Executable_forward_to_Linktarget
 gb_Executable_$(1) = $$(call gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable_EXT),$$(2),$$(3))
 
@@ -68,15 +74,24 @@ $(eval $(foreach method,\
 	add_exception_objects \
 	add_noexception_objects \
 	add_generated_exception_objects \
+	set_yaccflags \
+	add_cflags \
 	set_cflags \
+	add_cxxflags \
 	set_cxxflags \
+	add_objcxxflags \
 	set_objcxxflags \
+	add_defs \
 	set_defs \
 	set_include \
+	add_ldflags \
 	set_ldflags \
+	add_libs \
 	set_library_path_flags \
 	add_linked_libs \
 	add_linked_static_libs \
+	use_external \
+	use_externals \
 	add_package_headers \
 	add_sdi_headers \
 	add_precompiled_header \

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/Helper.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/Helper.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/Helper.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/Helper.mk Thu Oct  4 23:16:35 2012
@@ -95,6 +95,7 @@ gb_Helper_REPOSITORYNAMES += $(1)
 
 endef
 
+# RepositoryExternal.mk is optional
 define gb_Helper_add_repository
 gb_Helper_CURRENTREPOSITORY :=
 include $(1)/Repository.mk
@@ -102,6 +103,7 @@ ifeq ($$(gb_Helper_CURRENTREPOSITORY),)
 $$(eval $$(call gb_Output_error,No call to gb_Helper_register_repository in Repository.mk for repository $(1)))
 endif
 $$(gb_Helper_CURRENTREPOSITORY) := $(1)
+-include $(1)/RepositoryExternal.mk
 
 endef
 
@@ -137,6 +139,12 @@ define gb_Helper_register_executables
 ifeq ($$(filter $(1),$$(gb_Executable_VALIDGROUPS)),)
 $$(eval $$(call gb_Output_error,$(1) is not a valid group for executables. Valid groups are: $$(gb_Executable_VALIDGROUPS)))
 endif
+$(foreach group,$(gb_Executable_VALIDGROUPS),\
+ $(foreach target,$(2),\
+  $(if $(filter $(target),$(gb_Executable_$(group))),\
+   $(call gb_Output_error,gb_Helper_register_executables: already registered: $(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_executables: contains duplicates: $(2)))
 
 gb_Executable_$(1) += $(2)
 
@@ -146,6 +154,12 @@ define gb_Helper_register_libraries
 ifeq ($$(filter $(1),$$(gb_Library_VALIDGROUPS)),)
 $$(eval $$(call gb_Output_error,$(1) is not a valid group for libraries. Valid groups are: $$(gb_Library_VALIDGROUPS)))
 endif
+$(foreach group,$(gb_Library_VALIDGROUPS),\
+ $(foreach target,$(2),\
+  $(if $(filter $(target),$(gb_Library_$(group))),\
+   $(call gb_Output_error,gb_Helper_register_libraries: already registered: $(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_libraries: contains duplicates: $(2)))
 
 gb_Library_$(1) += $(2)
 
@@ -155,6 +169,12 @@ define gb_Helper_register_static_librari
 ifeq ($$(filter $(1),$$(gb_StaticLibrary_VALIDGROUPS)),)
 $$(eval $$(call gb_Output_error,$(1) is not a valid group for static libraries. Valid groups are: $$(gb_StaticLibrary_VALIDGROUPS)))
 endif
+$(foreach group,$(gb_StaticLibrary_VALIDGROUPS),\
+ $(foreach target,$(2),\
+  $(if $(filter $(target),$(gb_StaticLibrary_$(group))),\
+   $(call gb_Output_error,gb_Helper_register_static_libraries: already registered: $(target)))))
+$(if $(filter-out $(words $(2)),$(words $(sort $(2)))),\
+ $(call gb_Output_error,gb_Helper_register_static_libraries: contains duplicates: $(2)))
 
 gb_StaticLibrary_$(1) += $(2)
 

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/JavaClassSet.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/JavaClassSet.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/JavaClassSet.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/JavaClassSet.mk Thu Oct  4 23:16:35 2012
@@ -27,51 +27,81 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACO
 define gb_JavaClassSet__command
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) && \
-	$(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(3) && \
+	$(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\
+			$(filter-out $(JARDEPS),$(3)),\
+			$(filter-out $(JARDEPS),$(4))) &&\
 	touch $(1))
 
 endef
 
-define gb_JavaClassSet__rules
-$$(call gb_JavaClassSet_get_repo_target,$(1),%) :
-	$$(call gb_JavaClassSet__command,$$@,$$*,$$?)
-
-$$(call gb_JavaClassSet_get_target,%) : $$(call gb_JavaClassSet_get_repo_target,$(1),%)
-	$$(call gb_Output_announce,$$*,$$(true),JCS,3)
-	$$(call gb_Helper_abbreviate_dirs,\
-		touch $$@)
-
-endef
+$(call gb_JavaClassSet_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),JCS,3)
+	$(call gb_JavaClassSet__command,$@,$*,$?,$^)
 
 $(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,$*)))
 
-
-$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),$(eval $(call gb_JavaClassSet__rules,$(reponame))))
-
+# 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
+$(if $(filter $(2),$(gb_JavaClassSet_REPOSITORYNAMES)),,\
+  $(error JavaClassSet: no or invalid repository given; known repositories: \
+  $(gb_JavaClassSet_REPOSITORYNAMES)))
+gb_JavaClassSet_REPO_$(1) := $(2)
+$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
 endef
 
 define gb_JavaClassSet__get_sourcefile
-$(1)/$(2).java
+$($(1))/$(2).java
 endef
 
 define gb_JavaClassSet_add_sourcefile
-$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\
-	$(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : $(call gb_JavaClassSet__get_sourcefile,$($(reponame)),$(2))))
-
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : \
+	$(call gb_JavaClassSet__get_sourcefile,$(gb_JavaClassSet_REPO_$(1)),$(2)))
 endef
 
 define gb_JavaClassSet_add_sourcefiles
 $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefile)))
-
 endef
 
 define gb_JavaClassSet_set_classpath
-$(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2)
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $(2))
+endef
+
+# problem: currently we can't get these dependencies to work
+# build order dependency is a hack to get these prerequisites out of the way in the build command
+define gb_JavaClassSet_add_jar
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$$(gb_CLASSPATHSEP)$(strip $(2)))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
+endef
+
+# this does not generate dependency on the jar
+define gb_JavaClassSet_add_system_jar
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$$(gb_CLASSPATHSEP)$(strip $(2)))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
+endef
+
+define gb_JavaClassSet_add_jars
+$(foreach jar,$(2),$(call gb_JavaClassSet_add_jar,$(1),$(jar)))
+endef
+
+define gb_JavaClassSet_add_system_jars
+$(foreach jar,$(2),$(call gb_JavaClassSet_add_system_jar,$(1),$(jar)))
+endef
+
+# this forwards to functions that must be defined in RepositoryExternal.mk.
+# $(call gb_LinkTarget_use_external,library,external)
+define gb_JavaClassSet_use_external
+$(eval $(if $(value gb_JavaClassSet__use_$(2)),\
+  $(call gb_JavaClassSet__use_$(2),$(1)),\
+  $(error gb_JavaClassSet_use_external: unknown external: $(2))))
+endef
 
+define gb_JavaClassSet_use_externals
+$(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external)))
 endef
 
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/JunitTest.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/JunitTest.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/JunitTest.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/JunitTest.mk Thu Oct  4 23:16:35 2012
@@ -50,7 +50,7 @@ $(call gb_JunitTest_get_target,$(1)) : C
 $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
 $(call gb_JunitTest_JunitTest_platform,$(1))
 
-$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)))
+$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
 $(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1)))
 $(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
 endef

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/Library.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/Library.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/Library.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/Library.mk Thu Oct  4 23:16:35 2012
@@ -64,21 +64,20 @@ endef
 define gb_Library__Library_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),Library)
-$(call gb_LinkTarget_set_defs,$(2),\
-	$$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_Library_DEFS) \
 )
 $(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
 $$(eval $$(call gb_Module_register_target,$(call gb_Library_get_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
 
 endef
 
 define gb_Library_set_componentfile
 $(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),$(call gb_Library_get_runtime_filename,$(1)))
-$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
+$(call gb_Library_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_ComponentTarget_get_outdir_inbuild_target,$(2))
 $(call gb_Library_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
 
 endef
@@ -111,16 +110,25 @@ $(eval $(foreach method,\
 	add_exception_objects \
 	add_noexception_objects \
 	add_generated_exception_objects \
+	set_yaccflags \
+	add_cflags \
 	set_cflags \
+	add_cxxflags \
 	set_cxxflags \
+	add_objcxxflags \
 	set_objcxxflags \
+	add_defs \
 	set_defs \
 	set_include \
+	add_ldflags \
 	set_ldflags \
+	add_libs \
 	set_library_path_flags \
 	add_linked_libs \
 	add_linked_static_libs \
 	add_external_libs \
+	use_external \
+	use_externals \
 	add_package_headers \
 	add_sdi_headers \
 	add_precompiled_header \

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/LinkTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/LinkTarget.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/LinkTarget.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/LinkTarget.mk Thu Oct  4 23:16:35 2012
@@ -20,6 +20,24 @@
 #**************************************************************
 
 
+# For every object there is a dep file (if gb_FULLDEPS is active).
+# The dep file depends on the object: the Object__command also updates the
+# dep file as a side effect.
+# In the dep file rule just touch it so it's newer than the object.
+
+# The gb_Object__command_dep generates an "always rebuild" dep file;
+# It is _only_ used in case the user deletes the object dep file.
+ifeq ($(gb_FULLDEPS),$(true))
+define gb_Object__command_dep
+mkdir -p $(dir $(1)) && \
+	echo '$(2) : $$(gb_Helper_PHONY)' > $(1)
+
+endef
+else
+gb_Object__command_dep = \
+ $(call gb_Output_error,gb_Object__command_dep is only for gb_FULLDEPS)
+endif
+
 
 
 # CObject class
@@ -30,25 +48,14 @@ gb_CObject_get_source = $(1)/$(2).c
 # defined by platform
 #  gb_CObject__command
 
-# this rule generates an "always rebuild" dep file, to have something to include.
-# the dep file will be overridden on the fly, when the object is compiled
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_dep
-mkdir -p $(dir $(1)) && \
-	echo '$(call gb_CObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-
-endef
-else
-gb_CObject__command_dep =
-endif
-
 define gb_CObject__rules
 $$(call gb_CObject_get_target,%) : $$(call gb_CObject_get_source,$(1),%)
-	$$(call gb_CObject__command,$$@,$$*,$$<,$$(DEFS),$$(CFLAGS),$$(INCLUDE))
+	$$(call gb_CObject__command,$$@,$$*,$$<,$$(call gb_CObject_get_dep_target,$$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_source,$(1),%)
-	$$(call gb_CObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(CFLAGS),$$(INCLUDE))
+$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_target,%)
+	$$(if $$(wildcard $$@),touch $$@,\
+	  $$(call gb_Object__command_dep,$$@,$$(call gb_CObject_get_target,$$*)))
 endif
 
 endef
@@ -69,22 +76,9 @@ gb_CxxObject_get_source = $(1)/$(2).cxx
 # defined by platform
 #  gb_CxxObject__command
 
-# This rule generates an "always rebuild" dep file, to have something to
-# include. The dep file will be overridden on the fly, when the object is
-# compiled.
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_CxxObject__command_dep
-mkdir -p $(dir $(1)) && \
-	echo '$(call gb_CxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-
-endef
-else
-gb_CxxObject__command_dep =
-endif
-
 # Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget)
-# are the same as the CXXFLAGS and DEFS we want to use for this object. This
-# should usually be the case.  The DEFS/CXXFLAGS would have too be manually
+# are the same as the T_CXXFLAGS and DEFS we want to use for this object. This
+# should usually be the case.  The DEFS/T_CXXFLAGS would have too be manually
 # overridden for one object file for them to differ.  PCH_CXXFLAGS/PCH_DEFS
 # should never be overridden on an object -- they should be the same as for the
 # whole linktarget. In general it should be cleaner to use a static library
@@ -93,16 +87,16 @@ endif
 define gb_CxxObject__set_pchflags
 ifeq ($(gb_ENABLE_PCH),$(true))
 ifneq ($(strip $$(PCH_NAME)),)
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
 $$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME))
 else
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
 $$@ : PCHFLAGS := $$(call gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME))
 else
 $$(info No precompiled header available for $$*.)
 $$(info precompiled header flags (  ex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)))
 $$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)))
-$$(info .           object flags        : $$(sort $$(CXXFLAGS) $$(DEFS)))
+$$(info .           object flags        : $$(sort $$(T_CXXFLAGS) $$(DEFS)))
 $$@ : PCHFLAGS := 
 endif
 endif
@@ -113,12 +107,13 @@ endef
 define gb_CxxObject__rules
 $$(call gb_CxxObject_get_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
 	$$(eval $$(gb_CxxObject__set_pchflags))
-	$$(call gb_CxxObject__command,$$@,$$*,$$<)
+	$$(call gb_CxxObject__command,$$@,$$*,$$<,$$(call gb_CxxObject_get_dep_target,$$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
-	$$(eval $$(gb_CxxObject__set_pchflags))
-	$$(call gb_CxxObject__command_dep,$$@,$$*,$$<)
+$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_target,%)
+	$$(if $$(wildcard $$@),touch $$@,\
+	  $$(eval $$(gb_CxxObject__set_pchflags))\
+	  $$(call gb_Object__command_dep,$$@,$$(call gb_CxxObject_get_target,$$*)))
 endif
 
 endef
@@ -140,27 +135,13 @@ gb_GenCxxObject_get_source = $(WORKDIR)/
 # defined by platform
 #  gb_CxxObject__command
 
-# This rule generates an "always rebuild" dep file, to have something to
-# include. The dep file will be overridden on the fly, when the object is
-# compiled.
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_GenCxxObject__command_dep
-mkdir -p $(dir $(1)) && \
-	echo '$(call gb_GenCxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-endef
-else
-gb_GenCxxObject__command_dep =
-endif
-
 $(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%)
-	$(call gb_CxxObject__command,$@,$*,$<)
+	$(call gb_CxxObject__command,$@,$*,$<,$(call gb_GenCxxObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_source,%)
-	$(call gb_GenCxxObject__command_dep,$@,$*,$<)
-
-$(call gb_GenCxxObject_get_dep_target,%) :
-	$(eval $(call gb_Output_error,Unable to find generated C++ file $(call gb_GenCxxObject_get_source,$*) in WORKDIR.))
+$(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_target,%)
+	$(if $(wildcard $@),touch $@,\
+	  $(call gb_Object__command_dep,$@,$(call gb_GenCxxObject_get_target,$*)))
 endif
 
 gb_GenCxxObject_GenCxxObject =
@@ -174,25 +155,14 @@ gb_ObjCxxObject_get_source = $(1)/$(2).m
 # defined by platform
 #  gb_ObjCxxObject__command
 
-# this rule generates an "always rebuild" dep file, to have something to include.
-# the dep file will be overridden on the fly, when the object is compiled
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_ObjCxxObject__command_dep
-mkdir -p $(dir $(1)) && \
-	echo '$(call gb_ObjCxxObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1)
-
-endef
-else
-gb_ObjCxxObject__command_dep =
-endif
-
 define gb_ObjCxxObject__rules
 $$(call gb_ObjCxxObject_get_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
-	$$(call gb_ObjCxxObject__command,$$@,$$*,$$<,$$(DEFS),$$(OBJCXXFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+	$$(call gb_ObjCxxObject__command,$$@,$$*,$$<,$$(call gb_ObjCxxObject_get_dep_target,$$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
-	$$(call gb_ObjCxxObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(OBJCXXFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_target,%)
+	$$(if $$(wildcard $$@),touch $$@,\
+	  $$(call gb_Object__command_dep,$$@,$$(call gb_ObjCxxObject_get_target,$$*)))
 endif
 
 endef
@@ -322,6 +292,10 @@ $(call gb_LinkTarget_get_headers_target,
 # Therefore it is important that objects are only directly depended on by the
 # linktarget. This for example means that you cannot build a single object
 # alone, because then you would directly depend on the object.
+#
+# A note about flags: because the overriding the global variables with a target
+# local variable of the same name is considered obscure, the target local
+# variables have a T_ prefix.
 define gb_LinkTarget_LinkTarget
 $(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS :=
 $(call gb_LinkTarget_get_external_headers_target,$(1)) : SELF := $(1)
@@ -335,16 +309,16 @@ $(call gb_LinkTarget_get_target,$(1)) : 
 $(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : CFLAGS := $$(gb_LinkTarget_CFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
-$(call gb_LinkTarget_get_target,$(1)) : OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
@@ -353,6 +327,7 @@ $(call gb_LinkTarget_get_target,$(1)) : 
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS := 
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := 
 $(call gb_LinkTarget_get_target,$(1)) : EXTERNAL_LIBS := 
+$(call gb_LinkTarget_get_target,$(1)) : LIBS :=
 $(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE := 
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME :=
@@ -362,21 +337,17 @@ $(call gb_LinkTarget_get_target,$(1)) : 
 $(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
 
 ifeq ($(gb_FULLDEPS),$(true))
-ifneq ($(wildcard $(call gb_LinkTarget_get_dep_target,$(1))),)
-include $(call gb_LinkTarget_get_dep_target,$(1))
-else
-$(firstword $(MAKEFILE_LIST)) : $(call gb_LinkTarget_get_dep_target,$(1))
-endif
+-include $(call gb_LinkTarget_get_dep_target,$(1))
 $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS := 
 $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS := 
 $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : CFLAGS := $$(gb_LinkTarget_CFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(gb_COMPILEROPTFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
 $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
 $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL)
 $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := 
@@ -385,7 +356,22 @@ endif
 
 endef
 
+define gb_LinkTarget_add_defs
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS += $(2)
+endif
+endef
+
 define gb_LinkTarget_set_defs
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_defs: use gb_LinkTarget_add_defs instead.)
+else
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
@@ -395,33 +381,75 @@ ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $(2)
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $(2)
 endif
+endif
+
+endef
+
+define gb_LinkTarget_add_cflags
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS += $(2)
+endif
 
 endef
 
 define gb_LinkTarget_set_cflags
-$(call gb_LinkTarget_get_target,$(1)) : CFLAGS := $(2)
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_cflags: use gb_LinkTarget_add_cflags instead.)
+else
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $(2)
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : CFLAGS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $(2)
 endif
+endif
+
+endef
 
+define gb_LinkTarget_add_cxxflags
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS += $(2)
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2)
+endif
 endef
 
 define gb_LinkTarget_set_cxxflags
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_cxxflags: use gb_LinkTarget_add_cxxflags instead.)
+else
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : CXXFLAGS := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $(2)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $(2)
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : CXXFLAGS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $(2)
 $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2)
 endif
+endif
 
 endef
 
+define gb_LinkTarget_add_objcxxflags
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS += $(2)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS += $(2)
+endif
+endef
+
 define gb_LinkTarget_set_objcxxflags
-$(call gb_LinkTarget_get_target,$(1)) : OBJCXXFLAGS := $(2)
+ifeq (,)
+$$(call gb_Output_error,\
+ gb_LinkTarget_set_objcxxflags: use gb_LinkTarget_add_objcxxflags instead.)
+else
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $(2)
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXFLAGS := $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $(2)
+endif
 endif
 
 endef
@@ -444,8 +472,17 @@ endif
 
 endef
 
+define gb_LinkTarget_add_ldflags
+$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS += $(2)
+endef
+
+# real use in RepositoryExternal.mk
 define gb_LinkTarget_set_ldflags
-$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $(2)
+endef
+
+define gb_LinkTarget_add_libs
+$(call gb_LinkTarget_get_target,$(1)) : LIBS += $(2)
 endef
 
 define gb_LinkTarget_add_linked_libs
@@ -516,7 +553,7 @@ $(call gb_LinkTarget_get_clean_target,$(
 
 $(call gb_LinkTarget_get_target,$(1)) : $(call gb_CObject_get_target,$(2))
 $(call gb_CObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_CObject_get_target,$(2)) : CFLAGS += $(3)
+$(call gb_CObject_get_target,$(2)) : T_CFLAGS += $(3)
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2)
@@ -531,7 +568,7 @@ $(call gb_LinkTarget_get_clean_target,$(
 
 $(call gb_LinkTarget_get_target,$(1)) : $(call gb_CxxObject_get_target,$(2))
 $(call gb_CxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_CxxObject_get_target,$(2)) : CXXFLAGS += $(3)
+$(call gb_CxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2)
@@ -546,7 +583,7 @@ $(call gb_LinkTarget_get_clean_target,$(
 
 $(call gb_LinkTarget_get_target,$(1)) : $(call gb_ObjCxxObject_get_target,$(2))
 $(call gb_ObjCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_ObjCxxObject_get_target,$(2)) : OBJCXXFLAGS += $(3)
+$(call gb_ObjCxxObject_get_target,$(2)) : T_OBJCXXFLAGS += $(3)
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2)
@@ -561,7 +598,7 @@ $(call gb_LinkTarget_get_clean_target,$(
 
 $(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2))
 $(call gb_GenCxxObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
-$(call gb_GenCxxObject_get_target,$(2)) : CXXFLAGS += $(3) $(gb_COMPILEROPTFLAGS)
+$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3) $(CXXFLAGS)
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2)
@@ -571,11 +608,11 @@ endif
 endef
 
 define gb_LinkTarget_add_noexception_object
-$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS))
+$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS) $(CXXFLAGS))
 endef
 
 define gb_LinkTarget_add_exception_object
-$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS))
+$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(CXXFLAGS))
 endef
 
 define gb_LinkTarget_add_cobjects
@@ -670,4 +707,17 @@ endif
 
 endef
 
+# this forwards to functions that must be defined in RepositoryExternal.mk.
+# $(call gb_LinkTarget_use_external,library,external)
+define gb_LinkTarget_use_external
+$(eval $(if $(value gb_LinkTarget__use_$(2)),\
+  $(call gb_LinkTarget__use_$(2),$(1)),\
+  $(error gb_LinkTarget_use_external: unknown external: $(2))))
+endef
+
+# $(call gb_LinkTarget_use_externals,library,externals)
+gb_LinkTarget_use_externals = \
+ $(foreach external,$(2),$(call gb_LinkTarget_use_external,$(1),$(external)))
+
+
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/Output.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/Output.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/Output.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/Output.mk Thu Oct  4 23:16:35 2012
@@ -56,7 +56,7 @@ gb_Output_BELL := $(shell echo|awk 'BEGI
 # - gb_COLOR is set
 # - we have a known term
 ifneq ($(strip $(gb_COLOR)),)
-ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen xterm xterm-color),)
+ifneq ($(filter $(TERM),Eterm aterm gnome kterm linux rxvt rxvt-unicode screen xterm xterm-color xtermc),)
 
 gb_Output_COLOR_RESET := $(gb_Output_ESCAPE)[0m
 gb_Output_COLOR_RESETANDESCAPE := $(gb_Output_COLOR_RESET)$(gb_Output_ESCAPE)

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/Package.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/Package.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/Package.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/Package.mk Thu Oct  4 23:16:35 2012
@@ -76,7 +76,7 @@ endef
 define gb_Package_add_customtarget
 $(call gb_Package_get_preparation_target,$(1)) : $(call gb_CustomTarget_get_target,$(2))
 $(call gb_Package_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2))
-$(call gb_CustomTarget_CustomTarget,$(2))
+$(eval $(call gb_CustomTarget_CustomTarget,$(2),$(3)))
 
 endef
 

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/StaticLibrary.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/StaticLibrary.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/StaticLibrary.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/StaticLibrary.mk Thu Oct  4 23:16:35 2012
@@ -59,8 +59,7 @@ endef
 define gb_StaticLibrary__StaticLibrary_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),StaticLibrary)
-$(call gb_LinkTarget_set_defs,$(2),\
-	$$(DEFS) \
+$(call gb_LinkTarget_add_defs,$(2),\
 	$(gb_StaticLibrary_DEFS) \
 )
 $(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
@@ -86,12 +85,18 @@ $(eval $(foreach method,\
 	add_exception_objects \
 	add_noexception_objects \
 	add_generated_exception_objects \
+	add_cflags \
 	set_cflags \
+	add_cxxflags \
 	set_cxxflags \
+	add_objcxxflags \
 	set_objcxxflags \
+	add_defs \
 	set_defs \
 	set_include \
+	add_ldflags \
 	set_ldflags \
+	add_libs \
 	set_library_path_flags \
 	add_linked_libs \
 	add_linked_static_libs \

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/TargetLocations.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/TargetLocations.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/TargetLocations.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/TargetLocations.mk Thu Oct  4 23:16:35 2012
@@ -29,6 +29,8 @@ gb_PackagePart_get_destinations = $(OUTD
 gb_PackagePart_get_target = $(OUTDIR)/$(1)
 gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
 gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
+gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
+gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
 
 define gb_Library_get_target
 $(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES)))
@@ -44,6 +46,7 @@ endef
 gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
 gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
 gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
+gb_ComponentTarget_get_inbuild_target = $(WORKDIR)/ComponentTarget/$(1).inbuild.component
 gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
 gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
 gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
@@ -52,6 +55,8 @@ gb_CxxObject_get_target = $(WORKDIR)/Cxx
 gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
 gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
 gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
+gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
+gb_Jar_get_classsetname = Jar/$(1)
 gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1)
 gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done
 gb_JavaClassSet_get_target = $(WORKDIR)/JavaClassSet/$(1)/done
@@ -78,6 +83,8 @@ gb_SrsPartMergeTarget_get_target = $(WOR
 gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
 gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
 gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
+gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip
+gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
 
 define gb_Library_get_external_headers_target
 $(patsubst $(1):%,$(WORKDIR)/ExternalHeaders/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
@@ -99,6 +106,7 @@ $(eval $(call gb_Helper_make_clean_targe
 	AllLangResTarget \
 	ComponentTarget \
 	JavaClassSet \
+	Jar \
 	JunitTest \
 	LinkTarget \
 	Module \
@@ -128,8 +136,6 @@ $(eval $(call gb_Helper_make_dep_targets
 	SrsPartTarget \
 	SrsTarget \
 ))
-# needs to use same dep target because we use gb_CxxObject__command
-gb_GenCxxObject_get_dep_target = $(gb_CxxObject_get_dep_target)
 
 # other getters
 

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/gbuild.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/gbuild.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/gbuild.mk Thu Oct  4 23:16:35 2012
@@ -240,9 +240,11 @@ include $(foreach class, \
 	CustomTarget \
 	PrecompiledHeaders \
 	CppunitTest \
+	Jar \
 	JavaClassSet \
 	JunitTest \
 	Module \
+	Zip \
 ,$(GBUILDDIR)/$(class).mk)
 
 # optional extensions that should never be essential
@@ -260,5 +262,8 @@ endif
 
 export gb_AWK
 export gb_XSLTPROC
+export GBUILDDIR
+# FIXME exporting SRCDIR seems kind of a hack
+export SRCDIR
 
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/linux.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/linux.mk Thu Oct  4 23:16:35 2012
@@ -137,6 +137,12 @@ gb_LinkTarget_LDFLAGS += \
 
 endif
 
+ifeq ($(gb_DEBUGLEVEL),0)
+gb_LinkTarget_LDFLAGS += -Wl,-O1
+endif
+
+gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
 else
@@ -158,17 +164,18 @@ endef
 
 # CObject class
 
+# $(call gb_CObject__command,object,relative-source,source,dep-file)
 define gb_CObject__command
 $(call gb_Output_announce,$(2),$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CC) \
-		$(DEFS) $(CFLAGS) \
+		$(DEFS) \
+		$(T_CFLAGS) \
 		-c $(3) \
 		-o $(1) \
-		-MMD -MT $(call gb_CObject_get_target,$(2)) \
-		-MF $(call gb_CObject_get_dep_target,$(2)) \
+		-MMD -MT $(1) \
+		-MF $(4) \
 		-I$(dir $(3)) \
 		$(INCLUDE))
 endef
@@ -176,17 +183,18 @@ endef
 
 # CxxObject class
 
+# $(call gb_CxxObject__command,object,relative-source,source,dep-file)
 define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CXX) \
-		$(DEFS) $(CXXFLAGS) \
+		$(DEFS) \
+		$(T_CXXFLAGS) \
 		-c $(3) \
 		-o $(1) \
-		-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
-		-MF $(call gb_CxxObject_get_dep_target,$(2)) \
+		-MMD -MT $(1) \
+		-MF $(4) \
 		-I$(dir $(3)) \
 		$(INCLUDE_STL) $(INCLUDE))
 endef
@@ -206,14 +214,9 @@ gb_LinkTarget__RPATHS := \
 	SDKBIN:\dORIGIN/../../ure-link/lib \
 	NONEBIN:\dORIGIN/../lib:\dORIGIN \
 
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
 
-ifeq ($(gb_DEBUGLEVEL),2)
-gb_LinkTarget_CXXFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
-gb_LinkTarget_CFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
-
-endif
 
 gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
@@ -223,13 +226,15 @@ $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_CXX) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+		$(subst \d,$$,$(RPATH)) \
+		$(T_LDFLAGS) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
 		$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
 		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
+		$(LIBS) \
 		-o $(1))
 endef
 
@@ -273,16 +278,16 @@ gb_Library_UNOEXT := .uno$(gb_Library_PL
 endif
 
 gb_Library_PLAINLIBS_NONE += \
+	fontconfig \
+	Xrender \
 	dl \
 	freetype \
-	jpeg \
 	m \
 	pthread \
 	X11 \
 	Xext \
 	SM \
 	ICE \
-	z \
 	cppunit
 
 gb_Library_FILENAMES := \

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/macosx.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/macosx.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/macosx.mk Thu Oct  4 23:16:35 2012
@@ -126,6 +126,8 @@ gb_LinkTarget_LDFLAGS := \
 	$(subst -L../lib , ,$(SOLARLIB)) \
 #man ld says: obsolete	-Wl,-multiply_defined,suppress \
 
+gb_DEBUG_CFLAGS := -g
+
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
 else
@@ -151,14 +153,14 @@ endef
 define gb_CObject__command
 $(call gb_Output_announce,$(2),$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CC) \
-		$(DEFS) $(CFLAGS) \
+		$(DEFS) \
+		$(T_CFLAGS) \
 		-c $(3) \
 		-o $(1) \
-		-MMD -MT $(call gb_CObject_get_target,$(2)) \
-		-MF $(call gb_CObject_get_dep_target,$(2)) \
+		-MMD -MT $(1) \
+		-MF $(4) \
 		-I$(dir $(3)) \
 		$(INCLUDE))
 endef
@@ -170,14 +172,14 @@ endef
 define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CXX) \
-		$(DEFS) $(CXXFLAGS) \
+		$(DEFS) \
+		$(T_CXXFLAGS) \
 		-c $(3) \
 		-o $(1) \
-		-MMD -MT $(call gb_CxxObject_get_target,$(2)) \
-		-MF $(call gb_CxxObject_get_dep_target,$(2)) \
+		-MMD -MT $(1) \
+		-MF $(4) \
 		-I$(dir $(3)) \
 		$(INCLUDE_STL) $(INCLUDE))
 endef
@@ -188,14 +190,14 @@ endef
 define gb_ObjCxxObject__command
 $(call gb_Output_announce,$(2),$(true),OCX,3)
 $(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CXX) \
-		$(DEFS) $(OBJCXXFLAGS) \
+		$(DEFS) \
+		$(T_OBJCXXFLAGS) \
 		-c $(3) \
 		-o $(1) \
-		-MMD -MT $(call gb_ObjCxxObject_get_target,$(2)) \
-		-MF $(call gb_ObjCxxObject_get_dep_target,$(2)) \
+		-MMD -MT $(1) \
+		-MF $(4) \
 		-I$(dir $(3)) \
 		$(INCLUDE_STL) $(INCLUDE))
 endef
@@ -219,15 +221,9 @@ define gb_LinkTarget__get_installname
 $(if $(2),-install_name '$(2)$(1)',)
 endef
 
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) $(gb_OBJCXXFLAGS) $(gb_COMPILEROPTFLAGS)
-
-ifeq ($(gb_DEBUGLEVEL),2)
-gb_LinkTarget_CFLAGS += -g
-gb_LinkTarget_CXXFLAGS += -g
-gb_LinkTarget_OBJCXXFLAGS += -g
-endif
+gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) $(gb_OBJCXXFLAGS)
 
 gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
@@ -253,20 +249,23 @@ $(call gb_Helper_abbreviate_dirs,\
 	$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
 		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+		$(subst \d,$$,$(RPATH)) \
+		$(T_LDFLAGS) \
 		$(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
 		$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
 		> $${DYLIB_FILE} && \
 	$(gb_CXX) \
 		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+		$(subst \d,$$,$(RPATH)) \
+		$(T_LDFLAGS) \
 		$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
+		$(LIBS) \
 		-o $(1) \
 		`cat $${DYLIB_FILE}` && \
 	$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
@@ -322,10 +321,8 @@ gb_Library__FRAMEWORKS := \
 gb_Library_PLAINLIBS_NONE += \
 	Cocoa \
 	objc \
-	jpeg \
 	m \
 	pthread \
-	z \
 	cppunit
 
 gb_Library_FILENAMES := \
@@ -455,6 +452,6 @@ gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PA
 gb_Library_COMPONENTPREFIXES := \
     OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
     URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
-
+    NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
 
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/solaris.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/solaris.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/solaris.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/solaris.mk Thu Oct  4 23:16:35 2012
@@ -104,6 +104,9 @@ gb_LinkTarget_LDFLAGS := \
 	-PIC \
 	-library=no%Cstd \
 
+
+gb_DEBUG_CFLAGS := -g
+
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS :=
 else
@@ -137,15 +140,15 @@ endef
 define gb_CObject__command
 $(call gb_Output_announce,$(2),$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	rm -f $(call gb_CObject_get_dep_target,$(2)) && \
-	mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
+	rm -f $(4) && \
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CC) \
 		-c $(3) \
 		-o $(1) \
 		-xMMD \
-		-xMF $(call gb_CObject_get_dep_target,$(2)) \
-		$(DEFS) $(CFLAGS) \
+		-xMF $(4) \
+		$(DEFS) \
+		$(T_CFLAGS) \
 		-I$(dir $(3)) \
 		$(INCLUDE))
 endef
@@ -156,14 +159,14 @@ endef
 define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(1)) && \
-	mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	$(gb_CXX) \
-		$(DEFS) $(CXXFLAGS) \
+		$(DEFS) \
+		$(T_CXXFLAGS) \
 		-c $(3) \
 		-o $(1) \
 		-xMMD \
-		-xMF $(call gb_CxxObject_get_dep_target,$(2)) \
+		-xMF $(4) \
 		-I$(dir $(3)) \
 		$(INCLUDE_STL) $(INCLUDE))
 endef
@@ -183,13 +186,9 @@ gb_LinkTarget__RPATHS := \
 	SDKBIN:\dORIGIN/../../ure-link/lib \
 	NONEBIN:\dORIGIN/../lib:\dORIGIN \
 
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
 
-ifeq ($(gb_DEBUGLEVEL),2)
-gb_LinkTarget_CXXFLAGS += -g
-gb_LinkTarget_CFLAGS += -g
-endif
 
 gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
@@ -199,13 +198,15 @@ $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_CXX) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
-		$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
+		$(subst \d,$$,$(RPATH)) \
+		$(T_LDFLAGS) \
 		$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
 		$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
 		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
 		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
 		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
 		$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
+		$(LIBS) \
 		-o $(1))
 endef
 
@@ -256,13 +257,13 @@ gb_Library_PLAINLIBS_NONE += \
 	$(gb_STDLIBS) \
 	dl \
     freetype \
-	jpeg \
+	nsl \
 	pthread \
+	socket \
 	X11 \
     Xext \
     SM \
     ICE \
-	z \
 	cppunit
 
 gb_Library_FILENAMES := \

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/windows.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/windows.mk Thu Oct  4 23:16:35 2012
@@ -76,7 +76,6 @@ gb_CFLAGS := \
 	-GR \
 	-Gs \
 	-GS \
-	-Gy \
 	-nologo \
 	-Wall \
 	-wd4005 \
@@ -191,12 +190,15 @@ gb_LinkTarget_LDFLAGS := \
 	-MACHINE:IX86 \
 	-NODEFAULTLIB \
 	-OPT:NOREF \
-	-SUBSYSTEM:CONSOLE \
 	-safeseh \
 	-nxcompat \
 	-dynamicbase \
 	$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
+	
+
+gb_DEBUG_CFLAGS := -Zi
 
+# this does not use CFLAGS so it is not overridable
 ifneq ($(ENABLE_CRASHDUMP),)
 gb_LinkTarget_LDFLAGS += -DEBUG
 gb_CFLAGS+=-Zi
@@ -204,10 +206,8 @@ gb_CXXFLAGS+=-Zi
 endif
 
 ifeq ($(gb_DEBUGLEVEL),2)
-gb_CXXFLAGS +=-Zi
-gb_CFLAGS +=-Zi
-gb_COMPILEROPTFLAGS :=
 gb_LinkTarget_LDFLAGS += -DEBUG
+gb_COMPILEROPTFLAGS :=
 else
 gb_COMPILEROPTFLAGS := -Ob1 -Oxs -Oy-
 endif
@@ -241,7 +241,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) \
@@ -255,64 +255,47 @@ $(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
 $(call gb_Output_announce,$(2),$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	unset INCLUDE && \
 	$(gb_CC) \
-		$(DEFS) $(CFLAGS)  -Fd$(PDBFILE) \
+		$(DEFS) \
+		$(T_CFLAGS) \
+		-Fd$(PDBFILE) \
         $(PCHFLAGS) \
 		-I$(dir $(3)) \
 		$(INCLUDE) \
 		-c $(3) \
 		-Fo$(1))
-$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(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,\
-	mkdir -p $(dir $(1)) && \
+	mkdir -p $(dir $(1)) $(dir $(4)) && \
 	unset INCLUDE && \
 	$(gb_CXX) \
-		$(DEFS) $(CXXFLAGS) -Fd$(PDBFILE)\
+		$(DEFS) \
+		$(T_CXXFLAGS) \
+		-Fd$(PDBFILE) \
         $(PCHFLAGS) \
 		-I$(dir $(3)) \
 		$(INCLUDE_STL) $(INCLUDE) \
 		-c $(3) \
 		-Fo$(1))
-$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE))
 endef
 
 
@@ -400,7 +383,7 @@ endef
 
 # LinkTarget class
 
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
 
 gb_LinkTarget_INCLUDE :=\
@@ -425,6 +408,7 @@ $(call gb_Helper_abbreviate_dirs_native,
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
 		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+		$(if $(filter YES,$(gb_Executable_TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \
 		$(LDFLAGS) \
 		@$${RESPONSEFILE} \
 		$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
@@ -446,6 +430,9 @@ gb_Library_PLAINEXT := .lib
 
 gb_Library_PLAINLIBS_NONE += \
 	advapi32 \
+	d3d9 \
+	d3dx \
+	ddraw \
 	gdi32 \
 	gdiplus \
 	gnu_getopt \
@@ -590,6 +577,7 @@ endef
 gb_Executable_EXT := .exe
 gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG
 gb_Executable_get_rpath :=
+gb_Executable_TARGETGUI := 
 
 define gb_Executable_Executable_platform
 $(call gb_LinkTarget_set_auxtargets,$(2),\
@@ -609,6 +597,7 @@ endef
 
 # CppunitTest class
 
+gb_CppunitTest_DEFS := -D_DLL
 gb_CppunitTest_CPPTESTPRECOMMAND :=
 gb_CppunitTest_SYSPRE := itest_
 gb_CppunitTest_EXT := .lib

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/winmingw.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/winmingw.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/platform/winmingw.mk Thu Oct  4 23:16:35 2012
@@ -153,7 +153,6 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAG
 gb_LinkTarget_LDFLAGS := \
 	--export-all-symbols \
 	--kill-at \
-	--subsystem console \
 	--exclude-libs ALL \
 	--enable-stdcall-fixup \
 	--enable-runtime-pseudo-reloc-v2 \
@@ -164,6 +163,8 @@ ifeq ($(MINGW_GCCLIB_EH),YES)
 gb_LinkTarget_LDFLAGS += -shared-libgcc
 endif
 
+gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
 else
@@ -210,7 +211,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) \
@@ -224,10 +225,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
@@ -235,50 +236,31 @@ $(call gb_Output_announce,$(2),$(true),C
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_CC) \
-		$(DEFS) $(CFLAGS) \
+		$(DEFS) \
+		$(T_CFLAGS) \
 		-c $(3) \
 		-o $(1) \
 		-I$(dir $(3)) \
 		$(INCLUDE))
-$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(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,\
 	mkdir -p $(dir $(1)) && \
 	$(gb_CXX) \
-		$(DEFS) $(CXXFLAGS) \
+		$(DEFS) \
+		$(T_CXXFLAGS) \
 		-c $(3) \
 		-o $(1) \
 		-I$(dir $(3)) \
 		$(INCLUDE_STL) $(INCLUDE))
-$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
 endef
 
 
@@ -372,15 +354,9 @@ endef
 
 # LinkTarget class
 
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
 gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
 
-ifeq ($(gb_DEBUGLEVEL),2)
-gb_LinkTarget_CXXFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
-gb_LinkTarget_CFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
-
-endif
-
 gb_LinkTarget_INCLUDE :=\
 	$(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \
 	$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
@@ -398,6 +374,7 @@ $(call gb_Helper_abbreviate_dirs_native,
 		$(NATIVERES) " > $${RESPONSEFILE} && \
 	$(gb_LINK) \
 		$(gb_Executable_TARGETTYPEFLAGS) \
+		$(if $(filter YES,$(gb_Executable_TARGETGUI)), --subsystem windows, --subsystem console) \
 		$(LDFLAGS) \
 		$(gb_MINGWLIBDIR)/crt2.o \
 		$(MINGW_CLIB_DIR)/crtbegin.o \
@@ -405,6 +382,7 @@ $(call gb_Helper_abbreviate_dirs_native,
 		--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
 		--start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
 		--start-group $(patsubst %,-l%,$(EXTERNAL_LIBS)) --end-group \
+		$(LIBS) \
 		$(MINGW_CLIB_DIR)/crtend.o \
 		-Map $(basename $(1)).map \
 		-o $(1))
@@ -429,6 +407,7 @@ $(call gb_Helper_abbreviate_dirs_native,
 		@$${RESPONSEFILE} \
 		--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
 		--start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
+		$(LIBS) \
 		$(MINGW_CLIB_DIR)/crtend.o \
 		-Map $(basename $(DLLTARGET)).map \
 		-o $(DLLTARGET) && touch $(1))
@@ -470,6 +449,9 @@ gb_Library_PLAINLIBS_NONE += \
 	$(gb_MINGW_LIBSTDCPP) \
 	$(gb_MINGW_LIBGCC) \
 	advapi32 \
+	d3d9 \
+	d3dx \
+	ddraw \
 	gdi32 \
 	gdiplus \
 	gnu_getopt \
@@ -593,7 +575,7 @@ gb_Executable_EXT := .exe
 gb_Executable_TARGETTYPEFLAGS :=
 gb_Executable_get_rpath :=
 gb_Executable_Executable_platform =
-
+gb_Executable_TARGETGUI :=
 
 # CppunitTest class
 

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Executable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Executable.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Executable.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Executable.mk Thu Oct  4 23:16:35 2012
@@ -27,9 +27,9 @@ $(eval $(call gb_Executable_set_include,
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_set_cxxflags,EXEC,\
-	$$(CXXFLAGS) \
-))
+#$(eval $(call gb_Executable_add_defs,EXEC,\
+#	-Dfoo \
+#))
 
 $(eval $(call gb_Executable_add_linked_libs,EXEC,\
     $(gb_STDLIBS) \
@@ -38,4 +38,7 @@ $(eval $(call gb_Executable_add_linked_l
 $(eval $(call gb_Executable_add_exception_objects,EXEC,\
 ))
 
+$(eval $(call gb_Executable_set_targettype_gui,EXEC,\
+))
+
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Library.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Library.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Library.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/gbuild/templates/Library.mk Thu Oct  4 23:16:35 2012
@@ -45,9 +45,8 @@ $(eval $(call gb_Library_set_include,LIB
 
 # add any additional definitions to be set for compilation here
 # (e.g. -DLIB_DLLIMPLEMENTATION)
-$(eval $(call gb_Library_set_defs,LIB,\
-	$$(DEFS) \
-))
+#$(eval $(call gb_Library_add_defs,LIB,\
+#))
 
 # add libraries to be linked to LIB; again these names need to be given as
 # specified in Repository.mk

Modified: incubator/ooo/branches/buildsys/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/solenv/inc/libs.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/branches/buildsys/main/solenv/inc/libs.mk Thu Oct  4 23:16:35 2012
@@ -81,7 +81,7 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
 .IF "$(GUI)"=="OS2"
 UCBHELPERLIB=-lucbh$(UCBHELPER_MAJOR)
 .ELSE
-UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
+UCBHELPERLIB=-lucbhelper4$(COMID)
 .ENDIF
 .IF "$(SYSTEM_OPENSSL)" == "YES"
 OPENSSLLIB=$(OPENSSL_LIBS)
@@ -400,7 +400,7 @@ OTXLIB=otx_ind.lib
 OSXLIB=osx.lib
 REGLIB=ireg.lib
 EXTLIB=iext.lib
-SOTLIB=sot.lib
+SOTLIB=isot.lib
 MOZBASELIBST=nspr4_s.lib xpcombase_s.lib
 MOZBASELIB=nspr4.lib xpcom.lib
 LDAPSDKLIB=nsldap32v50.lib

Modified: incubator/ooo/branches/buildsys/main/sot/JunitTest_sot_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sot/JunitTest_sot_complex.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sot/JunitTest_sot_complex.mk (original)
+++ incubator/ooo/branches/buildsys/main/sot/JunitTest_sot_complex.mk Thu Oct  4 23:16:35 2012
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,sot_complex))
+$(eval $(call gb_JunitTest_JunitTest,sot_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\
 	sot/qa/complex/olesimplestorage/OLESimpleStorageTest \

Modified: incubator/ooo/branches/buildsys/main/sot/Library_sot.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/sot/Library_sot.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/sot/Library_sot.mk (original)
+++ incubator/ooo/branches/buildsys/main/sot/Library_sot.mk Thu Oct  4 23:16:35 2012
@@ -35,8 +35,7 @@ $(eval $(call gb_Library_set_include,sot
 	-I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,sot,\
-	$$(DEFS) \
+$(eval $(call gb_Library_add_defs,sot,\
 	-DSOT_DLLIMPLEMENTATION \
 ))
 

Modified: incubator/ooo/branches/buildsys/main/starmath/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/starmath/prj/build.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/starmath/prj/build.lst (original)
+++ incubator/ooo/branches/buildsys/main/starmath/prj/build.lst Thu Oct  4 23:16:35 2012
@@ -1,9 +1,2 @@
 sm	starmath	: LIBXSLT:libxslt L10N:l10n svx NULL
-sm	starmath								usr1	-	all	sm_mkout NULL
-sm	starmath\inc							nmake	-	all	sm_inc NULL
-sm	starmath\prj							get		-	all	sm_prj NULL
-sm	starmath\res							get		-	all	sm_res NULL
-sm	starmath\sdi							nmake	-	all	sm_sdi NULL
-sm	starmath\source							nmake	-	all	sm_sorce sm_sdi sm_inc NULL
-sm	starmath\util							nmake	-	all	sm_util sm_sorce NULL
-sm starmath\qa\unoapi nmake - all sm_qa_unoapi NULL
+sm	starmath\prj							nmake		-	all	sm_prj NULL

Modified: incubator/ooo/branches/buildsys/main/starmath/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/starmath/prj/d.lst?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/starmath/prj/d.lst (original)
+++ incubator/ooo/branches/buildsys/main/starmath/prj/d.lst Thu Oct  4 23:16:35 2012
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\bin\sm?????.dll %_DEST%\bin%_EXT%\sm?????.dll
-..\%__SRC%\bin\smd?????.dll %_DEST%\bin%_EXT%\smd?????.dll
-..\%__SRC%\bin\sm*.res %_DEST%\bin%_EXT%\sm*.res
-..\%__SRC%\bin\sm?????.sym %_DEST%\bin%_EXT%\sm?????.sym
-mkdir: %_DEST%\inc%_EXT%\starmath
-
-..\uiconfig\smath\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar\*.xml
-..\uiconfig\smath\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar\*.xml
-..\uiconfig\smath\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar\*.xml
-..\%__SRC%\misc\sm.component %_DEST%\xml%_EXT%\sm.component
-..\%__SRC%\misc\smd.component %_DEST%\xml%_EXT%\smd.component

Modified: incubator/ooo/branches/buildsys/main/starmath/qa/unoapi/Test.java
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/starmath/qa/unoapi/Test.java?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/starmath/qa/unoapi/Test.java (original)
+++ incubator/ooo/branches/buildsys/main/starmath/qa/unoapi/Test.java Thu Oct  4 23:16:35 2012
@@ -25,6 +25,7 @@ package org.openoffice.starmath.qa.unoap
 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
 import static org.junit.Assert.*;
 
 public final class Test {
@@ -41,8 +42,8 @@ public final class Test {
     @org.junit.Test public void test() {
         assertTrue(
             Runner.run(
-                "-sce", "sm.sce", "-xcl", "knownissues.xcl", "-cs",
-                connection.getDescription()));
+                "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"),
+                "-cs", connection.getDescription()));
     }
 
     private final OfficeConnection connection = new OfficeConnection();

Modified: incubator/ooo/branches/buildsys/main/starmath/source/detreg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/starmath/source/detreg.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/starmath/source/detreg.cxx (original)
+++ incubator/ooo/branches/buildsys/main/starmath/source/detreg.cxx Thu Oct  4 23:16:35 2012
@@ -37,14 +37,14 @@ using namespace ::com::sun::star::lang;
 
 extern "C" {
 
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
         const  sal_Char**   ppEnvironmentTypeName,
         uno_Environment**  /*ppEnvironment*/           )
 {
 	*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
                                      void* pServiceManager,
                                      void* /*pRegistryKey*/ )
 {

Modified: incubator/ooo/branches/buildsys/main/starmath/source/eqnolefilehdr.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/starmath/source/eqnolefilehdr.hxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/starmath/source/eqnolefilehdr.hxx (original)
+++ incubator/ooo/branches/buildsys/main/starmath/source/eqnolefilehdr.hxx Thu Oct  4 23:16:35 2012
@@ -53,7 +53,7 @@ public:
     void Write(SvStorageStream *pS);
 };
 
-sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
+SAL_DLLPUBLIC_EXPORT sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
 
 #endif
 

Modified: incubator/ooo/branches/buildsys/main/starmath/source/register.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/starmath/source/register.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/starmath/source/register.cxx (original)
+++ incubator/ooo/branches/buildsys/main/starmath/source/register.cxx Thu Oct  4 23:16:35 2012
@@ -107,14 +107,14 @@ extern Reference< XInterface > SAL_CALL
 
 extern "C" {
 
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
         const  sal_Char**   ppEnvironmentTypeName,
         uno_Environment**   /*ppEnvironment*/  )
 {
 	*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
                                      void* pServiceManager,
                                      void* /*pRegistryKey*/ )
 {

Modified: incubator/ooo/branches/buildsys/main/starmath/source/smdetect.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/starmath/source/smdetect.cxx?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/starmath/source/smdetect.cxx (original)
+++ incubator/ooo/branches/buildsys/main/starmath/source/smdetect.cxx Thu Oct  4 23:16:35 2012
@@ -25,17 +25,13 @@
 #include "precompiled_starmath.hxx"
 
 #include "smdetect.hxx"
-
-//#include <framework/interaction.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -45,12 +41,8 @@
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <framework/interaction.hxx>
-
-#ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
-#endif
 #include <ucbhelper/simpleinteractionrequest.hxx>
-
 #include <rtl/ustring.h>
 #include <rtl/logfile.hxx>
 #include <svl/itemset.hxx>
@@ -72,8 +64,8 @@
 #include <sfx2/brokenpackageint.hxx>
 
 #include "document.hxx"
-#include "eqnolefilehdr.hxx"
 
+extern sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;

Modified: incubator/ooo/branches/buildsys/main/svgio/Library_svgio.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/buildsys/main/svgio/Library_svgio.mk?rev=1394326&r1=1394325&r2=1394326&view=diff
==============================================================================
--- incubator/ooo/branches/buildsys/main/svgio/Library_svgio.mk (original)
+++ incubator/ooo/branches/buildsys/main/svgio/Library_svgio.mk Thu Oct  4 23:16:35 2012
@@ -32,11 +32,14 @@ $(eval $(call gb_Library_set_include,svg
     -I$(SRCDIR)/svgio/inc \
     -I$(SRCDIR)/svgio/inc/pch \
     -I$(SRCDIR)/solenv/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,svgio,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_api,svgio,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_defs,svgio,\
     -DSVGIO_DLLIMPLEMENTATION \
 ))
 



Mime
View raw message