diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-08-05 13:00:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-08-05 13:00:44 +0000 |
| commit | 0abb92a9bfacd5e18d636d6d2839b1aafb640e4d (patch) | |
| tree | 6f8fbe396b7ebf1f2f87e5d1b7b1ca3ecc23f46f | |
| parent | a75b8620edd329886835377a9e2630e408cadac0 (diff) | |
INTEGRATION: CWS ause033 (1.2.98); FILE MERGED
2005/07/18 12:00:01 hjs 1.2.98.1: #i51368# move setting required variables to the beginning to enable correct dependencies
| -rw-r--r-- | solenv/inc/tg_config.mk | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk index 4992348e0a71..eaec38630a52 100644 --- a/solenv/inc/tg_config.mk +++ b/solenv/inc/tg_config.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_config.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: obo $ $Date: 2005-03-15 13:00:23 $ +# last change: $Author: hr $ $Date: 2005-08-05 14:00:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -62,7 +62,10 @@ PACKAGEDIR*:=$(subst,.,$/ $(PACKAGE)) +# # --- XCS --- +# + .IF "$(XCSFILES)"!="" # remove unnecessary info from the component schemas XCS_TRIM=$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/{$(XCSFILES)} @@ -132,7 +135,16 @@ $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $( $(XSLDIR)$/resource.xsl $< .ENDIF +# # --- XCU --- +# + +.IF "$(XCUFILES)"!="" +XCU_DEFAULT =$(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/{$(XCUFILES)} +XCU_MODULES =$(foreach,i,$(MODULEFILES) $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/$(i)) +XCU_LANG =$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/$(i)) +.ENDIF # "$(XCUFILES)"!="" + .IF "$(XCU_DEFAULT)" != "" $(XCU_DEFAULT) : $(PRJ)$/registry$/component-update.dtd \ $(XSLDIR)$/data_val.xsl \ @@ -236,10 +248,6 @@ $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu +$(RM) $(@:d)$(@:f:s/.xcu/.tmp/) > $(NULLDEV) .IF "$(XCUFILES)"!="" -XCU_DEFAULT =$(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/{$(XCUFILES)} -XCU_MODULES =$(foreach,i,$(MODULEFILES) $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/$(i)) -XCU_LANG =$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/$(i)) - ALLTAR: \ $(XCU_DEFAULT) \ $(XCU_MODULES) \ @@ -247,8 +255,5 @@ ALLTAR: \ $(XCU_DEFAULT) : $$(@:d:s!$(PROCESSOUT)$/registry$/data$/!$(XCSROOT)$/registry$/schema$/!)$$(@:f:s/.xcu/.xcs/) -.IF "$(XCU_LANG)"!="" -$(XCU_LANG) : localize.sdf -.ENDIF # "$(XCU_LANG)"!="" .ENDIF # "$(XCUFILES)"!="" |