diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-15 22:27:38 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-15 22:43:09 +0100 |
| commit | 18d37cf9fb21dd809ec79135ce93f9a55512c9b3 (patch) | |
| tree | c92a9e472fb2fa258b1f2edba35b88a560c6f1db /solenv | |
| parent | 507f51b093a1dfcd2866785cd700d5c390ee28f6 (diff) | |
rscdep is dead and gone ... and there was much rejoicing
Change-Id: Id411a6caceaac92d3044fe6a2385d8b1c2f16133
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/settings.mk | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 30e77a5de961..097cb7f68dfa 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -199,10 +199,6 @@ IMPLIBFLAGS= MAPSYM= MAPSYMFLAGS= -RSC= -RSCFLAGS= -RSCDEFS= -RSCLANG= RC= RCFLAGS= @@ -391,22 +387,6 @@ ENVCFLAGSINCXX*=$(envcflagsincxx) ENVLINKFLAGS*=$(envlinkflags) .ENDIF -.IF "$(envrscflags)"!="" -ENVRSCFLAGS*=$(envrscflags) -.ENDIF - -.IF "$(envrscdefs)"!="" -ENVRSCDEFS*=$(envrscdefs) -.ENDIF - -.IF "$(envrsclinkflags)"!="" -# ENVRSCLINKFLAGS*=$(envrsclinkflags) -.ENDIF - -.IF "$(envrcflags)"!="" -ENVRCFLAGS*=$(envrcflags) -.ENDIF - .IF "$(envrclinkflags)"!="" ENVRCLINKFLAGS*=$(envrclinkflags) .ENDIF @@ -475,8 +455,6 @@ OPTIMIZE= .INCLUDE : postset.mk -RSC_LANG_ISO+:=$(completelangiso) -.EXPORT : RSC_LANG_ISO ###################################################### @@ -868,12 +846,6 @@ SCPLINKFLAGS=-i $(PAR),$(SOLARPARDIR) SCPLINKFLAGS+=-v $(SCPLINKVERSION) .ENDIF # "$(SCPLINKVERSION)"!="" -.IF "$(make_srs_deps)"!="" -RSC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rscdep -.ELSE # "$(make_srs_deps)"!="" -RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc -.ENDIF # "$(make_srs_deps)"!="" - .IF "$(VERBOSE)" == "TRUE" VERBOSITY=-verbose .ELSE @@ -884,17 +856,6 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc COMPILE_ECHO_SWITCH= COMPILE_ECHO_FILE=$(<:f) -RSCFLAGS=-s -RSCDEFS=-D$(GUI) -D$(COM) $(JAVADEF) - -RSCDEFIMG*=icon-themes/galaxy - -RSCEXTINC=. - -.IF "$(DEBUG)" != "" -RSCDEFS+= -DDEBUG -.ENDIF - # settings for mozilla idl compiler XPIDL=xpidl XPIDL_LINK=xpt_link @@ -1062,21 +1023,17 @@ LINKFLAGSADD+= $(LINKFLAGSDEBUG) .IF "$(dbgutil)"!="" CDEFS+=$(CDEFSDBGUTIL) CFLAGS+=$(CFLAGSDBGUTIL) -RSCDEFS+=-DDBG_UTIL .ENDIF .IF "$(product)"!="" CDEFS+= -DPRODUCT -RSCDEFS+= -DPRODUCT .IF "$(ASSERT_ALWAYS_ABORT)"=="FALSE" CDEFS+=-DNDEBUG -RSCDEFS+= -DNDEBUG .ENDIF .ENDIF .IF "$(DBG_LEVEL)"!="" CDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL) -RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL) .IF "$(DBG_LEVEL)"!="0" CDEFS+=-DSAL_LOG_INFO -DSAL_LOG_WARN .ENDIF @@ -1204,10 +1161,6 @@ CFLAGSCXX+= $(ENVCFLAGSCXX) CFLAGSINCXX+:=$(ENVCFLAGSINCXX) LIBFLAGS+= $(ENVLIBFLAGS) LINKFLAGSADD+= $(ENVLINKFLAGS) -RSCFLAGS+= $(ENVRSCFLAGS) -RSCDEFS+= $(ENVRSCDEFS) -# RSCLINKFLAGS+= $(ENVRSCLINKFLAGS) -RCFLAGS+= $(ENVRCFLAGS) RCLINKFLAGS+= $(ENVRCLINKFLAGS) LINKFLAGSRUNPATH_URELIB*= |