summaryrefslogtreecommitdiff
path: root/framework/util/makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'framework/util/makefile.mk')
-rw-r--r--framework/util/makefile.mk46
1 files changed, 45 insertions, 1 deletions
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 87298720cfa6..10e3a614f5e1 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -56,7 +56,6 @@ LIB1OBJFILES= \
$(SLO)$/protocolhandlercache.obj \
$(SLO)$/networkdomain.obj \
$(SLO)$/configaccess.obj \
- $(SLO)$/framelistanalyzer.obj \
$(SLO)$/shareablemutex.obj \
$(SLO)$/itemcontainer.obj \
$(SLO)$/rootitemcontainer.obj \
@@ -103,6 +102,7 @@ LIB2OBJFILES= \
$(SLO)$/configimporter.obj \
$(SLO)$/menuextensionsupplier.obj \
$(SLO)$/preventduplicateinteraction.obj \
+ $(SLO)$/framelistanalyzer.obj \
$(SLO)$/titlehelper.obj
# --- import classes library ---------------------------------------------------
@@ -362,3 +362,47 @@ SHL5DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN)
.INCLUDE : target.mk
+<<<<<<< local
+=======
+$(MISC)$/$(SHL1TARGET).flt: makefile.mk
+ @echo ------------------------------
+ @echo Making: $@
+ @echo _Impl>$@
+ @echo WEP>>$@
+ @echo m_pLoader>$@
+ @echo _TI2>>$@
+ @echo _TI3>>$@
+ @echo LIBMAIN>>$@
+ @echo LibMain>>$@
+ @echo _STL::pair>>$@
+
+$(MISC)$/$(SHL2TARGET).flt: makefile.mk
+ @echo ------------------------------
+ @echo Making: $@
+ @echo _Impl>$@
+ @echo WEP>>$@
+ @echo m_pLoader>$@
+ @echo _TI2>>$@
+ @echo LIBMAIN>>$@
+ @echo LibMain>>$@
+
+ALLTAR : $(MISC)/fwk.component $(MISC)/fwl.component $(MISC)/fwm.component
+
+$(MISC)/fwk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ fwk.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt fwk.component
+
+$(MISC)/fwl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ fwl.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt fwl.component
+
+$(MISC)/fwm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+ fwm.component
+ $(XSLTPROC) --nonet --stringparam uri \
+ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \
+ $(SOLARENV)/bin/createcomponent.xslt fwm.component
+>>>>>>> other