Kill OS/2 stuff

1 files changed, 4 insertions, 85 deletions

diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index cd02492d825a..d3720fd2a009 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -87,7 +87,7 @@ $(MISC)/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL$(
 .ENDIF
 
 .IF "$(GUI)" != "UNX"
-.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)" == "WNT"
 .IF "$(SHL$(TNR)IMPLIB)" == ""
 SHL$(TNR)IMPLIB=i$(TARGET)_t$(TNR)
 .ENDIF			# "$(SHL$(TNR)IMPLIB)" == ""
@@ -100,7 +100,7 @@ ALLTAR : $(SHL$(TNR)IMPLIBN)
 .IF "$(USE_DEFFILE)"==""
 USE_$(TNR)IMPLIB_DEPS=$(LB)/$(SHL$(TNR)IMPLIB).lib
 .ENDIF			# "$(USE_DEFFILE)"==""
-.ENDIF			# "$(GUI)" == "WNT" || "$(GUI)" == "OS2"
+.ENDIF			# "$(GUI)" == "WNT"
 USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF)
 .ELSE			# "$(GUI)" != "UNX"
 USE_SHL$(TNR)DEF=
@@ -237,7 +237,7 @@ SHL$(TNR)LINKRESO*=$(MISC)/$(SHL$(TNR)TARGET)_res.o
 #.IF "$(SHL$(TNR)TARGETN)"!=""
 
 .IF "$(linkinc)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL$(TNR)LIBS)"!=""
 $(MISC)/$(SHL$(TNR)TARGET)_linkinc.ls .PHONY:
     @@-$(RM) $@
@@ -250,7 +250,7 @@ $(SHL$(TNR)TARGETN) : $(LINKINCTARGETS)
 
 .ELSE
 .IF "$(SHL$(TNR)USE_EXPORTS)"=="name"
-.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 .IF "$(SHL$(TNR)LIBS)"!=""
 SHL$(TNR)LINKLIST=$(MISC)/$(SHL$(TNR)TARGET)_link.lst
@@ -267,20 +267,6 @@ $(MISC)/%linkinc.ls:
     @echo . > $@
 .ENDIF          # "$(linkinc)"!=""
 
-.IF "$(GUI)" == "OS2"
-#21/02/2006 YD dll names must be 8.3, invoke fix script
-#check osl/os2/module.c/osl_loadModule()
-SHL$(TNR)TARGET8=$(shell @fix_shl $(SHL$(TNR)TARGET))
-.ENDIF
-
-.IF "$(GUI)" == "OS2"
-_SHL$(TNR)IMP_ORD = $(SHL$(TNR)STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL$(TNR)STDLIBS:^"$(LB)/") 
-SHL$(TNR)IMP_ORD = $(foreach,i,$(_SHL$(TNR)IMP_ORD) $(shell @-ls $i))
-.ELSE
-SHL$(TNR)IMP_ORD = 
-.ENDIF
-
-
 $(SHL$(TNR)TARGETN) : \
                     $(SHL$(TNR)OBJS)\
                     $(SHL$(TNR)LIBS)\
@@ -289,7 +275,6 @@ $(SHL$(TNR)TARGETN) : \
                     $(USE_SHL$(TNR)VERSIONMAP)\
                     $(SHL$(TNR)RES)\
                     $(SHL$(TNR)DEPN) \
-                    $(SHL$(TNR)IMP_ORD) \
                     $(SHL$(TNR)LINKLIST)
     @echo "Making:   " $(@:f)
 .IF "$(GUI)" == "WNT"
@@ -509,65 +494,6 @@ $(SHL$(TNR)TARGETN) : \
 .ENDIF
 .ENDIF			# "$(GUI)" == "UNX"
 
-.IF "$(GUI)" == "OS2"
-
-.IF "$(SHL$(TNR)DEFAULTRES)"!=""
-    @+-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc >& $(NULLDEV)
-.IF "$(SHL$(TNR)ICON)" != ""
-    @-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ENDIF
-.IF "$(use_shl_versions)" != ""
-.IF "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @-+echo $(EMQ)#include $(EMQ)"$(SHL$(TNR)ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ENDIF			# "$(SHL$(TNR)ADD_VERINFO)"!=""
-    @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-#	@-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ENDIF			# "$(use_shl_versions)" != ""
-# YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
-    $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
-.ENDIF			# "$(SHL$(TNR)DEFAULTRES)"!=""
-
-.IF "$(SHL$(TNR)ALLRES)"!=""
-    $(COMMAND_ECHO)+$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
-.ENDIF			# "$(SHL$(TNR)ALLRES)"!=""
-
-.IF "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
-        $(SHL$(TNR)DEF) \
-        $(STDOBJ) \
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
-        $(SHL$(TNR)LIBS) \
-        $(SHL$(TNR)STDLIBS:^"-l") \
-        $(SHL$(TNR)LINKRES) \
-        $(SHL$(TNR)STDSHL:^"-l") $(STDSHL$(TNR):^"-l") 
-
-.ELSE			# "$(USE_DEFFILE)"!=""
-
-    $(COMMAND_ECHO)$(SHL$(TNR)LINKER) -v 	$(SHL$(TNR)LINKFLAGS)			\
-        $(LINKFLAGSSHL) $(SHL$(TNR)BASEX)		\
-        $(SHL$(TNR)STACK) -o $(SHL$(TNR)TARGETN)	\
-        $(SHL$(TNR)DEF) \
-        $(STDOBJ)							\
-        -L$(LB) \
-        -L$(SOLARVERSION)/$(INPATH)/lib \
-        $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \
-        $(SHL$(TNR)LIBS) \
-        $(SHL$(TNR)STDLIBS:^"-l") \
-        $(SHL$(TNR)LINKRES) \
-        $(SHL$(TNR)STDSHL:^"-l") $(STDSHL$(TNR):^"-l")                           \
-    @$(LS) $@ >& $(NULLDEV)
-
-.ENDIF			# "$(USE_DEFFILE)"!=""
-
-.IF "$(SHL$(TNR)TARGET8)" != "$(SHL$(TNR)TARGET)"
-    $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL$(TNR)TARGET8).dll
-.ENDIF
-
-.ENDIF			# "$(GUI)" == "OS2"
-
 .ENDIF			# "$(SHL$(TNR)TARGETN)"!=""
 
 # unroll end
@@ -617,13 +543,6 @@ $(SHL$(TNR)IMPLIBN):	\
 .ENDIF			# "$(USE_DEFFILE)==""
 .ENDIF			# "$(COM)"=="GCC"
 
-.ELIF "$(GUI)" == "OS2"
-
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
-    $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL$(TNR)VERSIONOBJ)
-    +@echo build of $(SHL$(TNR)TARGETN) creates $@
-
 .ELSE
     @echo no ImportLibs on Mac and *ix
     @-$(RM) $@