diff options
33 files changed, 99 insertions, 3423 deletions
diff --git a/configure.in b/configure.in index 2b907b4ccd99..a0e78250aac2 100755 --- a/configure.in +++ b/configure.in @@ -1460,14 +1460,6 @@ case "$host_os" in enable_systray=no fi ;; - os2*) - test_cups=no - test_randr=no - test_gtk=no - test_cairo=no - test_freetype=no - _os=OS2 - ;; freebsd*) test_gtk=yes build_gstreamer=yes @@ -2767,8 +2759,6 @@ elif test "$_os" = "SunOS"; then BUILD_STLPORT="yes" elif test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then BUILD_STLPORT="yes" -elif test "$_os" = "OS2"; then - BUILD_STLPORT="yes" elif test "$_os" = "FreeBSD"; then BUILD_STLPORT="yes" fi @@ -3194,9 +3184,6 @@ you must use the "--with-jdk-home" configure option explicitly]) if test "$_os" = "WINNT"; then JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[[eE]][[xX]][[eE]]$,,"` fi - if test "$_os" = "OS2"; then - JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[[eE]][[xX]][[eE]]$,,"` - fi fi else AC_MSG_ERROR([JAVA not found. You need at least jdk-1.5, or gcj-4]) @@ -3253,11 +3240,6 @@ if test "$SOLAR_JAVA" != ""; then else javacompiler="javac" fi - if test "$_os" = "OS2"; then - if test x`echo "$javacompiler" | grep -i '\.exe$'` = x; then - javacompiler="${javacompiler}.exe" - fi - fi if test -z "$with_jdk_home"; then AC_PATH_PROG(JAVACOMPILER, $javacompiler) else @@ -3277,11 +3259,6 @@ if test "$SOLAR_JAVA" != ""; then JAVACOMPILER=`cygpath -d "$JAVACOMPILER"` JAVACOMPILER=`cygpath -u "$JAVACOMPILER"` fi - if test "$_os" = "OS2"; then - if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then - JAVACOMPILER="${JAVACOMPILER}.exe" - fi - fi if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then AC_MSG_CHECKING([re-checking JDK]) @@ -3323,11 +3300,6 @@ if test "$SOLAR_JAVA" != ""; then AC_PATH_PROG(JAVADOC, javadoc) else _javadoc_path="$with_jdk_home/bin/javadoc" - if test "$_os" = "OS2"; then - if test x`echo "$_javadoc_path" | grep -i '\.exe$'` = x; then - _javadoc_path="${_javadoc_path}.exe" - fi - fi dnl Check if there is a javadoc at all. if test -x "$_javadoc_path"; then JAVADOC=$_javadoc_path @@ -3345,11 +3317,6 @@ if test "$SOLAR_JAVA" != ""; then JAVADOC=`cygpath -d "$JAVADOC"` JAVADOC=`cygpath -u "$JAVADOC"` fi - if test "$_os" = "OS2"; then - if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then - JAVADOC="${JAVADOC}.exe" - fi - fi fi if test "$SOLAR_JAVA" != ""; then @@ -3610,9 +3577,6 @@ if test "$enable_epm" = "yes"; then # defaults case "$_os" in - OS2) - PKGFORMAT=native - ;; Darwin) PKGFORMAT=dmg ;; @@ -5290,10 +5254,6 @@ if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then echo "Do Nothing for _os = Darwin" dnl Mac OS X using Aqua graphics. Don't check for X11. : -elif test "$_os" = "OS2" ; then - echo "Do Nothing for _os = OS2. Don't check for X11." - dnl OS/2 uses native graphics. Don't check for X11. - : elif test "$_os" != "WINNT" ; then AC_PATH_X AC_PATH_XTRA @@ -5344,7 +5304,7 @@ fi AC_SUBST(XLIB) AC_SUBST(XAU_LIBS) -if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then +if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then dnl =================================================================== dnl Check for Composite.h for mozilla plugin dnl =================================================================== @@ -6036,7 +5996,7 @@ dnl =================================================================== ENABLE_GCONF="" AC_MSG_CHECKING([whether to enable GConf support]) -if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then +if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gconf" = "yes"; then ENABLE_GCONF="TRUE" AC_MSG_RESULT([yes]) PKG_CHECK_MODULES( GCONF, gconf-2.0 ) @@ -7545,11 +7505,6 @@ else cd "$a_cwd" done - if test "$_os" = "OS2"; then - ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` - export ANT_HOME - fi - AC_MSG_CHECKING([if $ANT works]) cat > conftest.java << EOF public class conftest { diff --git a/post_download.in b/post_download.in index 3c542b8dd723..ce09523a782c 100755 --- a/post_download.in +++ b/post_download.in @@ -27,9 +27,6 @@ case "$build_os" in darwin*) # Mac OS X _os=Darwin ;; - os2*) - _os=OS2 - ;; freebsd*) _os=FreeBSD ;; diff --git a/set_soenv.in b/set_soenv.in index e5ad0fd017ff..4a6503482a49 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -704,42 +704,6 @@ elsif ( $platform =~ m/cygwin/ ) $PATH_SEPERATOR = ';'; } } -elsif ( $platform =~ m/os2/ ) -{ - $COMPATH = PathFormat('@COMPATH@'); - $MSPDB_PATH = PathFormat('@MSPDB_PATH@'); - $MIDL_PATH = PathFormat('@MIDL_PATH@'); - $CSC_PATH = PathFormat('@CSC_PATH@'); - $PSDK_HOME = PathFormat('@PSDK_HOME@'); - $FRAME_HOME = PathFormat('@FRAME_HOME@'); - $USE_NEW_SDK = "TRUE"; - $CPUNAME = "INTEL"; - $CPU = "I"; - $GUI = "OS2"; - $GUIBASE = "os2"; - $GVER = "VCL"; - $OS = "OS2"; - $DYNAMIC_CRT = "TRUE"; - $SET_EXCEPTIONS = "TRUE"; - $use_shl_versions = "TRUE"; - { - print "Setting OS/2 gcc 3.3.5 specific values... \n"; - $outfile = "os2env.set.sh"; - $COM = "GCC"; - $OUTPATH = "os2gcci"; - $INPATH = $OUTPATH.$PROEXT; - $COMEX = '@COMEX@'; - - { print "Setting OS/2 with 4OS2 specific values... "; - # Change path to lower case. - $COMPATH = lc $COMPATH; - $PATH_SEPERATOR = ';'; - $ps = ';'; - $wps = ';'; # Windows style path seperator - } - - } -} elsif ( $platform =~ m/darwin/ ) { print "Setting Mac OS X/Darwin specific values... "; $BIG_SVX = "TRUE"; @@ -855,7 +819,7 @@ else # JAVA_HOME as argument from autoconf. $JAVA_HOME = PathFormat('@JAVA_HOME@') ; -if ( $platform =~ m/cygwin|os2/ ) { +if ( $platform =~ m/cygwin/ ) { $JAVA_HOME =~ s/[\s\/]+$//; # remove trailing \n or \/ if there is any. } # 3. bash path. @@ -1054,12 +1018,12 @@ elsif ($platform =~ m/darwin/) { $SOLAREXTRALIB = $L.$LIB. $L.$USR.$LIB; } -elsif ($platform !~ m/cygwin|os2/ ) +elsif ($platform !~ m/cygwin/ ) { AddWarning( "set_soenv", "$platform not configured for linkage create libraries" ); } # Windows NT only variables -if ($platform =~ m/cygwin|os2/) +if ($platform =~ m/cygwin/) { $COMP_ENV = $OUTPATH; $JAVAHOME = '$JAVA_HOME'; @@ -1267,37 +1231,6 @@ elsif ($platform =~ m/cygwin/) } -elsif ($platform =~ m/os2/) -{ # The PATH variable is completely created from scratch. Everything that is not - # needed is appended to the end. - - $PATH = $cur_dir. -# $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN. - $ps.'$SOLARENV'.$ds."bin". - $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN; - - if ( $JAVA_HOME ne "" && $JAVA_HOME ne "NO_JAVA_HOME" ) - { - # hack either "hotspot" or "client" should be used, depending on the jdk version: - # 1.2.x - no such directory, unsupported - # 1.3.x - hotspot, client missing - # 1.4.x - client, hotspot missing - - $PATH .= $ps.$JAVA_HOME.$BIN; - if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."hotspot" ) { - $PATH .= $ps.$JAVA_HOME.$ds."jre".$ds."bin".$ds."hotspot"; - } - if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."client" ) { - $PATH .= $ps.$JAVA_HOME.$ds."jre".$ds."bin".$ds."client"; - } - } - - # Append old PATH - my $temp = $oldPATH; - $temp =~ s/\\/\//g ; - $PATH .= $ps.$temp; -} - elsif ($platform =~ m/darwin/) { $PATH = $cur_dir. # $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN. @@ -1349,7 +1282,7 @@ elsif ($platform =~ m/linux|netbsd|aix|freebsd|openbsd|dragonfly/) $L.$JRETOOLKITDIR. $L.$JRETHREADDIR; } -elsif ($platform =~ m/cygwin|os2/) +elsif ($platform =~ m/cygwin/) { $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB; @@ -1972,7 +1905,7 @@ ToFile( "SYSTEM_LIBTEXTCAT_DATA","@SYSTEM_LIBTEXTCAT_DATA@","e" ); ToFile( "XAU_LIBS", "@XAU_LIBS@", "e" ); ToFile( "GXX_INCLUDE_PATH", PathFormat("@GXX_INCLUDE_PATH@"), "e" ); ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" ); -if ($platform !~ m/cygwin|os2/) { +if ($platform !~ m/cygwin/) { if ( !defined $ENV{"TMPDIR"} || $ENV{"TMPDIR"} eq "" ) { ToFile( "TMPDIR", "/tmp", "e" ); } else { @@ -2004,26 +1937,10 @@ if ( $platform =~ m/cygwin/ ) ToFile( "GNUCOPY", $WIN_GNUCOPY, "e" ); ToFile( "TOUCH", $WIN_TOUCH, "e" ); } -if ( $platform =~ m/os2/ ) -{ - #ToFile( "ILIB", $ILIB, "e" ); - ToFile( "GREP", "grep.exe", "e" ); - ToFile( "FIND", "find.exe", "e" ); - ToFile( "LS", "ls.exe", "e" ); - ToFile( "GNUCOPY", "cp.exe", "e" ); - ToFile( "TOUCH", "touch", "e" ); -} - -# $perlpre is only used for the following three variables -# and only set for OS2. -my $perlpre = ""; -if (( $platform =~ m/os2/ )) { - $perlpre = "perl ".${SOLARENV}.${BIN}.${ds}; -} -ToFile( "DELIVER", $perlpre."deliver.pl", "e" ); -ToFile( "MKOUT", $perlpre."mkout.pl", "e" ); -ToFile( "ZIPDEP", $perlpre."zipdep.pl", "e" ); +ToFile( "DELIVER", "deliver.pl", "e" ); +ToFile( "MKOUT", "mkout.pl", "e" ); +ToFile( "ZIPDEP", "zipdep.pl", "e" ); # # Writing the aliases to file. @@ -2039,9 +1956,6 @@ ToFile( "alias zipdep", $zipdep, "a" ); if ( $platform !~ m/cygwin/ ) { ToFile( "alias nmake", $nmake, "a" ); } -if ( $platform =~ m/os2/ ) -{ ToFile( "alias gunzip", "gzip -d", "a" ); -} ToFile( "fi", $empty, "z"); @@ -2061,13 +1975,6 @@ if ($platform =~ m/solaris|darwin|freebsd/) ToFile( "GNUPATCH", "@GNUPATCH@", "e"); } ToFile( "GNUCOPY", "@GNUCP@", "e"); -# OS/2 define .pl as executable for 4os2 -# use - as switch char for dmake (os2/switchar.c) -if ($platform =~ m/os2/) -{ - ToFile( ".pl", "perl", "e"); - ToFile( "SWITCHAR", "-", "e"); -} ToFile( "SAL_ENABLE_FILE_LOCKING", "1", "e"); ToFile( "ENV_SCRIPT", "$outfile", "e" ); @@ -2328,7 +2235,7 @@ sub CygFormat { my ( $variable, $d1, $d2 ); $variable = $_[ 0 ]; # ToDo: Do the replacement only if Windows and var contains "\" and ":" - if ( $platform =~ m/cygwin|os2/ ) + if ( $platform =~ m/cygwin/ ) { # Complain if PosixPath is used on a PATH-like string if ( $variable =~ m/;/ ) { diff --git a/soldep/bootstrp/command.cxx b/soldep/bootstrp/command.cxx index 86361bde2a47..ed5ff4c0be14 100644 --- a/soldep/bootstrp/command.cxx +++ b/soldep/bootstrp/command.cxx @@ -52,7 +52,7 @@ //#define MH_TEST2 1 // fuers direkte Testen -#if defined(WNT) || defined(OS2) +#if defined(WNT) #ifdef _MSC_VER #pragma warning (push,1) #endif @@ -77,7 +77,7 @@ #include <windows.h> #endif -#if defined(WNT) || defined(OS2) +#if defined(WNT) #define cPathSeperator ';' #endif #ifdef UNX @@ -436,8 +436,6 @@ CCommand::operator int() int nRet; #if defined WNT nRet = _spawnv( P_WAIT, ppArgv[0], (const char **) ppArgv ); -#elif defined OS2 - nRet = _spawnv( P_WAIT, ppArgv[0], ppArgv ); #elif defined UNX //fprintf( stderr, "CComand : operator (int) not implemented\n"); // **** Unix Implementierung *************** diff --git a/soldep/inc/soldep/command.hxx b/soldep/inc/soldep/command.hxx index 50781e1679a9..93c01616e593 100644 --- a/soldep/inc/soldep/command.hxx +++ b/soldep/inc/soldep/command.hxx @@ -57,9 +57,6 @@ enum ExeType #ifdef WNT #define COMMAND_SHELL "4nt.exe" #endif -#ifdef OS2 -#define COMMAND_SHELL "4os2.exe" -#endif #ifdef UNX #define COMMAND_SHELL "csh" #endif diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 59e678f681bb..22db4032b39d 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -1178,7 +1178,6 @@ sub check_platform { return 1 if ($platform eq 'all'); return 1 if (($ENV{GUI} eq 'WIN') && ($platform eq 'w')); return 1 if (($ENV{GUI} eq 'UNX') && ($platform eq 'u')); - return 1 if (($ENV{GUI} eq 'OS2') && ($platform eq 'p')); return 1 if (($ENV{GUI} eq 'WNT') && (($platform eq 'w') || ($platform eq 'n'))); return 0; diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk index bf7e87417243..959edd2f26fe 100644 --- a/solenv/inc/_tg_app.mk +++ b/solenv/inc/_tg_app.mk @@ -1,9 +1,5 @@ # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP1DEF = $(MISC)/$(APP1TARGET).def -.ENDIF - .IF "$(APP1LINKTYPE)" != "" #must be either STATIC or SHARED APP1LINKTYPEFLAG=$(APPLINK$(APP1LINKTYPE)) @@ -59,7 +55,7 @@ APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\" .ENDIF # "$(APP1PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP1LIBS)"!="" $(MISC)/$(APP1TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -74,16 +70,8 @@ $(APP1TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP1LIBSALCPPRT*=$(LIBSALCPPRT) -.IF "$(GUI)" == "OS2" -_APP1IMP_ORD = $(APP1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP1STDLIBS:^"$(LB)/") -APP1IMP_ORD = $(foreach,i,$(_APP1IMP_ORD) $(shell @-ls $i)) -.ELSE -APP1IMP_ORD = -.ENDIF - $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(APP1RES) \ - $(APP1IMP_ORD) \ $(APP1ICON) $(APP1DEPN) $(USE_APP1DEF) @echo "Making: " $(@:f) .IF "$(GUI)"=="UNX" @@ -218,76 +206,12 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ .ENDIF # "$(GUI)" == "WNT" -.IF "$(GUI)" == "OS2" - @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) -.IF "$(APP1LINKRES)" != "" - @+-$(RM) $(MISC)/$(APP1LINKRES:b).rc >& $(NULLDEV) -.IF "$(APP1ICON)" != "" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP1LINKRES:b).rc -.ENDIF # "$(APP1ICON)" != "" -.IF "$(APP1VERINFO)" != "" - @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc - @-+echo $(EMQ)#include $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc -.ENDIF # "$(APP1VERINFO)" != "" - $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc -.ENDIF # "$(APP1LINKRES)" != "" - -.IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP1TARGET) WINDOWAPI > $(MISC)/$(APP1TARGET).def -.ENDIF - - .IF "$(VERBOSE)" == "TRUE" - @+echo $(APP1LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP1BASEX) \ - $(APP1STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP1LINKRES) \ - $(APP1RES) \ - $(APP1DEF) \ - $(APP1OBJS) \ - $(APP1LIBS) \ - $(APP1STDLIBS:^"-l") \ - $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") - .ENDIF - $(COMMAND_ECHO)$(APP1LINKER) -v \ - $(APP1LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP1BASEX) \ - $(APP1STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP1LINKRES) \ - $(APP1RES) \ - $(APP1DEF) \ - $(APP1OBJS) \ - $(APP1LIBS) \ - $(APP1STDLIBS:^"-l") \ - $(APP1STDLIB:^"-l") $(STDLIB1:^"-l") - - -.IF "$(APP1TARGET)" == "loader" - $(COMMAND_ECHO)+$(PERL) loader.pl $@ - $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe - $(COMMAND_ECHO)+$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe -.ENDIF # "$(TARGET)" == "setup" - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(APP1TARGETN)"!="" # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP2DEF = $(MISC)/$(APP2TARGET).def -.ENDIF - .IF "$(APP2LINKTYPE)" != "" #must be either STATIC or SHARED APP2LINKTYPEFLAG=$(APPLINK$(APP2LINKTYPE)) @@ -343,7 +267,7 @@ APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\" .ENDIF # "$(APP2PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP2LIBS)"!="" $(MISC)/$(APP2TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -358,16 +282,8 @@ $(APP2TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP2LIBSALCPPRT*=$(LIBSALCPPRT) -.IF "$(GUI)" == "OS2" -_APP2IMP_ORD = $(APP2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP2STDLIBS:^"$(LB)/") -APP2IMP_ORD = $(foreach,i,$(_APP2IMP_ORD) $(shell @-ls $i)) -.ELSE -APP2IMP_ORD = -.ENDIF - $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(APP2RES) \ - $(APP2IMP_ORD) \ $(APP2ICON) $(APP2DEPN) $(USE_APP2DEF) @echo "Making: " $(@:f) .IF "$(GUI)"=="UNX" @@ -502,76 +418,12 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ .ENDIF # "$(GUI)" == "WNT" -.IF "$(GUI)" == "OS2" - @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) -.IF "$(APP2LINKRES)" != "" - @+-$(RM) $(MISC)/$(APP2LINKRES:b).rc >& $(NULLDEV) -.IF "$(APP2ICON)" != "" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP2ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP2LINKRES:b).rc -.ENDIF # "$(APP2ICON)" != "" -.IF "$(APP2VERINFO)" != "" - @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc - @-+echo $(EMQ)#include $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc -.ENDIF # "$(APP2VERINFO)" != "" - $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc -.ENDIF # "$(APP2LINKRES)" != "" - -.IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP2TARGET) WINDOWAPI > $(MISC)/$(APP2TARGET).def -.ENDIF - - .IF "$(VERBOSE)" == "TRUE" - @+echo $(APP2LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP2BASEX) \ - $(APP2STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP2LINKRES) \ - $(APP2RES) \ - $(APP2DEF) \ - $(APP2OBJS) \ - $(APP2LIBS) \ - $(APP2STDLIBS:^"-l") \ - $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") - .ENDIF - $(COMMAND_ECHO)$(APP2LINKER) -v \ - $(APP2LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP2BASEX) \ - $(APP2STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP2LINKRES) \ - $(APP2RES) \ - $(APP2DEF) \ - $(APP2OBJS) \ - $(APP2LIBS) \ - $(APP2STDLIBS:^"-l") \ - $(APP2STDLIB:^"-l") $(STDLIB2:^"-l") - - -.IF "$(APP2TARGET)" == "loader" - $(COMMAND_ECHO)+$(PERL) loader.pl $@ - $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe - $(COMMAND_ECHO)+$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe -.ENDIF # "$(TARGET)" == "setup" - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(APP2TARGETN)"!="" # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP3DEF = $(MISC)/$(APP3TARGET).def -.ENDIF - .IF "$(APP3LINKTYPE)" != "" #must be either STATIC or SHARED APP3LINKTYPEFLAG=$(APPLINK$(APP3LINKTYPE)) @@ -627,7 +479,7 @@ APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\" .ENDIF # "$(APP3PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP3LIBS)"!="" $(MISC)/$(APP3TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -642,16 +494,8 @@ $(APP3TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP3LIBSALCPPRT*=$(LIBSALCPPRT) -.IF "$(GUI)" == "OS2" -_APP3IMP_ORD = $(APP3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP3STDLIBS:^"$(LB)/") -APP3IMP_ORD = $(foreach,i,$(_APP3IMP_ORD) $(shell @-ls $i)) -.ELSE -APP3IMP_ORD = -.ENDIF - $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(APP3RES) \ - $(APP3IMP_ORD) \ $(APP3ICON) $(APP3DEPN) $(USE_APP3DEF) @echo "Making: " $(@:f) .IF "$(GUI)"=="UNX" @@ -786,76 +630,12 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ .ENDIF # "$(GUI)" == "WNT" -.IF "$(GUI)" == "OS2" - @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) -.IF "$(APP3LINKRES)" != "" - @+-$(RM) $(MISC)/$(APP3LINKRES:b).rc >& $(NULLDEV) -.IF "$(APP3ICON)" != "" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP3ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP3LINKRES:b).rc -.ENDIF # "$(APP3ICON)" != "" -.IF "$(APP3VERINFO)" != "" - @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc - @-+echo $(EMQ)#include $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc -.ENDIF # "$(APP3VERINFO)" != "" - $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc -.ENDIF # "$(APP3LINKRES)" != "" - -.IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP3TARGET) WINDOWAPI > $(MISC)/$(APP3TARGET).def -.ENDIF - - .IF "$(VERBOSE)" == "TRUE" - @+echo $(APP3LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP3BASEX) \ - $(APP3STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP3LINKRES) \ - $(APP3RES) \ - $(APP3DEF) \ - $(APP3OBJS) \ - $(APP3LIBS) \ - $(APP3STDLIBS:^"-l") \ - $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") - .ENDIF - $(COMMAND_ECHO)$(APP3LINKER) -v \ - $(APP3LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP3BASEX) \ - $(APP3STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP3LINKRES) \ - $(APP3RES) \ - $(APP3DEF) \ - $(APP3OBJS) \ - $(APP3LIBS) \ - $(APP3STDLIBS:^"-l") \ - $(APP3STDLIB:^"-l") $(STDLIB3:^"-l") - - -.IF "$(APP3TARGET)" == "loader" - $(COMMAND_ECHO)+$(PERL) loader.pl $@ - $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe - $(COMMAND_ECHO)+$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe -.ENDIF # "$(TARGET)" == "setup" - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(APP3TARGETN)"!="" # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP4DEF = $(MISC)/$(APP4TARGET).def -.ENDIF - .IF "$(APP4LINKTYPE)" != "" #must be either STATIC or SHARED APP4LINKTYPEFLAG=$(APPLINK$(APP4LINKTYPE)) @@ -911,7 +691,7 @@ APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\" .ENDIF # "$(APP4PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP4LIBS)"!="" $(MISC)/$(APP4TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -926,16 +706,8 @@ $(APP4TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP4LIBSALCPPRT*=$(LIBSALCPPRT) -.IF "$(GUI)" == "OS2" -_APP4IMP_ORD = $(APP4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP4STDLIBS:^"$(LB)/") -APP4IMP_ORD = $(foreach,i,$(_APP4IMP_ORD) $(shell @-ls $i)) -.ELSE -APP4IMP_ORD = -.ENDIF - $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(APP4RES) \ - $(APP4IMP_ORD) \ $(APP4ICON) $(APP4DEPN) $(USE_APP4DEF) @echo "Making: " $(@:f) .IF "$(GUI)"=="UNX" @@ -1070,76 +842,12 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ .ENDIF # "$(GUI)" == "WNT" -.IF "$(GUI)" == "OS2" - @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) -.IF "$(APP4LINKRES)" != "" - @+-$(RM) $(MISC)/$(APP4LINKRES:b).rc >& $(NULLDEV) -.IF "$(APP4ICON)" != "" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP4ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP4LINKRES:b).rc -.ENDIF # "$(APP4ICON)" != "" -.IF "$(APP4VERINFO)" != "" - @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc - @-+echo $(EMQ)#include $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc -.ENDIF # "$(APP4VERINFO)" != "" - $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc -.ENDIF # "$(APP4LINKRES)" != "" - -.IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP4TARGET) WINDOWAPI > $(MISC)/$(APP4TARGET).def -.ENDIF - - .IF "$(VERBOSE)" == "TRUE" - @+echo $(APP4LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP4BASEX) \ - $(APP4STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP4LINKRES) \ - $(APP4RES) \ - $(APP4DEF) \ - $(APP4OBJS) \ - $(APP4LIBS) \ - $(APP4STDLIBS:^"-l") \ - $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") - .ENDIF - $(COMMAND_ECHO)$(APP4LINKER) -v \ - $(APP4LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP4BASEX) \ - $(APP4STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP4LINKRES) \ - $(APP4RES) \ - $(APP4DEF) \ - $(APP4OBJS) \ - $(APP4LIBS) \ - $(APP4STDLIBS:^"-l") \ - $(APP4STDLIB:^"-l") $(STDLIB4:^"-l") - - -.IF "$(APP4TARGET)" == "loader" - $(COMMAND_ECHO)+$(PERL) loader.pl $@ - $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe - $(COMMAND_ECHO)+$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe -.ENDIF # "$(TARGET)" == "setup" - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(APP4TARGETN)"!="" # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP5DEF = $(MISC)/$(APP5TARGET).def -.ENDIF - .IF "$(APP5LINKTYPE)" != "" #must be either STATIC or SHARED APP5LINKTYPEFLAG=$(APPLINK$(APP5LINKTYPE)) @@ -1195,7 +903,7 @@ APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\" .ENDIF # "$(APP5PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP5LIBS)"!="" $(MISC)/$(APP5TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -1210,16 +918,8 @@ $(APP5TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP5LIBSALCPPRT*=$(LIBSALCPPRT) -.IF "$(GUI)" == "OS2" -_APP5IMP_ORD = $(APP5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP5STDLIBS:^"$(LB)/") -APP5IMP_ORD = $(foreach,i,$(_APP5IMP_ORD) $(shell @-ls $i)) -.ELSE -APP5IMP_ORD = -.ENDIF - $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(APP5RES) \ - $(APP5IMP_ORD) \ $(APP5ICON) $(APP5DEPN) $(USE_APP5DEF) @echo "Making: " $(@:f) .IF "$(GUI)"=="UNX" @@ -1354,76 +1054,12 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ .ENDIF # "$(GUI)" == "WNT" -.IF "$(GUI)" == "OS2" - @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) -.IF "$(APP5LINKRES)" != "" - @+-$(RM) $(MISC)/$(APP5LINKRES:b).rc >& $(NULLDEV) -.IF "$(APP5ICON)" != "" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP5ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP5LINKRES:b).rc -.ENDIF # "$(APP5ICON)" != "" -.IF "$(APP5VERINFO)" != "" - @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc - @-+echo $(EMQ)#include $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc -.ENDIF # "$(APP5VERINFO)" != "" - $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc -.ENDIF # "$(APP5LINKRES)" != "" - -.IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP5TARGET) WINDOWAPI > $(MISC)/$(APP5TARGET).def -.ENDIF - - .IF "$(VERBOSE)" == "TRUE" - @+echo $(APP5LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP5BASEX) \ - $(APP5STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP5LINKRES) \ - $(APP5RES) \ - $(APP5DEF) \ - $(APP5OBJS) \ - $(APP5LIBS) \ - $(APP5STDLIBS:^"-l") \ - $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") - .ENDIF - $(COMMAND_ECHO)$(APP5LINKER) -v \ - $(APP5LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP5BASEX) \ - $(APP5STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP5LINKRES) \ - $(APP5RES) \ - $(APP5DEF) \ - $(APP5OBJS) \ - $(APP5LIBS) \ - $(APP5STDLIBS:^"-l") \ - $(APP5STDLIB:^"-l") $(STDLIB5:^"-l") - - -.IF "$(APP5TARGET)" == "loader" - $(COMMAND_ECHO)+$(PERL) loader.pl $@ - $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe - $(COMMAND_ECHO)+$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe -.ENDIF # "$(TARGET)" == "setup" - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(APP5TARGETN)"!="" # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP6DEF = $(MISC)/$(APP6TARGET).def -.ENDIF - .IF "$(APP6LINKTYPE)" != "" #must be either STATIC or SHARED APP6LINKTYPEFLAG=$(APPLINK$(APP6LINKTYPE)) @@ -1479,7 +1115,7 @@ APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\" .ENDIF # "$(APP6PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP6LIBS)"!="" $(MISC)/$(APP6TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -1494,16 +1130,8 @@ $(APP6TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP6LIBSALCPPRT*=$(LIBSALCPPRT) -.IF "$(GUI)" == "OS2" -_APP6IMP_ORD = $(APP6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP6STDLIBS:^"$(LB)/") -APP6IMP_ORD = $(foreach,i,$(_APP6IMP_ORD) $(shell @-ls $i)) -.ELSE -APP6IMP_ORD = -.ENDIF - $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(APP6RES) \ - $(APP6IMP_ORD) \ $(APP6ICON) $(APP6DEPN) $(USE_APP6DEF) @echo "Making: " $(@:f) .IF "$(GUI)"=="UNX" @@ -1638,76 +1266,12 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ .ENDIF # "$(GUI)" == "WNT" -.IF "$(GUI)" == "OS2" - @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) -.IF "$(APP6LINKRES)" != "" - @+-$(RM) $(MISC)/$(APP6LINKRES:b).rc >& $(NULLDEV) -.IF "$(APP6ICON)" != "" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP6ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP6LINKRES:b).rc -.ENDIF # "$(APP6ICON)" != "" -.IF "$(APP6VERINFO)" != "" - @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc - @-+echo $(EMQ)#include $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc -.ENDIF # "$(APP6VERINFO)" != "" - $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc -.ENDIF # "$(APP6LINKRES)" != "" - -.IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP6TARGET) WINDOWAPI > $(MISC)/$(APP6TARGET).def -.ENDIF - - .IF "$(VERBOSE)" == "TRUE" - @+echo $(APP6LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP6BASEX) \ - $(APP6STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP6LINKRES) \ - $(APP6RES) \ - $(APP6DEF) \ - $(APP6OBJS) \ - $(APP6LIBS) \ - $(APP6STDLIBS:^"-l") \ - $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") - .ENDIF - $(COMMAND_ECHO)$(APP6LINKER) -v \ - $(APP6LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP6BASEX) \ - $(APP6STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP6LINKRES) \ - $(APP6RES) \ - $(APP6DEF) \ - $(APP6OBJS) \ - $(APP6LIBS) \ - $(APP6STDLIBS:^"-l") \ - $(APP6STDLIB:^"-l") $(STDLIB6:^"-l") - - -.IF "$(APP6TARGET)" == "loader" - $(COMMAND_ECHO)+$(PERL) loader.pl $@ - $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe - $(COMMAND_ECHO)+$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe -.ENDIF # "$(TARGET)" == "setup" - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(APP6TARGETN)"!="" # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP7DEF = $(MISC)/$(APP7TARGET).def -.ENDIF - .IF "$(APP7LINKTYPE)" != "" #must be either STATIC or SHARED APP7LINKTYPEFLAG=$(APPLINK$(APP7LINKTYPE)) @@ -1763,7 +1327,7 @@ APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\" .ENDIF # "$(APP7PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP7LIBS)"!="" $(MISC)/$(APP7TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -1778,16 +1342,8 @@ $(APP7TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP7LIBSALCPPRT*=$(LIBSALCPPRT) -.IF "$(GUI)" == "OS2" -_APP7IMP_ORD = $(APP7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP7STDLIBS:^"$(LB)/") -APP7IMP_ORD = $(foreach,i,$(_APP7IMP_ORD) $(shell @-ls $i)) -.ELSE -APP7IMP_ORD = -.ENDIF - $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(APP7RES) \ - $(APP7IMP_ORD) \ $(APP7ICON) $(APP7DEPN) $(USE_APP7DEF) @echo "Making: " $(@:f) .IF "$(GUI)"=="UNX" @@ -1922,76 +1478,12 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ .ENDIF # "$(GUI)" == "WNT" -.IF "$(GUI)" == "OS2" - @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) -.IF "$(APP7LINKRES)" != "" - @+-$(RM) $(MISC)/$(APP7LINKRES:b).rc >& $(NULLDEV) -.IF "$(APP7ICON)" != "" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP7ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP7LINKRES:b).rc -.ENDIF # "$(APP7ICON)" != "" -.IF "$(APP7VERINFO)" != "" - @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc - @-+echo $(EMQ)#include $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc -.ENDIF # "$(APP7VERINFO)" != "" - $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc -.ENDIF # "$(APP7LINKRES)" != "" - -.IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP7TARGET) WINDOWAPI > $(MISC)/$(APP7TARGET).def -.ENDIF - - .IF "$(VERBOSE)" == "TRUE" - @+echo $(APP7LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP7BASEX) \ - $(APP7STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP7LINKRES) \ - $(APP7RES) \ - $(APP7DEF) \ - $(APP7OBJS) \ - $(APP7LIBS) \ - $(APP7STDLIBS:^"-l") \ - $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") - .ENDIF - $(COMMAND_ECHO)$(APP7LINKER) -v \ - $(APP7LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP7BASEX) \ - $(APP7STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP7LINKRES) \ - $(APP7RES) \ - $(APP7DEF) \ - $(APP7OBJS) \ - $(APP7LIBS) \ - $(APP7STDLIBS:^"-l") \ - $(APP7STDLIB:^"-l") $(STDLIB7:^"-l") - - -.IF "$(APP7TARGET)" == "loader" - $(COMMAND_ECHO)+$(PERL) loader.pl $@ - $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe - $(COMMAND_ECHO)+$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe -.ENDIF # "$(TARGET)" == "setup" - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(APP7TARGETN)"!="" # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP8DEF = $(MISC)/$(APP8TARGET).def -.ENDIF - .IF "$(APP8LINKTYPE)" != "" #must be either STATIC or SHARED APP8LINKTYPEFLAG=$(APPLINK$(APP8LINKTYPE)) @@ -2047,7 +1539,7 @@ APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\" .ENDIF # "$(APP8PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP8LIBS)"!="" $(MISC)/$(APP8TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -2062,16 +1554,8 @@ $(APP8TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP8LIBSALCPPRT*=$(LIBSALCPPRT) -.IF "$(GUI)" == "OS2" -_APP8IMP_ORD = $(APP8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP8STDLIBS:^"$(LB)/") -APP8IMP_ORD = $(foreach,i,$(_APP8IMP_ORD) $(shell @-ls $i)) -.ELSE -APP8IMP_ORD = -.ENDIF - $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(APP8RES) \ - $(APP8IMP_ORD) \ $(APP8ICON) $(APP8DEPN) $(USE_APP8DEF) @echo "Making: " $(@:f) .IF "$(GUI)"=="UNX" @@ -2206,76 +1690,12 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ .ENDIF # "$(GUI)" == "WNT" -.IF "$(GUI)" == "OS2" - @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) -.IF "$(APP8LINKRES)" != "" - @+-$(RM) $(MISC)/$(APP8LINKRES:b).rc >& $(NULLDEV) -.IF "$(APP8ICON)" != "" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP8ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP8LINKRES:b).rc -.ENDIF # "$(APP8ICON)" != "" -.IF "$(APP8VERINFO)" != "" - @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc - @-+echo $(EMQ)#include $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc -.ENDIF # "$(APP8VERINFO)" != "" - $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc -.ENDIF # "$(APP8LINKRES)" != "" - -.IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP8TARGET) WINDOWAPI > $(MISC)/$(APP8TARGET).def -.ENDIF - - .IF "$(VERBOSE)" == "TRUE" - @+echo $(APP8LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP8BASEX) \ - $(APP8STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP8LINKRES) \ - $(APP8RES) \ - $(APP8DEF) \ - $(APP8OBJS) \ - $(APP8LIBS) \ - $(APP8STDLIBS:^"-l") \ - $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") - .ENDIF - $(COMMAND_ECHO)$(APP8LINKER) -v \ - $(APP8LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP8BASEX) \ - $(APP8STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP8LINKRES) \ - $(APP8RES) \ - $(APP8DEF) \ - $(APP8OBJS) \ - $(APP8LIBS) \ - $(APP8STDLIBS:^"-l") \ - $(APP8STDLIB:^"-l") $(STDLIB8:^"-l") - - -.IF "$(APP8TARGET)" == "loader" - $(COMMAND_ECHO)+$(PERL) loader.pl $@ - $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe - $(COMMAND_ECHO)+$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe -.ENDIF # "$(TARGET)" == "setup" - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(APP8TARGETN)"!="" # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP9DEF = $(MISC)/$(APP9TARGET).def -.ENDIF - .IF "$(APP9LINKTYPE)" != "" #must be either STATIC or SHARED APP9LINKTYPEFLAG=$(APPLINK$(APP9LINKTYPE)) @@ -2331,7 +1751,7 @@ APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\" .ENDIF # "$(APP9PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP9LIBS)"!="" $(MISC)/$(APP9TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -2346,16 +1766,8 @@ $(APP9TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP9LIBSALCPPRT*=$(LIBSALCPPRT) -.IF "$(GUI)" == "OS2" -_APP9IMP_ORD = $(APP9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP9STDLIBS:^"$(LB)/") -APP9IMP_ORD = $(foreach,i,$(_APP9IMP_ORD) $(shell @-ls $i)) -.ELSE -APP9IMP_ORD = -.ENDIF - $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(APP9RES) \ - $(APP9IMP_ORD) \ $(APP9ICON) $(APP9DEPN) $(USE_APP9DEF) @echo "Making: " $(@:f) .IF "$(GUI)"=="UNX" @@ -2490,76 +1902,12 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ .ENDIF # "$(GUI)" == "WNT" -.IF "$(GUI)" == "OS2" - @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) -.IF "$(APP9LINKRES)" != "" - @+-$(RM) $(MISC)/$(APP9LINKRES:b).rc >& $(NULLDEV) -.IF "$(APP9ICON)" != "" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP9ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP9LINKRES:b).rc -.ENDIF # "$(APP9ICON)" != "" -.IF "$(APP9VERINFO)" != "" - @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc - @-+echo $(EMQ)#include $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc -.ENDIF # "$(APP9VERINFO)" != "" - $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc -.ENDIF # "$(APP9LINKRES)" != "" - -.IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP9TARGET) WINDOWAPI > $(MISC)/$(APP9TARGET).def -.ENDIF - - .IF "$(VERBOSE)" == "TRUE" - @+echo $(APP9LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP9BASEX) \ - $(APP9STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP9LINKRES) \ - $(APP9RES) \ - $(APP9DEF) \ - $(APP9OBJS) \ - $(APP9LIBS) \ - $(APP9STDLIBS:^"-l") \ - $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") - .ENDIF - $(COMMAND_ECHO)$(APP9LINKER) -v \ - $(APP9LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP9BASEX) \ - $(APP9STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP9LINKRES) \ - $(APP9RES) \ - $(APP9DEF) \ - $(APP9OBJS) \ - $(APP9LIBS) \ - $(APP9STDLIBS:^"-l") \ - $(APP9STDLIB:^"-l") $(STDLIB9:^"-l") - - -.IF "$(APP9TARGET)" == "loader" - $(COMMAND_ECHO)+$(PERL) loader.pl $@ - $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe - $(COMMAND_ECHO)+$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe -.ENDIF # "$(TARGET)" == "setup" - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(APP9TARGETN)"!="" # Instruction for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP10DEF = $(MISC)/$(APP10TARGET).def -.ENDIF - .IF "$(APP10LINKTYPE)" != "" #must be either STATIC or SHARED APP10LINKTYPEFLAG=$(APPLINK$(APP10LINKTYPE)) @@ -2615,7 +1963,7 @@ APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\" .ENDIF # "$(APP10PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP10LIBS)"!="" $(MISC)/$(APP10TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -2630,16 +1978,8 @@ $(APP10TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP10LIBSALCPPRT*=$(LIBSALCPPRT) -.IF "$(GUI)" == "OS2" -_APP10IMP_ORD = $(APP10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP10STDLIBS:^"$(LB)/") -APP10IMP_ORD = $(foreach,i,$(_APP10IMP_ORD) $(shell @-ls $i)) -.ELSE -APP10IMP_ORD = -.ENDIF - $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(APP10RES) \ - $(APP10IMP_ORD) \ $(APP10ICON) $(APP10DEPN) $(USE_APP10DEF) @echo "Making: " $(@:f) .IF "$(GUI)"=="UNX" @@ -2774,66 +2114,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ .ENDIF # "$(GUI)" == "WNT" -.IF "$(GUI)" == "OS2" - @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) -.IF "$(APP10LINKRES)" != "" - @+-$(RM) $(MISC)/$(APP10LINKRES:b).rc >& $(NULLDEV) -.IF "$(APP10ICON)" != "" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP10ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP10LINKRES:b).rc -.ENDIF # "$(APP10ICON)" != "" -.IF "$(APP10VERINFO)" != "" - @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc - @-+echo $(EMQ)#include $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc -.ENDIF # "$(APP10VERINFO)" != "" - $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc -.ENDIF # "$(APP10LINKRES)" != "" - -.IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP10TARGET) WINDOWAPI > $(MISC)/$(APP10TARGET).def -.ENDIF - - .IF "$(VERBOSE)" == "TRUE" - @+echo $(APP10LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP10BASEX) \ - $(APP10STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP10LINKRES) \ - $(APP10RES) \ - $(APP10DEF) \ - $(APP10OBJS) \ - $(APP10LIBS) \ - $(APP10STDLIBS:^"-l") \ - $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") - .ENDIF - $(COMMAND_ECHO)$(APP10LINKER) -v \ - $(APP10LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP10BASEX) \ - $(APP10STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP10LINKRES) \ - $(APP10RES) \ - $(APP10DEF) \ - $(APP10OBJS) \ - $(APP10LIBS) \ - $(APP10STDLIBS:^"-l") \ - $(APP10STDLIB:^"-l") $(STDLIB10:^"-l") - - -.IF "$(APP10TARGET)" == "loader" - $(COMMAND_ECHO)+$(PERL) loader.pl $@ - $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe - $(COMMAND_ECHO)+$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe -.ENDIF # "$(TARGET)" == "setup" - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(APP10TARGETN)"!="" diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk index cf4414ae4e1f..488f638e3303 100644 --- a/solenv/inc/_tg_def.mk +++ b/solenv/inc/_tg_def.mk @@ -36,12 +36,6 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -DEF1EXPORTFILE=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp -$(DEF1EXPORTFILE) : $(SHL1VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(DEF1EXPORTFILE)"=="" .ENDIF # "$(SHL1VERSIONMAP)"!="" @@ -163,112 +157,6 @@ $(DEF1TARGETN) .PHONY : @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" - -#21/02/2006 YD dll names must be 8.3, invoke fix script -#check osl/os2/module.c/osl_loadModule() -SHL1TARGET8=$(shell @fix_shl $(SHL1TARGETN:f)) - -DEF1FILTER=$(SOLARENV)/inc/dummy.flt -DEF1NAMELIST=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) - -.IF "$(link_always)"=="" -$(DEF1TARGETN) : \ - $(DEF1DEPN) \ - $(DEF1EXPORTFILE) -.ELSE # "$(link_always)"=="" -$(DEF1TARGETN) .PHONY : -.ENDIF # "$(link_always)"=="" - @+-$(RM) $@.tmpfile - @echo "Making: module definition file" $(@:f) - @echo LIBRARY $(SHL1TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile - @echo DATA MULTIPLE >>$@.tmpfile - @echo DESCRIPTION 'StarView 3.00 $(DEF1DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile - @echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - @echo _GetVersionInfo >$@.tmp_ord -.ENDIF - -.IF "$(DEFLIB1NAME)"!="" - @+echo $(SLB)/$(DEFLIB1NAME).lib - @+emxexpr $(DEF1NAMELIST) | fix_exp_file >> $@.tmp_ord -.ENDIF # "$(DEFLIB1NAME)"!="" - -.IF "$(DEF1EXPORT1)"!="" - @echo $(DEF1EXPORT1) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT2)"!="" - @echo $(DEF1EXPORT2) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT3)"!="" - @echo $(DEF1EXPORT3) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT4)"!="" - @echo $(DEF1EXPORT4) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT5)"!="" - @echo $(DEF1EXPORT5) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT6)"!="" - @echo $(DEF1EXPORT6) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT7)"!="" - @echo $(DEF1EXPORT7) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT8)"!="" - @echo $(DEF1EXPORT8) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT9)"!="" - @echo $(DEF1EXPORT9) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT10)"!="" - @echo $(DEF1EXPORT10) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT11)"!="" - @echo $(DEF1EXPORT11) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT12)"!="" - @echo $(DEF1EXPORT12) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT13)"!="" - @echo $(DEF1EXPORT13) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT14)"!="" - @echo $(DEF1EXPORT14) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT15)"!="" - @echo $(DEF1EXPORT15) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT16)"!="" - @echo $(DEF1EXPORT16) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT17)"!="" - @echo $(DEF1EXPORT17) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT18)"!="" - @echo $(DEF1EXPORT18) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT19)"!="" - @echo $(DEF1EXPORT19) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORT20)"!="" - @echo $(DEF1EXPORT20) >>$@.tmpfile -.ENDIF -.IF "$(DEF1EXPORTFILE)"!="" - @fix_def_file < $(DEF1EXPORTFILE) >> $@.tmp_ord -.ENDIF - @sort < $@.tmp_ord | uniq > $@.exptmpfile - @fix_def_ord < $@.exptmpfile >> $@.tmpfile - @+-$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@ - @+-$(RM) $@.tmp_ord - @+-$(RM) $@.exptmpfile - $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL1IMPLIBN:s/.lib/.a/) $@ - $(COMMAND_ECHO)+emxomf -o $(SHL1IMPLIBN) $(SHL1IMPLIBN:s/.lib/.a/) - -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" $(DEF1TARGETN): \ $(DEF1DEPN) \ @@ -317,12 +205,6 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -DEF2EXPORTFILE=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp -$(DEF2EXPORTFILE) : $(SHL2VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(DEF2EXPORTFILE)"=="" .ENDIF # "$(SHL2VERSIONMAP)"!="" @@ -444,112 +326,6 @@ $(DEF2TARGETN) .PHONY : @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" - -#21/02/2006 YD dll names must be 8.3, invoke fix script -#check osl/os2/module.c/osl_loadModule() -SHL2TARGET8=$(shell @fix_shl $(SHL2TARGETN:f)) - -DEF2FILTER=$(SOLARENV)/inc/dummy.flt -DEF2NAMELIST=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) - -.IF "$(link_always)"=="" -$(DEF2TARGETN) : \ - $(DEF2DEPN) \ - $(DEF2EXPORTFILE) -.ELSE # "$(link_always)"=="" -$(DEF2TARGETN) .PHONY : -.ENDIF # "$(link_always)"=="" - @+-$(RM) $@.tmpfile - @echo "Making: module definition file" $(@:f) - @echo LIBRARY $(SHL2TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile - @echo DATA MULTIPLE >>$@.tmpfile - @echo DESCRIPTION 'StarView 3.00 $(DEF2DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile - @echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - @echo _GetVersionInfo >$@.tmp_ord -.ENDIF - -.IF "$(DEFLIB2NAME)"!="" - @+echo $(SLB)/$(DEFLIB2NAME).lib - @+emxexpr $(DEF2NAMELIST) | fix_exp_file >> $@.tmp_ord -.ENDIF # "$(DEFLIB2NAME)"!="" - -.IF "$(DEF2EXPORT1)"!="" - @echo $(DEF2EXPORT1) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT2)"!="" - @echo $(DEF2EXPORT2) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT3)"!="" - @echo $(DEF2EXPORT3) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT4)"!="" - @echo $(DEF2EXPORT4) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT5)"!="" - @echo $(DEF2EXPORT5) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT6)"!="" - @echo $(DEF2EXPORT6) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT7)"!="" - @echo $(DEF2EXPORT7) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT8)"!="" - @echo $(DEF2EXPORT8) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT9)"!="" - @echo $(DEF2EXPORT9) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT10)"!="" - @echo $(DEF2EXPORT10) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT11)"!="" - @echo $(DEF2EXPORT11) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT12)"!="" - @echo $(DEF2EXPORT12) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT13)"!="" - @echo $(DEF2EXPORT13) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT14)"!="" - @echo $(DEF2EXPORT14) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT15)"!="" - @echo $(DEF2EXPORT15) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT16)"!="" - @echo $(DEF2EXPORT16) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT17)"!="" - @echo $(DEF2EXPORT17) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT18)"!="" - @echo $(DEF2EXPORT18) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT19)"!="" - @echo $(DEF2EXPORT19) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORT20)"!="" - @echo $(DEF2EXPORT20) >>$@.tmpfile -.ENDIF -.IF "$(DEF2EXPORTFILE)"!="" - @fix_def_file < $(DEF2EXPORTFILE) >> $@.tmp_ord -.ENDIF - @sort < $@.tmp_ord | uniq > $@.exptmpfile - @fix_def_ord < $@.exptmpfile >> $@.tmpfile - @+-$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@ - @+-$(RM) $@.tmp_ord - @+-$(RM) $@.exptmpfile - $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL2IMPLIBN:s/.lib/.a/) $@ - $(COMMAND_ECHO)+emxomf -o $(SHL2IMPLIBN) $(SHL2IMPLIBN:s/.lib/.a/) - -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" $(DEF2TARGETN): \ $(DEF2DEPN) \ @@ -598,12 +374,6 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -DEF3EXPORTFILE=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp -$(DEF3EXPORTFILE) : $(SHL3VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(DEF3EXPORTFILE)"=="" .ENDIF # "$(SHL3VERSIONMAP)"!="" @@ -725,112 +495,6 @@ $(DEF3TARGETN) .PHONY : @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" - -#21/02/2006 YD dll names must be 8.3, invoke fix script -#check osl/os2/module.c/osl_loadModule() -SHL3TARGET8=$(shell @fix_shl $(SHL3TARGETN:f)) - -DEF3FILTER=$(SOLARENV)/inc/dummy.flt -DEF3NAMELIST=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) - -.IF "$(link_always)"=="" -$(DEF3TARGETN) : \ - $(DEF3DEPN) \ - $(DEF3EXPORTFILE) -.ELSE # "$(link_always)"=="" -$(DEF3TARGETN) .PHONY : -.ENDIF # "$(link_always)"=="" - @+-$(RM) $@.tmpfile - @echo "Making: module definition file" $(@:f) - @echo LIBRARY $(SHL3TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile - @echo DATA MULTIPLE >>$@.tmpfile - @echo DESCRIPTION 'StarView 3.00 $(DEF3DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile - @echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - @echo _GetVersionInfo >$@.tmp_ord -.ENDIF - -.IF "$(DEFLIB3NAME)"!="" - @+echo $(SLB)/$(DEFLIB3NAME).lib - @+emxexpr $(DEF3NAMELIST) | fix_exp_file >> $@.tmp_ord -.ENDIF # "$(DEFLIB3NAME)"!="" - -.IF "$(DEF3EXPORT1)"!="" - @echo $(DEF3EXPORT1) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT2)"!="" - @echo $(DEF3EXPORT2) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT3)"!="" - @echo $(DEF3EXPORT3) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT4)"!="" - @echo $(DEF3EXPORT4) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT5)"!="" - @echo $(DEF3EXPORT5) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT6)"!="" - @echo $(DEF3EXPORT6) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT7)"!="" - @echo $(DEF3EXPORT7) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT8)"!="" - @echo $(DEF3EXPORT8) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT9)"!="" - @echo $(DEF3EXPORT9) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT10)"!="" - @echo $(DEF3EXPORT10) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT11)"!="" - @echo $(DEF3EXPORT11) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT12)"!="" - @echo $(DEF3EXPORT12) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT13)"!="" - @echo $(DEF3EXPORT13) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT14)"!="" - @echo $(DEF3EXPORT14) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT15)"!="" - @echo $(DEF3EXPORT15) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT16)"!="" - @echo $(DEF3EXPORT16) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT17)"!="" - @echo $(DEF3EXPORT17) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT18)"!="" - @echo $(DEF3EXPORT18) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT19)"!="" - @echo $(DEF3EXPORT19) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORT20)"!="" - @echo $(DEF3EXPORT20) >>$@.tmpfile -.ENDIF -.IF "$(DEF3EXPORTFILE)"!="" - @fix_def_file < $(DEF3EXPORTFILE) >> $@.tmp_ord -.ENDIF - @sort < $@.tmp_ord | uniq > $@.exptmpfile - @fix_def_ord < $@.exptmpfile >> $@.tmpfile - @+-$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@ - @+-$(RM) $@.tmp_ord - @+-$(RM) $@.exptmpfile - $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL3IMPLIBN:s/.lib/.a/) $@ - $(COMMAND_ECHO)+emxomf -o $(SHL3IMPLIBN) $(SHL3IMPLIBN:s/.lib/.a/) - -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" $(DEF3TARGETN): \ $(DEF3DEPN) \ @@ -879,12 +543,6 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -DEF4EXPORTFILE=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp -$(DEF4EXPORTFILE) : $(SHL4VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(DEF4EXPORTFILE)"=="" .ENDIF # "$(SHL4VERSIONMAP)"!="" @@ -1006,112 +664,6 @@ $(DEF4TARGETN) .PHONY : @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" - -#21/02/2006 YD dll names must be 8.3, invoke fix script -#check osl/os2/module.c/osl_loadModule() -SHL4TARGET8=$(shell @fix_shl $(SHL4TARGETN:f)) - -DEF4FILTER=$(SOLARENV)/inc/dummy.flt -DEF4NAMELIST=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) - -.IF "$(link_always)"=="" -$(DEF4TARGETN) : \ - $(DEF4DEPN) \ - $(DEF4EXPORTFILE) -.ELSE # "$(link_always)"=="" -$(DEF4TARGETN) .PHONY : -.ENDIF # "$(link_always)"=="" - @+-$(RM) $@.tmpfile - @echo "Making: module definition file" $(@:f) - @echo LIBRARY $(SHL4TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile - @echo DATA MULTIPLE >>$@.tmpfile - @echo DESCRIPTION 'StarView 3.00 $(DEF4DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile - @echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - @echo _GetVersionInfo >$@.tmp_ord -.ENDIF - -.IF "$(DEFLIB4NAME)"!="" - @+echo $(SLB)/$(DEFLIB4NAME).lib - @+emxexpr $(DEF4NAMELIST) | fix_exp_file >> $@.tmp_ord -.ENDIF # "$(DEFLIB4NAME)"!="" - -.IF "$(DEF4EXPORT1)"!="" - @echo $(DEF4EXPORT1) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT2)"!="" - @echo $(DEF4EXPORT2) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT3)"!="" - @echo $(DEF4EXPORT3) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT4)"!="" - @echo $(DEF4EXPORT4) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT5)"!="" - @echo $(DEF4EXPORT5) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT6)"!="" - @echo $(DEF4EXPORT6) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT7)"!="" - @echo $(DEF4EXPORT7) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT8)"!="" - @echo $(DEF4EXPORT8) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT9)"!="" - @echo $(DEF4EXPORT9) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT10)"!="" - @echo $(DEF4EXPORT10) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT11)"!="" - @echo $(DEF4EXPORT11) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT12)"!="" - @echo $(DEF4EXPORT12) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT13)"!="" - @echo $(DEF4EXPORT13) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT14)"!="" - @echo $(DEF4EXPORT14) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT15)"!="" - @echo $(DEF4EXPORT15) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT16)"!="" - @echo $(DEF4EXPORT16) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT17)"!="" - @echo $(DEF4EXPORT17) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT18)"!="" - @echo $(DEF4EXPORT18) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT19)"!="" - @echo $(DEF4EXPORT19) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORT20)"!="" - @echo $(DEF4EXPORT20) >>$@.tmpfile -.ENDIF -.IF "$(DEF4EXPORTFILE)"!="" - @fix_def_file < $(DEF4EXPORTFILE) >> $@.tmp_ord -.ENDIF - @sort < $@.tmp_ord | uniq > $@.exptmpfile - @fix_def_ord < $@.exptmpfile >> $@.tmpfile - @+-$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@ - @+-$(RM) $@.tmp_ord - @+-$(RM) $@.exptmpfile - $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL4IMPLIBN:s/.lib/.a/) $@ - $(COMMAND_ECHO)+emxomf -o $(SHL4IMPLIBN) $(SHL4IMPLIBN:s/.lib/.a/) - -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" $(DEF4TARGETN): \ $(DEF4DEPN) \ @@ -1160,12 +712,6 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -DEF5EXPORTFILE=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp -$(DEF5EXPORTFILE) : $(SHL5VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(DEF5EXPORTFILE)"=="" .ENDIF # "$(SHL5VERSIONMAP)"!="" @@ -1287,112 +833,6 @@ $(DEF5TARGETN) .PHONY : @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" - -#21/02/2006 YD dll names must be 8.3, invoke fix script -#check osl/os2/module.c/osl_loadModule() -SHL5TARGET8=$(shell @fix_shl $(SHL5TARGETN:f)) - -DEF5FILTER=$(SOLARENV)/inc/dummy.flt -DEF5NAMELIST=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) - -.IF "$(link_always)"=="" -$(DEF5TARGETN) : \ - $(DEF5DEPN) \ - $(DEF5EXPORTFILE) -.ELSE # "$(link_always)"=="" -$(DEF5TARGETN) .PHONY : -.ENDIF # "$(link_always)"=="" - @+-$(RM) $@.tmpfile - @echo "Making: module definition file" $(@:f) - @echo LIBRARY $(SHL5TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile - @echo DATA MULTIPLE >>$@.tmpfile - @echo DESCRIPTION 'StarView 3.00 $(DEF5DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile - @echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - @echo _GetVersionInfo >$@.tmp_ord -.ENDIF - -.IF "$(DEFLIB5NAME)"!="" - @+echo $(SLB)/$(DEFLIB5NAME).lib - @+emxexpr $(DEF5NAMELIST) | fix_exp_file >> $@.tmp_ord -.ENDIF # "$(DEFLIB5NAME)"!="" - -.IF "$(DEF5EXPORT1)"!="" - @echo $(DEF5EXPORT1) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT2)"!="" - @echo $(DEF5EXPORT2) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT3)"!="" - @echo $(DEF5EXPORT3) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT4)"!="" - @echo $(DEF5EXPORT4) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT5)"!="" - @echo $(DEF5EXPORT5) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT6)"!="" - @echo $(DEF5EXPORT6) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT7)"!="" - @echo $(DEF5EXPORT7) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT8)"!="" - @echo $(DEF5EXPORT8) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT9)"!="" - @echo $(DEF5EXPORT9) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT10)"!="" - @echo $(DEF5EXPORT10) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT11)"!="" - @echo $(DEF5EXPORT11) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT12)"!="" - @echo $(DEF5EXPORT12) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT13)"!="" - @echo $(DEF5EXPORT13) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT14)"!="" - @echo $(DEF5EXPORT14) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT15)"!="" - @echo $(DEF5EXPORT15) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT16)"!="" - @echo $(DEF5EXPORT16) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT17)"!="" - @echo $(DEF5EXPORT17) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT18)"!="" - @echo $(DEF5EXPORT18) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT19)"!="" - @echo $(DEF5EXPORT19) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORT20)"!="" - @echo $(DEF5EXPORT20) >>$@.tmpfile -.ENDIF -.IF "$(DEF5EXPORTFILE)"!="" - @fix_def_file < $(DEF5EXPORTFILE) >> $@.tmp_ord -.ENDIF - @sort < $@.tmp_ord | uniq > $@.exptmpfile - @fix_def_ord < $@.exptmpfile >> $@.tmpfile - @+-$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@ - @+-$(RM) $@.tmp_ord - @+-$(RM) $@.exptmpfile - $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL5IMPLIBN:s/.lib/.a/) $@ - $(COMMAND_ECHO)+emxomf -o $(SHL5IMPLIBN) $(SHL5IMPLIBN:s/.lib/.a/) - -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" $(DEF5TARGETN): \ $(DEF5DEPN) \ @@ -1441,12 +881,6 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -DEF6EXPORTFILE=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp -$(DEF6EXPORTFILE) : $(SHL6VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(DEF6EXPORTFILE)"=="" .ENDIF # "$(SHL6VERSIONMAP)"!="" @@ -1568,112 +1002,6 @@ $(DEF6TARGETN) .PHONY : @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" - -#21/02/2006 YD dll names must be 8.3, invoke fix script -#check osl/os2/module.c/osl_loadModule() -SHL6TARGET8=$(shell @fix_shl $(SHL6TARGETN:f)) - -DEF6FILTER=$(SOLARENV)/inc/dummy.flt -DEF6NAMELIST=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) - -.IF "$(link_always)"=="" -$(DEF6TARGETN) : \ - $(DEF6DEPN) \ - $(DEF6EXPORTFILE) -.ELSE # "$(link_always)"=="" -$(DEF6TARGETN) .PHONY : -.ENDIF # "$(link_always)"=="" - @+-$(RM) $@.tmpfile - @echo "Making: module definition file" $(@:f) - @echo LIBRARY $(SHL6TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile - @echo DATA MULTIPLE >>$@.tmpfile - @echo DESCRIPTION 'StarView 3.00 $(DEF6DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile - @echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - @echo _GetVersionInfo >$@.tmp_ord -.ENDIF - -.IF "$(DEFLIB6NAME)"!="" - @+echo $(SLB)/$(DEFLIB6NAME).lib - @+emxexpr $(DEF6NAMELIST) | fix_exp_file >> $@.tmp_ord -.ENDIF # "$(DEFLIB6NAME)"!="" - -.IF "$(DEF6EXPORT1)"!="" - @echo $(DEF6EXPORT1) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT2)"!="" - @echo $(DEF6EXPORT2) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT3)"!="" - @echo $(DEF6EXPORT3) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT4)"!="" - @echo $(DEF6EXPORT4) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT5)"!="" - @echo $(DEF6EXPORT5) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT6)"!="" - @echo $(DEF6EXPORT6) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT7)"!="" - @echo $(DEF6EXPORT7) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT8)"!="" - @echo $(DEF6EXPORT8) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT9)"!="" - @echo $(DEF6EXPORT9) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT10)"!="" - @echo $(DEF6EXPORT10) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT11)"!="" - @echo $(DEF6EXPORT11) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT12)"!="" - @echo $(DEF6EXPORT12) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT13)"!="" - @echo $(DEF6EXPORT13) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT14)"!="" - @echo $(DEF6EXPORT14) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT15)"!="" - @echo $(DEF6EXPORT15) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT16)"!="" - @echo $(DEF6EXPORT16) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT17)"!="" - @echo $(DEF6EXPORT17) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT18)"!="" - @echo $(DEF6EXPORT18) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT19)"!="" - @echo $(DEF6EXPORT19) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORT20)"!="" - @echo $(DEF6EXPORT20) >>$@.tmpfile -.ENDIF -.IF "$(DEF6EXPORTFILE)"!="" - @fix_def_file < $(DEF6EXPORTFILE) >> $@.tmp_ord -.ENDIF - @sort < $@.tmp_ord | uniq > $@.exptmpfile - @fix_def_ord < $@.exptmpfile >> $@.tmpfile - @+-$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@ - @+-$(RM) $@.tmp_ord - @+-$(RM) $@.exptmpfile - $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL6IMPLIBN:s/.lib/.a/) $@ - $(COMMAND_ECHO)+emxomf -o $(SHL6IMPLIBN) $(SHL6IMPLIBN:s/.lib/.a/) - -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" $(DEF6TARGETN): \ $(DEF6DEPN) \ @@ -1722,12 +1050,6 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -DEF7EXPORTFILE=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp -$(DEF7EXPORTFILE) : $(SHL7VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(DEF7EXPORTFILE)"=="" .ENDIF # "$(SHL7VERSIONMAP)"!="" @@ -1849,112 +1171,6 @@ $(DEF7TARGETN) .PHONY : @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" - -#21/02/2006 YD dll names must be 8.3, invoke fix script -#check osl/os2/module.c/osl_loadModule() -SHL7TARGET8=$(shell @fix_shl $(SHL7TARGETN:f)) - -DEF7FILTER=$(SOLARENV)/inc/dummy.flt -DEF7NAMELIST=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) - -.IF "$(link_always)"=="" -$(DEF7TARGETN) : \ - $(DEF7DEPN) \ - $(DEF7EXPORTFILE) -.ELSE # "$(link_always)"=="" -$(DEF7TARGETN) .PHONY : -.ENDIF # "$(link_always)"=="" - @+-$(RM) $@.tmpfile - @echo "Making: module definition file" $(@:f) - @echo LIBRARY $(SHL7TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile - @echo DATA MULTIPLE >>$@.tmpfile - @echo DESCRIPTION 'StarView 3.00 $(DEF7DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile - @echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - @echo _GetVersionInfo >$@.tmp_ord -.ENDIF - -.IF "$(DEFLIB7NAME)"!="" - @+echo $(SLB)/$(DEFLIB7NAME).lib - @+emxexpr $(DEF7NAMELIST) | fix_exp_file >> $@.tmp_ord -.ENDIF # "$(DEFLIB7NAME)"!="" - -.IF "$(DEF7EXPORT1)"!="" - @echo $(DEF7EXPORT1) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT2)"!="" - @echo $(DEF7EXPORT2) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT3)"!="" - @echo $(DEF7EXPORT3) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT4)"!="" - @echo $(DEF7EXPORT4) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT5)"!="" - @echo $(DEF7EXPORT5) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT6)"!="" - @echo $(DEF7EXPORT6) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT7)"!="" - @echo $(DEF7EXPORT7) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT8)"!="" - @echo $(DEF7EXPORT8) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT9)"!="" - @echo $(DEF7EXPORT9) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT10)"!="" - @echo $(DEF7EXPORT10) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT11)"!="" - @echo $(DEF7EXPORT11) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT12)"!="" - @echo $(DEF7EXPORT12) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT13)"!="" - @echo $(DEF7EXPORT13) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT14)"!="" - @echo $(DEF7EXPORT14) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT15)"!="" - @echo $(DEF7EXPORT15) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT16)"!="" - @echo $(DEF7EXPORT16) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT17)"!="" - @echo $(DEF7EXPORT17) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT18)"!="" - @echo $(DEF7EXPORT18) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT19)"!="" - @echo $(DEF7EXPORT19) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORT20)"!="" - @echo $(DEF7EXPORT20) >>$@.tmpfile -.ENDIF -.IF "$(DEF7EXPORTFILE)"!="" - @fix_def_file < $(DEF7EXPORTFILE) >> $@.tmp_ord -.ENDIF - @sort < $@.tmp_ord | uniq > $@.exptmpfile - @fix_def_ord < $@.exptmpfile >> $@.tmpfile - @+-$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@ - @+-$(RM) $@.tmp_ord - @+-$(RM) $@.exptmpfile - $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL7IMPLIBN:s/.lib/.a/) $@ - $(COMMAND_ECHO)+emxomf -o $(SHL7IMPLIBN) $(SHL7IMPLIBN:s/.lib/.a/) - -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" $(DEF7TARGETN): \ $(DEF7DEPN) \ @@ -2003,12 +1219,6 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -DEF8EXPORTFILE=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp -$(DEF8EXPORTFILE) : $(SHL8VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(DEF8EXPORTFILE)"=="" .ENDIF # "$(SHL8VERSIONMAP)"!="" @@ -2130,112 +1340,6 @@ $(DEF8TARGETN) .PHONY : @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" - -#21/02/2006 YD dll names must be 8.3, invoke fix script -#check osl/os2/module.c/osl_loadModule() -SHL8TARGET8=$(shell @fix_shl $(SHL8TARGETN:f)) - -DEF8FILTER=$(SOLARENV)/inc/dummy.flt -DEF8NAMELIST=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) - -.IF "$(link_always)"=="" -$(DEF8TARGETN) : \ - $(DEF8DEPN) \ - $(DEF8EXPORTFILE) -.ELSE # "$(link_always)"=="" -$(DEF8TARGETN) .PHONY : -.ENDIF # "$(link_always)"=="" - @+-$(RM) $@.tmpfile - @echo "Making: module definition file" $(@:f) - @echo LIBRARY $(SHL8TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile - @echo DATA MULTIPLE >>$@.tmpfile - @echo DESCRIPTION 'StarView 3.00 $(DEF8DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile - @echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - @echo _GetVersionInfo >$@.tmp_ord -.ENDIF - -.IF "$(DEFLIB8NAME)"!="" - @+echo $(SLB)/$(DEFLIB8NAME).lib - @+emxexpr $(DEF8NAMELIST) | fix_exp_file >> $@.tmp_ord -.ENDIF # "$(DEFLIB8NAME)"!="" - -.IF "$(DEF8EXPORT1)"!="" - @echo $(DEF8EXPORT1) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT2)"!="" - @echo $(DEF8EXPORT2) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT3)"!="" - @echo $(DEF8EXPORT3) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT4)"!="" - @echo $(DEF8EXPORT4) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT5)"!="" - @echo $(DEF8EXPORT5) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT6)"!="" - @echo $(DEF8EXPORT6) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT7)"!="" - @echo $(DEF8EXPORT7) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT8)"!="" - @echo $(DEF8EXPORT8) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT9)"!="" - @echo $(DEF8EXPORT9) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT10)"!="" - @echo $(DEF8EXPORT10) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT11)"!="" - @echo $(DEF8EXPORT11) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT12)"!="" - @echo $(DEF8EXPORT12) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT13)"!="" - @echo $(DEF8EXPORT13) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT14)"!="" - @echo $(DEF8EXPORT14) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT15)"!="" - @echo $(DEF8EXPORT15) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT16)"!="" - @echo $(DEF8EXPORT16) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT17)"!="" - @echo $(DEF8EXPORT17) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT18)"!="" - @echo $(DEF8EXPORT18) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT19)"!="" - @echo $(DEF8EXPORT19) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORT20)"!="" - @echo $(DEF8EXPORT20) >>$@.tmpfile -.ENDIF -.IF "$(DEF8EXPORTFILE)"!="" - @fix_def_file < $(DEF8EXPORTFILE) >> $@.tmp_ord -.ENDIF - @sort < $@.tmp_ord | uniq > $@.exptmpfile - @fix_def_ord < $@.exptmpfile >> $@.tmpfile - @+-$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@ - @+-$(RM) $@.tmp_ord - @+-$(RM) $@.exptmpfile - $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL8IMPLIBN:s/.lib/.a/) $@ - $(COMMAND_ECHO)+emxomf -o $(SHL8IMPLIBN) $(SHL8IMPLIBN:s/.lib/.a/) - -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" $(DEF8TARGETN): \ $(DEF8DEPN) \ @@ -2284,12 +1388,6 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -DEF9EXPORTFILE=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp -$(DEF9EXPORTFILE) : $(SHL9VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(DEF9EXPORTFILE)"=="" .ENDIF # "$(SHL9VERSIONMAP)"!="" @@ -2411,112 +1509,6 @@ $(DEF9TARGETN) .PHONY : @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" - -#21/02/2006 YD dll names must be 8.3, invoke fix script -#check osl/os2/module.c/osl_loadModule() -SHL9TARGET8=$(shell @fix_shl $(SHL9TARGETN:f)) - -DEF9FILTER=$(SOLARENV)/inc/dummy.flt -DEF9NAMELIST=$(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) - -.IF "$(link_always)"=="" -$(DEF9TARGETN) : \ - $(DEF9DEPN) \ - $(DEF9EXPORTFILE) -.ELSE # "$(link_always)"=="" -$(DEF9TARGETN) .PHONY : -.ENDIF # "$(link_always)"=="" - @+-$(RM) $@.tmpfile - @echo "Making: module definition file" $(@:f) - @echo LIBRARY $(SHL9TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile - @echo DATA MULTIPLE >>$@.tmpfile - @echo DESCRIPTION 'StarView 3.00 $(DEF9DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile - @echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - @echo _GetVersionInfo >$@.tmp_ord -.ENDIF - -.IF "$(DEFLIB9NAME)"!="" - @+echo $(SLB)/$(DEFLIB9NAME).lib - @+emxexpr $(DEF9NAMELIST) | fix_exp_file >> $@.tmp_ord -.ENDIF # "$(DEFLIB9NAME)"!="" - -.IF "$(DEF9EXPORT1)"!="" - @echo $(DEF9EXPORT1) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT2)"!="" - @echo $(DEF9EXPORT2) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT3)"!="" - @echo $(DEF9EXPORT3) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT4)"!="" - @echo $(DEF9EXPORT4) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT5)"!="" - @echo $(DEF9EXPORT5) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT6)"!="" - @echo $(DEF9EXPORT6) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT7)"!="" - @echo $(DEF9EXPORT7) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT8)"!="" - @echo $(DEF9EXPORT8) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT9)"!="" - @echo $(DEF9EXPORT9) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT10)"!="" - @echo $(DEF9EXPORT10) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT11)"!="" - @echo $(DEF9EXPORT11) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT12)"!="" - @echo $(DEF9EXPORT12) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT13)"!="" - @echo $(DEF9EXPORT13) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT14)"!="" - @echo $(DEF9EXPORT14) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT15)"!="" - @echo $(DEF9EXPORT15) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT16)"!="" - @echo $(DEF9EXPORT16) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT17)"!="" - @echo $(DEF9EXPORT17) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT18)"!="" - @echo $(DEF9EXPORT18) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT19)"!="" - @echo $(DEF9EXPORT19) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORT20)"!="" - @echo $(DEF9EXPORT20) >>$@.tmpfile -.ENDIF -.IF "$(DEF9EXPORTFILE)"!="" - @fix_def_file < $(DEF9EXPORTFILE) >> $@.tmp_ord -.ENDIF - @sort < $@.tmp_ord | uniq > $@.exptmpfile - @fix_def_ord < $@.exptmpfile >> $@.tmpfile - @+-$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@ - @+-$(RM) $@.tmp_ord - @+-$(RM) $@.exptmpfile - $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL9IMPLIBN:s/.lib/.a/) $@ - $(COMMAND_ECHO)+emxomf -o $(SHL9IMPLIBN) $(SHL9IMPLIBN:s/.lib/.a/) - -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" $(DEF9TARGETN): \ $(DEF9DEPN) \ @@ -2565,12 +1557,6 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -DEF10EXPORTFILE=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp -$(DEF10EXPORTFILE) : $(SHL10VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(DEF10EXPORTFILE)"=="" .ENDIF # "$(SHL10VERSIONMAP)"!="" @@ -2692,112 +1678,6 @@ $(DEF10TARGETN) .PHONY : @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" - -#21/02/2006 YD dll names must be 8.3, invoke fix script -#check osl/os2/module.c/osl_loadModule() -SHL10TARGET8=$(shell @fix_shl $(SHL10TARGETN:f)) - -DEF10FILTER=$(SOLARENV)/inc/dummy.flt -DEF10NAMELIST=$(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) - -.IF "$(link_always)"=="" -$(DEF10TARGETN) : \ - $(DEF10DEPN) \ - $(DEF10EXPORTFILE) -.ELSE # "$(link_always)"=="" -$(DEF10TARGETN) .PHONY : -.ENDIF # "$(link_always)"=="" - @+-$(RM) $@.tmpfile - @echo "Making: module definition file" $(@:f) - @echo LIBRARY $(SHL10TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile - @echo DATA MULTIPLE >>$@.tmpfile - @echo DESCRIPTION 'StarView 3.00 $(DEF10DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile - @echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - @echo _GetVersionInfo >$@.tmp_ord -.ENDIF - -.IF "$(DEFLIB10NAME)"!="" - @+echo $(SLB)/$(DEFLIB10NAME).lib - @+emxexpr $(DEF10NAMELIST) | fix_exp_file >> $@.tmp_ord -.ENDIF # "$(DEFLIB10NAME)"!="" - -.IF "$(DEF10EXPORT1)"!="" - @echo $(DEF10EXPORT1) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT2)"!="" - @echo $(DEF10EXPORT2) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT3)"!="" - @echo $(DEF10EXPORT3) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT4)"!="" - @echo $(DEF10EXPORT4) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT5)"!="" - @echo $(DEF10EXPORT5) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT6)"!="" - @echo $(DEF10EXPORT6) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT7)"!="" - @echo $(DEF10EXPORT7) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT8)"!="" - @echo $(DEF10EXPORT8) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT9)"!="" - @echo $(DEF10EXPORT9) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT10)"!="" - @echo $(DEF10EXPORT10) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT11)"!="" - @echo $(DEF10EXPORT11) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT12)"!="" - @echo $(DEF10EXPORT12) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT13)"!="" - @echo $(DEF10EXPORT13) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT14)"!="" - @echo $(DEF10EXPORT14) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT15)"!="" - @echo $(DEF10EXPORT15) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT16)"!="" - @echo $(DEF10EXPORT16) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT17)"!="" - @echo $(DEF10EXPORT17) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT18)"!="" - @echo $(DEF10EXPORT18) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT19)"!="" - @echo $(DEF10EXPORT19) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORT20)"!="" - @echo $(DEF10EXPORT20) >>$@.tmpfile -.ENDIF -.IF "$(DEF10EXPORTFILE)"!="" - @fix_def_file < $(DEF10EXPORTFILE) >> $@.tmp_ord -.ENDIF - @sort < $@.tmp_ord | uniq > $@.exptmpfile - @fix_def_ord < $@.exptmpfile >> $@.tmpfile - @+-$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@ - @+-$(RM) $@.tmp_ord - @+-$(RM) $@.exptmpfile - $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL10IMPLIBN:s/.lib/.a/) $@ - $(COMMAND_ECHO)+emxomf -o $(SHL10IMPLIBN) $(SHL10IMPLIBN:s/.lib/.a/) - -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" $(DEF10TARGETN): \ $(DEF10DEPN) \ diff --git a/solenv/inc/_tg_lib.mk b/solenv/inc/_tg_lib.mk index 35af2071409a..19db84c4601c 100644 --- a/solenv/inc/_tg_lib.mk +++ b/solenv/inc/_tg_lib.mk @@ -56,17 +56,6 @@ $(LIB1TARGET) : $(LIB1FILES) \ @nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF -.ELIF "$(GUI)"=="OS2" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB1FILES) $(LIB1OBJFILES) - @+-$(RM) $(@:s/.lib/.lin/) -.IF "$(LIB1OBJFILES)"!="" - @+$(TYPE) $(mktmp $(LIB1OBJFILES)) > $(null,$(LIB1OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) -.ENDIF # "$(LIB1OBJFILES)"!="" -.IF "$(LIB1FILES)"!="" - @-$(TYPE) $(foreach,i,$(LIB1FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) -.ENDIF # "$(LIB1FILES)"!="" - @+$(ECHONL) - .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -152,17 +141,6 @@ $(LIB2TARGET) : $(LIB2FILES) \ @nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF -.ELIF "$(GUI)"=="OS2" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB2FILES) $(LIB2OBJFILES) - @+-$(RM) $(@:s/.lib/.lin/) -.IF "$(LIB2OBJFILES)"!="" - @+$(TYPE) $(mktmp $(LIB2OBJFILES)) > $(null,$(LIB2OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) -.ENDIF # "$(LIB2OBJFILES)"!="" -.IF "$(LIB2FILES)"!="" - @-$(TYPE) $(foreach,i,$(LIB2FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) -.ENDIF # "$(LIB2FILES)"!="" - @+$(ECHONL) - .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -248,17 +226,6 @@ $(LIB3TARGET) : $(LIB3FILES) \ @nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF -.ELIF "$(GUI)"=="OS2" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB3FILES) $(LIB3OBJFILES) - @+-$(RM) $(@:s/.lib/.lin/) -.IF "$(LIB3OBJFILES)"!="" - @+$(TYPE) $(mktmp $(LIB3OBJFILES)) > $(null,$(LIB3OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) -.ENDIF # "$(LIB3OBJFILES)"!="" -.IF "$(LIB3FILES)"!="" - @-$(TYPE) $(foreach,i,$(LIB3FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) -.ENDIF # "$(LIB3FILES)"!="" - @+$(ECHONL) - .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -344,17 +311,6 @@ $(LIB4TARGET) : $(LIB4FILES) \ @nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF -.ELIF "$(GUI)"=="OS2" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB4FILES) $(LIB4OBJFILES) - @+-$(RM) $(@:s/.lib/.lin/) -.IF "$(LIB4OBJFILES)"!="" - @+$(TYPE) $(mktmp $(LIB4OBJFILES)) > $(null,$(LIB4OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) -.ENDIF # "$(LIB4OBJFILES)"!="" -.IF "$(LIB4FILES)"!="" - @-$(TYPE) $(foreach,i,$(LIB4FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) -.ENDIF # "$(LIB4FILES)"!="" - @+$(ECHONL) - .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -440,17 +396,6 @@ $(LIB5TARGET) : $(LIB5FILES) \ @nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF -.ELIF "$(GUI)"=="OS2" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB5FILES) $(LIB5OBJFILES) - @+-$(RM) $(@:s/.lib/.lin/) -.IF "$(LIB5OBJFILES)"!="" - @+$(TYPE) $(mktmp $(LIB5OBJFILES)) > $(null,$(LIB5OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) -.ENDIF # "$(LIB5OBJFILES)"!="" -.IF "$(LIB5FILES)"!="" - @-$(TYPE) $(foreach,i,$(LIB5FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) -.ENDIF # "$(LIB5FILES)"!="" - @+$(ECHONL) - .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -536,17 +481,6 @@ $(LIB6TARGET) : $(LIB6FILES) \ @nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF -.ELIF "$(GUI)"=="OS2" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB6FILES) $(LIB6OBJFILES) - @+-$(RM) $(@:s/.lib/.lin/) -.IF "$(LIB6OBJFILES)"!="" - @+$(TYPE) $(mktmp $(LIB6OBJFILES)) > $(null,$(LIB6OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) -.ENDIF # "$(LIB6OBJFILES)"!="" -.IF "$(LIB6FILES)"!="" - @-$(TYPE) $(foreach,i,$(LIB6FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) -.ENDIF # "$(LIB6FILES)"!="" - @+$(ECHONL) - .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -632,17 +566,6 @@ $(LIB7TARGET) : $(LIB7FILES) \ @nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF -.ELIF "$(GUI)"=="OS2" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB7FILES) $(LIB7OBJFILES) - @+-$(RM) $(@:s/.lib/.lin/) -.IF "$(LIB7OBJFILES)"!="" - @+$(TYPE) $(mktmp $(LIB7OBJFILES)) > $(null,$(LIB7OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) -.ENDIF # "$(LIB7OBJFILES)"!="" -.IF "$(LIB7FILES)"!="" - @-$(TYPE) $(foreach,i,$(LIB7FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) -.ENDIF # "$(LIB7FILES)"!="" - @+$(ECHONL) - .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -728,17 +651,6 @@ $(LIB8TARGET) : $(LIB8FILES) \ @nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF -.ELIF "$(GUI)"=="OS2" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB8FILES) $(LIB8OBJFILES) - @+-$(RM) $(@:s/.lib/.lin/) -.IF "$(LIB8OBJFILES)"!="" - @+$(TYPE) $(mktmp $(LIB8OBJFILES)) > $(null,$(LIB8OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) -.ENDIF # "$(LIB8OBJFILES)"!="" -.IF "$(LIB8FILES)"!="" - @-$(TYPE) $(foreach,i,$(LIB8FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) -.ENDIF # "$(LIB8FILES)"!="" - @+$(ECHONL) - .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -824,17 +736,6 @@ $(LIB9TARGET) : $(LIB9FILES) \ @nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF -.ELIF "$(GUI)"=="OS2" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB9FILES) $(LIB9OBJFILES) - @+-$(RM) $(@:s/.lib/.lin/) -.IF "$(LIB9OBJFILES)"!="" - @+$(TYPE) $(mktmp $(LIB9OBJFILES)) > $(null,$(LIB9OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) -.ENDIF # "$(LIB9OBJFILES)"!="" -.IF "$(LIB9FILES)"!="" - @-$(TYPE) $(foreach,i,$(LIB9FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) -.ENDIF # "$(LIB9FILES)"!="" - @+$(ECHONL) - .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -920,17 +821,6 @@ $(LIB10TARGET) : $(LIB10FILES) \ @nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF -.ELIF "$(GUI)"=="OS2" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB10FILES) $(LIB10OBJFILES) - @+-$(RM) $(@:s/.lib/.lin/) -.IF "$(LIB10OBJFILES)"!="" - @+$(TYPE) $(mktmp $(LIB10OBJFILES)) > $(null,$(LIB10OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) -.ENDIF # "$(LIB10OBJFILES)"!="" -.IF "$(LIB10FILES)"!="" - @-$(TYPE) $(foreach,i,$(LIB10FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) -.ENDIF # "$(LIB10FILES)"!="" - @+$(ECHONL) - .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index 5f58147fdff1..21f2a4f65c54 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -58,7 +58,7 @@ $(MISC)/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIO .ENDIF .IF "$(GUI)" != "UNX" -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" .IF "$(SHL1IMPLIB)" == "" SHL1IMPLIB=i$(TARGET)_t1 .ENDIF # "$(SHL1IMPLIB)" == "" @@ -71,7 +71,7 @@ ALLTAR : $(SHL1IMPLIBN) .IF "$(USE_DEFFILE)"=="" USE_1IMPLIB_DEPS=$(LB)/$(SHL1IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" -.ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.ENDIF # "$(GUI)" == "WNT" USE_SHL1DEF=$(SHL1DEF) .ELSE # "$(GUI)" != "UNX" USE_SHL1DEF= @@ -208,7 +208,7 @@ SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o #.IF "$(SHL1TARGETN)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL1LIBS)"!="" $(MISC)/$(SHL1TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -221,7 +221,7 @@ $(SHL1TARGETN) : $(LINKINCTARGETS) .ELSE .IF "$(SHL1USE_EXPORTS)"=="name" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" .IF "$(SHL1LIBS)"!="" SHL1LINKLIST=$(MISC)/$(SHL1TARGET)_link.lst @@ -238,20 +238,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() -SHL1TARGET8=$(shell @fix_shl $(SHL1TARGET)) -.ENDIF - -.IF "$(GUI)" == "OS2" -_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL1STDLIBS:^"$(LB)/") -SHL1IMP_ORD = $(foreach,i,$(_SHL1IMP_ORD) $(shell @-ls $i)) -.ELSE -SHL1IMP_ORD = -.ENDIF - - $(SHL1TARGETN) : \ $(SHL1OBJS)\ $(SHL1LIBS)\ @@ -260,7 +246,6 @@ $(SHL1TARGETN) : \ $(USE_SHL1VERSIONMAP)\ $(SHL1RES)\ $(SHL1DEPN) \ - $(SHL1IMP_ORD) \ $(SHL1LINKLIST) @echo "Making: " $(@:f) .IF "$(GUI)" == "WNT" @@ -480,65 +465,6 @@ $(SHL1TARGETN) : \ .ENDIF .ENDIF # "$(GUI)" == "UNX" -.IF "$(GUI)" == "OS2" - -.IF "$(SHL1DEFAULTRES)"!="" - @+-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc >& $(NULLDEV) -.IF "$(SHL1ICON)" != "" - @-+echo 1 ICON $(SHL1ICON) >> $(MISC)/$(SHL1DEFAULTRES:b).rc -.ENDIF -.IF "$(use_shl_versions)" != "" -.IF "$(SHL1ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc -.ENDIF # "$(SHL1ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL1DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL1DEFAULTRES: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)/$(SHL1DEFAULTRES:b).rc -.ENDIF # "$(SHL1DEFAULTRES)"!="" - -.IF "$(SHL1ALLRES)"!="" - $(COMMAND_ECHO)+$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES) -.ENDIF # "$(SHL1ALLRES)"!="" - -.IF "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL1LINKER) $(SHL1LINKFLAGS) $(LINKFLAGSSHL) -o $@ \ - $(SHL1DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL1OBJS) $(SHL1VERSIONOBJ) \ - $(SHL1LIBS) \ - $(SHL1STDLIBS:^"-l") \ - $(SHL1LINKRES) \ - $(SHL1STDSHL:^"-l") $(STDSHL1:^"-l") - -.ELSE # "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL1LINKER) -v $(SHL1LINKFLAGS) \ - $(LINKFLAGSSHL) $(SHL1BASEX) \ - $(SHL1STACK) -o $(SHL1TARGETN) \ - $(SHL1DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL1OBJS) $(SHL1VERSIONOBJ) \ - $(SHL1LIBS) \ - $(SHL1STDLIBS:^"-l") \ - $(SHL1LINKRES) \ - $(SHL1STDSHL:^"-l") $(STDSHL1:^"-l") \ - @$(LS) $@ >& $(NULLDEV) - -.ENDIF # "$(USE_DEFFILE)"!="" - -.IF "$(SHL1TARGET8)" != "$(SHL1TARGET)" - $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL1TARGET8).dll -.ENDIF - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(SHL1TARGETN)"!="" # unroll begin @@ -601,7 +527,7 @@ $(MISC)/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIO .ENDIF .IF "$(GUI)" != "UNX" -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" .IF "$(SHL2IMPLIB)" == "" SHL2IMPLIB=i$(TARGET)_t2 .ENDIF # "$(SHL2IMPLIB)" == "" @@ -614,7 +540,7 @@ ALLTAR : $(SHL2IMPLIBN) .IF "$(USE_DEFFILE)"=="" USE_2IMPLIB_DEPS=$(LB)/$(SHL2IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" -.ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.ENDIF # "$(GUI)" == "WNT" USE_SHL2DEF=$(SHL2DEF) .ELSE # "$(GUI)" != "UNX" USE_SHL2DEF= @@ -751,7 +677,7 @@ SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o #.IF "$(SHL2TARGETN)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL2LIBS)"!="" $(MISC)/$(SHL2TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -764,7 +690,7 @@ $(SHL2TARGETN) : $(LINKINCTARGETS) .ELSE .IF "$(SHL2USE_EXPORTS)"=="name" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" .IF "$(SHL2LIBS)"!="" SHL2LINKLIST=$(MISC)/$(SHL2TARGET)_link.lst @@ -781,20 +707,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() -SHL2TARGET8=$(shell @fix_shl $(SHL2TARGET)) -.ENDIF - -.IF "$(GUI)" == "OS2" -_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL2STDLIBS:^"$(LB)/") -SHL2IMP_ORD = $(foreach,i,$(_SHL2IMP_ORD) $(shell @-ls $i)) -.ELSE -SHL2IMP_ORD = -.ENDIF - - $(SHL2TARGETN) : \ $(SHL2OBJS)\ $(SHL2LIBS)\ @@ -803,7 +715,6 @@ $(SHL2TARGETN) : \ $(USE_SHL2VERSIONMAP)\ $(SHL2RES)\ $(SHL2DEPN) \ - $(SHL2IMP_ORD) \ $(SHL2LINKLIST) @echo "Making: " $(@:f) .IF "$(GUI)" == "WNT" @@ -1023,65 +934,6 @@ $(SHL2TARGETN) : \ .ENDIF .ENDIF # "$(GUI)" == "UNX" -.IF "$(GUI)" == "OS2" - -.IF "$(SHL2DEFAULTRES)"!="" - @+-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc >& $(NULLDEV) -.IF "$(SHL2ICON)" != "" - @-+echo 1 ICON $(SHL2ICON) >> $(MISC)/$(SHL2DEFAULTRES:b).rc -.ENDIF -.IF "$(use_shl_versions)" != "" -.IF "$(SHL2ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc -.ENDIF # "$(SHL2ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL2DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL2DEFAULTRES: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)/$(SHL2DEFAULTRES:b).rc -.ENDIF # "$(SHL2DEFAULTRES)"!="" - -.IF "$(SHL2ALLRES)"!="" - $(COMMAND_ECHO)+$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES) -.ENDIF # "$(SHL2ALLRES)"!="" - -.IF "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL2LINKER) $(SHL2LINKFLAGS) $(LINKFLAGSSHL) -o $@ \ - $(SHL2DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL2OBJS) $(SHL2VERSIONOBJ) \ - $(SHL2LIBS) \ - $(SHL2STDLIBS:^"-l") \ - $(SHL2LINKRES) \ - $(SHL2STDSHL:^"-l") $(STDSHL2:^"-l") - -.ELSE # "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL2LINKER) -v $(SHL2LINKFLAGS) \ - $(LINKFLAGSSHL) $(SHL2BASEX) \ - $(SHL2STACK) -o $(SHL2TARGETN) \ - $(SHL2DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL2OBJS) $(SHL2VERSIONOBJ) \ - $(SHL2LIBS) \ - $(SHL2STDLIBS:^"-l") \ - $(SHL2LINKRES) \ - $(SHL2STDSHL:^"-l") $(STDSHL2:^"-l") \ - @$(LS) $@ >& $(NULLDEV) - -.ENDIF # "$(USE_DEFFILE)"!="" - -.IF "$(SHL2TARGET8)" != "$(SHL2TARGET)" - $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL2TARGET8).dll -.ENDIF - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(SHL2TARGETN)"!="" # unroll begin @@ -1144,7 +996,7 @@ $(MISC)/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL3VERSIO .ENDIF .IF "$(GUI)" != "UNX" -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" .IF "$(SHL3IMPLIB)" == "" SHL3IMPLIB=i$(TARGET)_t3 .ENDIF # "$(SHL3IMPLIB)" == "" @@ -1157,7 +1009,7 @@ ALLTAR : $(SHL3IMPLIBN) .IF "$(USE_DEFFILE)"=="" USE_3IMPLIB_DEPS=$(LB)/$(SHL3IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" -.ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.ENDIF # "$(GUI)" == "WNT" USE_SHL3DEF=$(SHL3DEF) .ELSE # "$(GUI)" != "UNX" USE_SHL3DEF= @@ -1294,7 +1146,7 @@ SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o #.IF "$(SHL3TARGETN)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL3LIBS)"!="" $(MISC)/$(SHL3TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -1307,7 +1159,7 @@ $(SHL3TARGETN) : $(LINKINCTARGETS) .ELSE .IF "$(SHL3USE_EXPORTS)"=="name" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" .IF "$(SHL3LIBS)"!="" SHL3LINKLIST=$(MISC)/$(SHL3TARGET)_link.lst @@ -1324,20 +1176,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() -SHL3TARGET8=$(shell @fix_shl $(SHL3TARGET)) -.ENDIF - -.IF "$(GUI)" == "OS2" -_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL3STDLIBS:^"$(LB)/") -SHL3IMP_ORD = $(foreach,i,$(_SHL3IMP_ORD) $(shell @-ls $i)) -.ELSE -SHL3IMP_ORD = -.ENDIF - - $(SHL3TARGETN) : \ $(SHL3OBJS)\ $(SHL3LIBS)\ @@ -1346,7 +1184,6 @@ $(SHL3TARGETN) : \ $(USE_SHL3VERSIONMAP)\ $(SHL3RES)\ $(SHL3DEPN) \ - $(SHL3IMP_ORD) \ $(SHL3LINKLIST) @echo "Making: " $(@:f) .IF "$(GUI)" == "WNT" @@ -1566,65 +1403,6 @@ $(SHL3TARGETN) : \ .ENDIF .ENDIF # "$(GUI)" == "UNX" -.IF "$(GUI)" == "OS2" - -.IF "$(SHL3DEFAULTRES)"!="" - @+-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc >& $(NULLDEV) -.IF "$(SHL3ICON)" != "" - @-+echo 1 ICON $(SHL3ICON) >> $(MISC)/$(SHL3DEFAULTRES:b).rc -.ENDIF -.IF "$(use_shl_versions)" != "" -.IF "$(SHL3ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc -.ENDIF # "$(SHL3ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL3DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL3DEFAULTRES: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)/$(SHL3DEFAULTRES:b).rc -.ENDIF # "$(SHL3DEFAULTRES)"!="" - -.IF "$(SHL3ALLRES)"!="" - $(COMMAND_ECHO)+$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES) -.ENDIF # "$(SHL3ALLRES)"!="" - -.IF "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL3LINKER) $(SHL3LINKFLAGS) $(LINKFLAGSSHL) -o $@ \ - $(SHL3DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL3OBJS) $(SHL3VERSIONOBJ) \ - $(SHL3LIBS) \ - $(SHL3STDLIBS:^"-l") \ - $(SHL3LINKRES) \ - $(SHL3STDSHL:^"-l") $(STDSHL3:^"-l") - -.ELSE # "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL3LINKER) -v $(SHL3LINKFLAGS) \ - $(LINKFLAGSSHL) $(SHL3BASEX) \ - $(SHL3STACK) -o $(SHL3TARGETN) \ - $(SHL3DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL3OBJS) $(SHL3VERSIONOBJ) \ - $(SHL3LIBS) \ - $(SHL3STDLIBS:^"-l") \ - $(SHL3LINKRES) \ - $(SHL3STDSHL:^"-l") $(STDSHL3:^"-l") \ - @$(LS) $@ >& $(NULLDEV) - -.ENDIF # "$(USE_DEFFILE)"!="" - -.IF "$(SHL3TARGET8)" != "$(SHL3TARGET)" - $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL3TARGET8).dll -.ENDIF - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(SHL3TARGETN)"!="" # unroll begin @@ -1687,7 +1465,7 @@ $(MISC)/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL4VERSIO .ENDIF .IF "$(GUI)" != "UNX" -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" .IF "$(SHL4IMPLIB)" == "" SHL4IMPLIB=i$(TARGET)_t4 .ENDIF # "$(SHL4IMPLIB)" == "" @@ -1700,7 +1478,7 @@ ALLTAR : $(SHL4IMPLIBN) .IF "$(USE_DEFFILE)"=="" USE_4IMPLIB_DEPS=$(LB)/$(SHL4IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" -.ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.ENDIF # "$(GUI)" == "WNT" USE_SHL4DEF=$(SHL4DEF) .ELSE # "$(GUI)" != "UNX" USE_SHL4DEF= @@ -1837,7 +1615,7 @@ SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o #.IF "$(SHL4TARGETN)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL4LIBS)"!="" $(MISC)/$(SHL4TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -1850,7 +1628,7 @@ $(SHL4TARGETN) : $(LINKINCTARGETS) .ELSE .IF "$(SHL4USE_EXPORTS)"=="name" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" .IF "$(SHL4LIBS)"!="" SHL4LINKLIST=$(MISC)/$(SHL4TARGET)_link.lst @@ -1867,20 +1645,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() -SHL4TARGET8=$(shell @fix_shl $(SHL4TARGET)) -.ENDIF - -.IF "$(GUI)" == "OS2" -_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL4STDLIBS:^"$(LB)/") -SHL4IMP_ORD = $(foreach,i,$(_SHL4IMP_ORD) $(shell @-ls $i)) -.ELSE -SHL4IMP_ORD = -.ENDIF - - $(SHL4TARGETN) : \ $(SHL4OBJS)\ $(SHL4LIBS)\ @@ -1889,7 +1653,6 @@ $(SHL4TARGETN) : \ $(USE_SHL4VERSIONMAP)\ $(SHL4RES)\ $(SHL4DEPN) \ - $(SHL4IMP_ORD) \ $(SHL4LINKLIST) @echo "Making: " $(@:f) .IF "$(GUI)" == "WNT" @@ -2109,65 +1872,6 @@ $(SHL4TARGETN) : \ .ENDIF .ENDIF # "$(GUI)" == "UNX" -.IF "$(GUI)" == "OS2" - -.IF "$(SHL4DEFAULTRES)"!="" - @+-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc >& $(NULLDEV) -.IF "$(SHL4ICON)" != "" - @-+echo 1 ICON $(SHL4ICON) >> $(MISC)/$(SHL4DEFAULTRES:b).rc -.ENDIF -.IF "$(use_shl_versions)" != "" -.IF "$(SHL4ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc -.ENDIF # "$(SHL4ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL4DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL4DEFAULTRES: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)/$(SHL4DEFAULTRES:b).rc -.ENDIF # "$(SHL4DEFAULTRES)"!="" - -.IF "$(SHL4ALLRES)"!="" - $(COMMAND_ECHO)+$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES) -.ENDIF # "$(SHL4ALLRES)"!="" - -.IF "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL4LINKER) $(SHL4LINKFLAGS) $(LINKFLAGSSHL) -o $@ \ - $(SHL4DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL4OBJS) $(SHL4VERSIONOBJ) \ - $(SHL4LIBS) \ - $(SHL4STDLIBS:^"-l") \ - $(SHL4LINKRES) \ - $(SHL4STDSHL:^"-l") $(STDSHL4:^"-l") - -.ELSE # "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL4LINKER) -v $(SHL4LINKFLAGS) \ - $(LINKFLAGSSHL) $(SHL4BASEX) \ - $(SHL4STACK) -o $(SHL4TARGETN) \ - $(SHL4DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL4OBJS) $(SHL4VERSIONOBJ) \ - $(SHL4LIBS) \ - $(SHL4STDLIBS:^"-l") \ - $(SHL4LINKRES) \ - $(SHL4STDSHL:^"-l") $(STDSHL4:^"-l") \ - @$(LS) $@ >& $(NULLDEV) - -.ENDIF # "$(USE_DEFFILE)"!="" - -.IF "$(SHL4TARGET8)" != "$(SHL4TARGET)" - $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL4TARGET8).dll -.ENDIF - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(SHL4TARGETN)"!="" # unroll begin @@ -2230,7 +1934,7 @@ $(MISC)/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL5VERSIO .ENDIF .IF "$(GUI)" != "UNX" -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" .IF "$(SHL5IMPLIB)" == "" SHL5IMPLIB=i$(TARGET)_t5 .ENDIF # "$(SHL5IMPLIB)" == "" @@ -2243,7 +1947,7 @@ ALLTAR : $(SHL5IMPLIBN) .IF "$(USE_DEFFILE)"=="" USE_5IMPLIB_DEPS=$(LB)/$(SHL5IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" -.ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.ENDIF # "$(GUI)" == "WNT" USE_SHL5DEF=$(SHL5DEF) .ELSE # "$(GUI)" != "UNX" USE_SHL5DEF= @@ -2380,7 +2084,7 @@ SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o #.IF "$(SHL5TARGETN)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL5LIBS)"!="" $(MISC)/$(SHL5TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -2393,7 +2097,7 @@ $(SHL5TARGETN) : $(LINKINCTARGETS) .ELSE .IF "$(SHL5USE_EXPORTS)"=="name" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" .IF "$(SHL5LIBS)"!="" SHL5LINKLIST=$(MISC)/$(SHL5TARGET)_link.lst @@ -2410,20 +2114,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() -SHL5TARGET8=$(shell @fix_shl $(SHL5TARGET)) -.ENDIF - -.IF "$(GUI)" == "OS2" -_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL5STDLIBS:^"$(LB)/") -SHL5IMP_ORD = $(foreach,i,$(_SHL5IMP_ORD) $(shell @-ls $i)) -.ELSE -SHL5IMP_ORD = -.ENDIF - - $(SHL5TARGETN) : \ $(SHL5OBJS)\ $(SHL5LIBS)\ @@ -2432,7 +2122,6 @@ $(SHL5TARGETN) : \ $(USE_SHL5VERSIONMAP)\ $(SHL5RES)\ $(SHL5DEPN) \ - $(SHL5IMP_ORD) \ $(SHL5LINKLIST) @echo "Making: " $(@:f) .IF "$(GUI)" == "WNT" @@ -2652,65 +2341,6 @@ $(SHL5TARGETN) : \ .ENDIF .ENDIF # "$(GUI)" == "UNX" -.IF "$(GUI)" == "OS2" - -.IF "$(SHL5DEFAULTRES)"!="" - @+-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc >& $(NULLDEV) -.IF "$(SHL5ICON)" != "" - @-+echo 1 ICON $(SHL5ICON) >> $(MISC)/$(SHL5DEFAULTRES:b).rc -.ENDIF -.IF "$(use_shl_versions)" != "" -.IF "$(SHL5ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc -.ENDIF # "$(SHL5ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL5DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL5DEFAULTRES: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)/$(SHL5DEFAULTRES:b).rc -.ENDIF # "$(SHL5DEFAULTRES)"!="" - -.IF "$(SHL5ALLRES)"!="" - $(COMMAND_ECHO)+$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES) -.ENDIF # "$(SHL5ALLRES)"!="" - -.IF "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL5LINKER) $(SHL5LINKFLAGS) $(LINKFLAGSSHL) -o $@ \ - $(SHL5DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL5OBJS) $(SHL5VERSIONOBJ) \ - $(SHL5LIBS) \ - $(SHL5STDLIBS:^"-l") \ - $(SHL5LINKRES) \ - $(SHL5STDSHL:^"-l") $(STDSHL5:^"-l") - -.ELSE # "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL5LINKER) -v $(SHL5LINKFLAGS) \ - $(LINKFLAGSSHL) $(SHL5BASEX) \ - $(SHL5STACK) -o $(SHL5TARGETN) \ - $(SHL5DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL5OBJS) $(SHL5VERSIONOBJ) \ - $(SHL5LIBS) \ - $(SHL5STDLIBS:^"-l") \ - $(SHL5LINKRES) \ - $(SHL5STDSHL:^"-l") $(STDSHL5:^"-l") \ - @$(LS) $@ >& $(NULLDEV) - -.ENDIF # "$(USE_DEFFILE)"!="" - -.IF "$(SHL5TARGET8)" != "$(SHL5TARGET)" - $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL5TARGET8).dll -.ENDIF - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(SHL5TARGETN)"!="" # unroll begin @@ -2773,7 +2403,7 @@ $(MISC)/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL6VERSIO .ENDIF .IF "$(GUI)" != "UNX" -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" .IF "$(SHL6IMPLIB)" == "" SHL6IMPLIB=i$(TARGET)_t6 .ENDIF # "$(SHL6IMPLIB)" == "" @@ -2786,7 +2416,7 @@ ALLTAR : $(SHL6IMPLIBN) .IF "$(USE_DEFFILE)"=="" USE_6IMPLIB_DEPS=$(LB)/$(SHL6IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" -.ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.ENDIF # "$(GUI)" == "WNT" USE_SHL6DEF=$(SHL6DEF) .ELSE # "$(GUI)" != "UNX" USE_SHL6DEF= @@ -2923,7 +2553,7 @@ SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o #.IF "$(SHL6TARGETN)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL6LIBS)"!="" $(MISC)/$(SHL6TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -2936,7 +2566,7 @@ $(SHL6TARGETN) : $(LINKINCTARGETS) .ELSE .IF "$(SHL6USE_EXPORTS)"=="name" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" .IF "$(SHL6LIBS)"!="" SHL6LINKLIST=$(MISC)/$(SHL6TARGET)_link.lst @@ -2953,20 +2583,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() -SHL6TARGET8=$(shell @fix_shl $(SHL6TARGET)) -.ENDIF - -.IF "$(GUI)" == "OS2" -_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL6STDLIBS:^"$(LB)/") -SHL6IMP_ORD = $(foreach,i,$(_SHL6IMP_ORD) $(shell @-ls $i)) -.ELSE -SHL6IMP_ORD = -.ENDIF - - $(SHL6TARGETN) : \ $(SHL6OBJS)\ $(SHL6LIBS)\ @@ -2975,7 +2591,6 @@ $(SHL6TARGETN) : \ $(USE_SHL6VERSIONMAP)\ $(SHL6RES)\ $(SHL6DEPN) \ - $(SHL6IMP_ORD) \ $(SHL6LINKLIST) @echo "Making: " $(@:f) .IF "$(GUI)" == "WNT" @@ -3195,65 +2810,6 @@ $(SHL6TARGETN) : \ .ENDIF .ENDIF # "$(GUI)" == "UNX" -.IF "$(GUI)" == "OS2" - -.IF "$(SHL6DEFAULTRES)"!="" - @+-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc >& $(NULLDEV) -.IF "$(SHL6ICON)" != "" - @-+echo 1 ICON $(SHL6ICON) >> $(MISC)/$(SHL6DEFAULTRES:b).rc -.ENDIF -.IF "$(use_shl_versions)" != "" -.IF "$(SHL6ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc -.ENDIF # "$(SHL6ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL6DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL6DEFAULTRES: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)/$(SHL6DEFAULTRES:b).rc -.ENDIF # "$(SHL6DEFAULTRES)"!="" - -.IF "$(SHL6ALLRES)"!="" - $(COMMAND_ECHO)+$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES) -.ENDIF # "$(SHL6ALLRES)"!="" - -.IF "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL6LINKER) $(SHL6LINKFLAGS) $(LINKFLAGSSHL) -o $@ \ - $(SHL6DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL6OBJS) $(SHL6VERSIONOBJ) \ - $(SHL6LIBS) \ - $(SHL6STDLIBS:^"-l") \ - $(SHL6LINKRES) \ - $(SHL6STDSHL:^"-l") $(STDSHL6:^"-l") - -.ELSE # "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL6LINKER) -v $(SHL6LINKFLAGS) \ - $(LINKFLAGSSHL) $(SHL6BASEX) \ - $(SHL6STACK) -o $(SHL6TARGETN) \ - $(SHL6DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL6OBJS) $(SHL6VERSIONOBJ) \ - $(SHL6LIBS) \ - $(SHL6STDLIBS:^"-l") \ - $(SHL6LINKRES) \ - $(SHL6STDSHL:^"-l") $(STDSHL6:^"-l") \ - @$(LS) $@ >& $(NULLDEV) - -.ENDIF # "$(USE_DEFFILE)"!="" - -.IF "$(SHL6TARGET8)" != "$(SHL6TARGET)" - $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL6TARGET8).dll -.ENDIF - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(SHL6TARGETN)"!="" # unroll begin @@ -3316,7 +2872,7 @@ $(MISC)/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL7VERSIO .ENDIF .IF "$(GUI)" != "UNX" -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" .IF "$(SHL7IMPLIB)" == "" SHL7IMPLIB=i$(TARGET)_t7 .ENDIF # "$(SHL7IMPLIB)" == "" @@ -3329,7 +2885,7 @@ ALLTAR : $(SHL7IMPLIBN) .IF "$(USE_DEFFILE)"=="" USE_7IMPLIB_DEPS=$(LB)/$(SHL7IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" -.ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.ENDIF # "$(GUI)" == "WNT" USE_SHL7DEF=$(SHL7DEF) .ELSE # "$(GUI)" != "UNX" USE_SHL7DEF= @@ -3466,7 +3022,7 @@ SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o #.IF "$(SHL7TARGETN)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL7LIBS)"!="" $(MISC)/$(SHL7TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -3479,7 +3035,7 @@ $(SHL7TARGETN) : $(LINKINCTARGETS) .ELSE .IF "$(SHL7USE_EXPORTS)"=="name" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" .IF "$(SHL7LIBS)"!="" SHL7LINKLIST=$(MISC)/$(SHL7TARGET)_link.lst @@ -3496,20 +3052,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() -SHL7TARGET8=$(shell @fix_shl $(SHL7TARGET)) -.ENDIF - -.IF "$(GUI)" == "OS2" -_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL7STDLIBS:^"$(LB)/") -SHL7IMP_ORD = $(foreach,i,$(_SHL7IMP_ORD) $(shell @-ls $i)) -.ELSE -SHL7IMP_ORD = -.ENDIF - - $(SHL7TARGETN) : \ $(SHL7OBJS)\ $(SHL7LIBS)\ @@ -3518,7 +3060,6 @@ $(SHL7TARGETN) : \ $(USE_SHL7VERSIONMAP)\ $(SHL7RES)\ $(SHL7DEPN) \ - $(SHL7IMP_ORD) \ $(SHL7LINKLIST) @echo "Making: " $(@:f) .IF "$(GUI)" == "WNT" @@ -3738,65 +3279,6 @@ $(SHL7TARGETN) : \ .ENDIF .ENDIF # "$(GUI)" == "UNX" -.IF "$(GUI)" == "OS2" - -.IF "$(SHL7DEFAULTRES)"!="" - @+-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc >& $(NULLDEV) -.IF "$(SHL7ICON)" != "" - @-+echo 1 ICON $(SHL7ICON) >> $(MISC)/$(SHL7DEFAULTRES:b).rc -.ENDIF -.IF "$(use_shl_versions)" != "" -.IF "$(SHL7ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc -.ENDIF # "$(SHL7ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL7DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL7DEFAULTRES: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)/$(SHL7DEFAULTRES:b).rc -.ENDIF # "$(SHL7DEFAULTRES)"!="" - -.IF "$(SHL7ALLRES)"!="" - $(COMMAND_ECHO)+$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES) -.ENDIF # "$(SHL7ALLRES)"!="" - -.IF "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL7LINKER) $(SHL7LINKFLAGS) $(LINKFLAGSSHL) -o $@ \ - $(SHL7DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL7OBJS) $(SHL7VERSIONOBJ) \ - $(SHL7LIBS) \ - $(SHL7STDLIBS:^"-l") \ - $(SHL7LINKRES) \ - $(SHL7STDSHL:^"-l") $(STDSHL7:^"-l") - -.ELSE # "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL7LINKER) -v $(SHL7LINKFLAGS) \ - $(LINKFLAGSSHL) $(SHL7BASEX) \ - $(SHL7STACK) -o $(SHL7TARGETN) \ - $(SHL7DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL7OBJS) $(SHL7VERSIONOBJ) \ - $(SHL7LIBS) \ - $(SHL7STDLIBS:^"-l") \ - $(SHL7LINKRES) \ - $(SHL7STDSHL:^"-l") $(STDSHL7:^"-l") \ - @$(LS) $@ >& $(NULLDEV) - -.ENDIF # "$(USE_DEFFILE)"!="" - -.IF "$(SHL7TARGET8)" != "$(SHL7TARGET)" - $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL7TARGET8).dll -.ENDIF - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(SHL7TARGETN)"!="" # unroll begin @@ -3859,7 +3341,7 @@ $(MISC)/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL8VERSIO .ENDIF .IF "$(GUI)" != "UNX" -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" .IF "$(SHL8IMPLIB)" == "" SHL8IMPLIB=i$(TARGET)_t8 .ENDIF # "$(SHL8IMPLIB)" == "" @@ -3872,7 +3354,7 @@ ALLTAR : $(SHL8IMPLIBN) .IF "$(USE_DEFFILE)"=="" USE_8IMPLIB_DEPS=$(LB)/$(SHL8IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" -.ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.ENDIF # "$(GUI)" == "WNT" USE_SHL8DEF=$(SHL8DEF) .ELSE # "$(GUI)" != "UNX" USE_SHL8DEF= @@ -4009,7 +3491,7 @@ SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o #.IF "$(SHL8TARGETN)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL8LIBS)"!="" $(MISC)/$(SHL8TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -4022,7 +3504,7 @@ $(SHL8TARGETN) : $(LINKINCTARGETS) .ELSE .IF "$(SHL8USE_EXPORTS)"=="name" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" .IF "$(SHL8LIBS)"!="" SHL8LINKLIST=$(MISC)/$(SHL8TARGET)_link.lst @@ -4039,20 +3521,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() -SHL8TARGET8=$(shell @fix_shl $(SHL8TARGET)) -.ENDIF - -.IF "$(GUI)" == "OS2" -_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL8STDLIBS:^"$(LB)/") -SHL8IMP_ORD = $(foreach,i,$(_SHL8IMP_ORD) $(shell @-ls $i)) -.ELSE -SHL8IMP_ORD = -.ENDIF - - $(SHL8TARGETN) : \ $(SHL8OBJS)\ $(SHL8LIBS)\ @@ -4061,7 +3529,6 @@ $(SHL8TARGETN) : \ $(USE_SHL8VERSIONMAP)\ $(SHL8RES)\ $(SHL8DEPN) \ - $(SHL8IMP_ORD) \ $(SHL8LINKLIST) @echo "Making: " $(@:f) .IF "$(GUI)" == "WNT" @@ -4281,65 +3748,6 @@ $(SHL8TARGETN) : \ .ENDIF .ENDIF # "$(GUI)" == "UNX" -.IF "$(GUI)" == "OS2" - -.IF "$(SHL8DEFAULTRES)"!="" - @+-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc >& $(NULLDEV) -.IF "$(SHL8ICON)" != "" - @-+echo 1 ICON $(SHL8ICON) >> $(MISC)/$(SHL8DEFAULTRES:b).rc -.ENDIF -.IF "$(use_shl_versions)" != "" -.IF "$(SHL8ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc -.ENDIF # "$(SHL8ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL8DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL8DEFAULTRES: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)/$(SHL8DEFAULTRES:b).rc -.ENDIF # "$(SHL8DEFAULTRES)"!="" - -.IF "$(SHL8ALLRES)"!="" - $(COMMAND_ECHO)+$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES) -.ENDIF # "$(SHL8ALLRES)"!="" - -.IF "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL8LINKER) $(SHL8LINKFLAGS) $(LINKFLAGSSHL) -o $@ \ - $(SHL8DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL8OBJS) $(SHL8VERSIONOBJ) \ - $(SHL8LIBS) \ - $(SHL8STDLIBS:^"-l") \ - $(SHL8LINKRES) \ - $(SHL8STDSHL:^"-l") $(STDSHL8:^"-l") - -.ELSE # "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL8LINKER) -v $(SHL8LINKFLAGS) \ - $(LINKFLAGSSHL) $(SHL8BASEX) \ - $(SHL8STACK) -o $(SHL8TARGETN) \ - $(SHL8DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL8OBJS) $(SHL8VERSIONOBJ) \ - $(SHL8LIBS) \ - $(SHL8STDLIBS:^"-l") \ - $(SHL8LINKRES) \ - $(SHL8STDSHL:^"-l") $(STDSHL8:^"-l") \ - @$(LS) $@ >& $(NULLDEV) - -.ENDIF # "$(USE_DEFFILE)"!="" - -.IF "$(SHL8TARGET8)" != "$(SHL8TARGET)" - $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL8TARGET8).dll -.ENDIF - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(SHL8TARGETN)"!="" # unroll begin @@ -4402,7 +3810,7 @@ $(MISC)/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL9VERSIO .ENDIF .IF "$(GUI)" != "UNX" -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" .IF "$(SHL9IMPLIB)" == "" SHL9IMPLIB=i$(TARGET)_t9 .ENDIF # "$(SHL9IMPLIB)" == "" @@ -4415,7 +3823,7 @@ ALLTAR : $(SHL9IMPLIBN) .IF "$(USE_DEFFILE)"=="" USE_9IMPLIB_DEPS=$(LB)/$(SHL9IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" -.ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.ENDIF # "$(GUI)" == "WNT" USE_SHL9DEF=$(SHL9DEF) .ELSE # "$(GUI)" != "UNX" USE_SHL9DEF= @@ -4552,7 +3960,7 @@ SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o #.IF "$(SHL9TARGETN)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL9LIBS)"!="" $(MISC)/$(SHL9TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -4565,7 +3973,7 @@ $(SHL9TARGETN) : $(LINKINCTARGETS) .ELSE .IF "$(SHL9USE_EXPORTS)"=="name" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" .IF "$(SHL9LIBS)"!="" SHL9LINKLIST=$(MISC)/$(SHL9TARGET)_link.lst @@ -4582,20 +3990,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() -SHL9TARGET8=$(shell @fix_shl $(SHL9TARGET)) -.ENDIF - -.IF "$(GUI)" == "OS2" -_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL9STDLIBS:^"$(LB)/") -SHL9IMP_ORD = $(foreach,i,$(_SHL9IMP_ORD) $(shell @-ls $i)) -.ELSE -SHL9IMP_ORD = -.ENDIF - - $(SHL9TARGETN) : \ $(SHL9OBJS)\ $(SHL9LIBS)\ @@ -4604,7 +3998,6 @@ $(SHL9TARGETN) : \ $(USE_SHL9VERSIONMAP)\ $(SHL9RES)\ $(SHL9DEPN) \ - $(SHL9IMP_ORD) \ $(SHL9LINKLIST) @echo "Making: " $(@:f) .IF "$(GUI)" == "WNT" @@ -4824,65 +4217,6 @@ $(SHL9TARGETN) : \ .ENDIF .ENDIF # "$(GUI)" == "UNX" -.IF "$(GUI)" == "OS2" - -.IF "$(SHL9DEFAULTRES)"!="" - @+-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc >& $(NULLDEV) -.IF "$(SHL9ICON)" != "" - @-+echo 1 ICON $(SHL9ICON) >> $(MISC)/$(SHL9DEFAULTRES:b).rc -.ENDIF -.IF "$(use_shl_versions)" != "" -.IF "$(SHL9ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc -.ENDIF # "$(SHL9ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL9DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL9DEFAULTRES: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)/$(SHL9DEFAULTRES:b).rc -.ENDIF # "$(SHL9DEFAULTRES)"!="" - -.IF "$(SHL9ALLRES)"!="" - $(COMMAND_ECHO)+$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES) -.ENDIF # "$(SHL9ALLRES)"!="" - -.IF "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL9LINKER) $(SHL9LINKFLAGS) $(LINKFLAGSSHL) -o $@ \ - $(SHL9DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL9OBJS) $(SHL9VERSIONOBJ) \ - $(SHL9LIBS) \ - $(SHL9STDLIBS:^"-l") \ - $(SHL9LINKRES) \ - $(SHL9STDSHL:^"-l") $(STDSHL9:^"-l") - -.ELSE # "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL9LINKER) -v $(SHL9LINKFLAGS) \ - $(LINKFLAGSSHL) $(SHL9BASEX) \ - $(SHL9STACK) -o $(SHL9TARGETN) \ - $(SHL9DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL9OBJS) $(SHL9VERSIONOBJ) \ - $(SHL9LIBS) \ - $(SHL9STDLIBS:^"-l") \ - $(SHL9LINKRES) \ - $(SHL9STDSHL:^"-l") $(STDSHL9:^"-l") \ - @$(LS) $@ >& $(NULLDEV) - -.ENDIF # "$(USE_DEFFILE)"!="" - -.IF "$(SHL9TARGET8)" != "$(SHL9TARGET)" - $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL9TARGET8).dll -.ENDIF - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(SHL9TARGETN)"!="" # unroll begin @@ -4945,7 +4279,7 @@ $(MISC)/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL10VERS .ENDIF .IF "$(GUI)" != "UNX" -.IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)" == "WNT" .IF "$(SHL10IMPLIB)" == "" SHL10IMPLIB=i$(TARGET)_t10 .ENDIF # "$(SHL10IMPLIB)" == "" @@ -4958,7 +4292,7 @@ ALLTAR : $(SHL10IMPLIBN) .IF "$(USE_DEFFILE)"=="" USE_10IMPLIB_DEPS=$(LB)/$(SHL10IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" -.ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" +.ENDIF # "$(GUI)" == "WNT" USE_SHL10DEF=$(SHL10DEF) .ELSE # "$(GUI)" != "UNX" USE_SHL10DEF= @@ -5095,7 +4429,7 @@ SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o #.IF "$(SHL10TARGETN)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL10LIBS)"!="" $(MISC)/$(SHL10TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -5108,7 +4442,7 @@ $(SHL10TARGETN) : $(LINKINCTARGETS) .ELSE .IF "$(SHL10USE_EXPORTS)"=="name" -.IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" .IF "$(SHL10LIBS)"!="" SHL10LINKLIST=$(MISC)/$(SHL10TARGET)_link.lst @@ -5125,20 +4459,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() -SHL10TARGET8=$(shell @fix_shl $(SHL10TARGET)) -.ENDIF - -.IF "$(GUI)" == "OS2" -_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL10STDLIBS:^"$(LB)/") -SHL10IMP_ORD = $(foreach,i,$(_SHL10IMP_ORD) $(shell @-ls $i)) -.ELSE -SHL10IMP_ORD = -.ENDIF - - $(SHL10TARGETN) : \ $(SHL10OBJS)\ $(SHL10LIBS)\ @@ -5147,7 +4467,6 @@ $(SHL10TARGETN) : \ $(USE_SHL10VERSIONMAP)\ $(SHL10RES)\ $(SHL10DEPN) \ - $(SHL10IMP_ORD) \ $(SHL10LINKLIST) @echo "Making: " $(@:f) .IF "$(GUI)" == "WNT" @@ -5367,65 +4686,6 @@ $(SHL10TARGETN) : \ .ENDIF .ENDIF # "$(GUI)" == "UNX" -.IF "$(GUI)" == "OS2" - -.IF "$(SHL10DEFAULTRES)"!="" - @+-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc >& $(NULLDEV) -.IF "$(SHL10ICON)" != "" - @-+echo 1 ICON $(SHL10ICON) >> $(MISC)/$(SHL10DEFAULTRES:b).rc -.ENDIF -.IF "$(use_shl_versions)" != "" -.IF "$(SHL10ADD_VERINFO)"!="" - @-+echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc -.ENDIF # "$(SHL10ADD_VERINFO)"!="" - @-+echo MENU 1 BEGIN END >> $(MISC)/$(SHL10DEFAULTRES:b).rc -# @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL10DEFAULTRES: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)/$(SHL10DEFAULTRES:b).rc -.ENDIF # "$(SHL10DEFAULTRES)"!="" - -.IF "$(SHL10ALLRES)"!="" - $(COMMAND_ECHO)+$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES) -.ENDIF # "$(SHL10ALLRES)"!="" - -.IF "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL10LINKER) $(SHL10LINKFLAGS) $(LINKFLAGSSHL) -o $@ \ - $(SHL10DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL10OBJS) $(SHL10VERSIONOBJ) \ - $(SHL10LIBS) \ - $(SHL10STDLIBS:^"-l") \ - $(SHL10LINKRES) \ - $(SHL10STDSHL:^"-l") $(STDSHL10:^"-l") - -.ELSE # "$(USE_DEFFILE)"!="" - - $(COMMAND_ECHO)$(SHL10LINKER) -v $(SHL10LINKFLAGS) \ - $(LINKFLAGSSHL) $(SHL10BASEX) \ - $(SHL10STACK) -o $(SHL10TARGETN) \ - $(SHL10DEF) \ - $(STDOBJ) \ - -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(SHL10OBJS) $(SHL10VERSIONOBJ) \ - $(SHL10LIBS) \ - $(SHL10STDLIBS:^"-l") \ - $(SHL10LINKRES) \ - $(SHL10STDSHL:^"-l") $(STDSHL10:^"-l") \ - @$(LS) $@ >& $(NULLDEV) - -.ENDIF # "$(USE_DEFFILE)"!="" - -.IF "$(SHL10TARGET8)" != "$(SHL10TARGET)" - $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL10TARGET8).dll -.ENDIF - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(SHL10TARGETN)"!="" # unroll begin @@ -5468,13 +4728,6 @@ $(SHL1IMPLIBN): \ .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) $@ $(SHL1VERSIONOBJ) - +@echo build of $(SHL1TARGETN) creates $@ - .ELSE @echo no ImportLibs on Mac and *ix @-$(RM) $@ @@ -5522,13 +4775,6 @@ $(SHL2IMPLIBN): \ .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) $@ $(SHL2VERSIONOBJ) - +@echo build of $(SHL2TARGETN) creates $@ - .ELSE @echo no ImportLibs on Mac and *ix @-$(RM) $@ @@ -5576,13 +4822,6 @@ $(SHL3IMPLIBN): \ .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) $@ $(SHL3VERSIONOBJ) - +@echo build of $(SHL3TARGETN) creates $@ - .ELSE @echo no ImportLibs on Mac and *ix @-$(RM) $@ @@ -5630,13 +4869,6 @@ $(SHL4IMPLIBN): \ .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) $@ $(SHL4VERSIONOBJ) - +@echo build of $(SHL4TARGETN) creates $@ - .ELSE @echo no ImportLibs on Mac and *ix @-$(RM) $@ @@ -5684,13 +4916,6 @@ $(SHL5IMPLIBN): \ .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) $@ $(SHL5VERSIONOBJ) - +@echo build of $(SHL5TARGETN) creates $@ - .ELSE @echo no ImportLibs on Mac and *ix @-$(RM) $@ @@ -5738,13 +4963,6 @@ $(SHL6IMPLIBN): \ .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) $@ $(SHL6VERSIONOBJ) - +@echo build of $(SHL6TARGETN) creates $@ - .ELSE @echo no ImportLibs on Mac and *ix @-$(RM) $@ @@ -5792,13 +5010,6 @@ $(SHL7IMPLIBN): \ .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) $@ $(SHL7VERSIONOBJ) - +@echo build of $(SHL7TARGETN) creates $@ - .ELSE @echo no ImportLibs on Mac and *ix @-$(RM) $@ @@ -5846,13 +5057,6 @@ $(SHL8IMPLIBN): \ .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) $@ $(SHL8VERSIONOBJ) - +@echo build of $(SHL8TARGETN) creates $@ - .ELSE @echo no ImportLibs on Mac and *ix @-$(RM) $@ @@ -5900,13 +5104,6 @@ $(SHL9IMPLIBN): \ .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) $@ $(SHL9VERSIONOBJ) - +@echo build of $(SHL9TARGETN) creates $@ - .ELSE @echo no ImportLibs on Mac and *ix @-$(RM) $@ @@ -5954,13 +5151,6 @@ $(SHL10IMPLIBN): \ .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) $@ $(SHL10VERSIONOBJ) - +@echo build of $(SHL10TARGETN) creates $@ - .ELSE @echo no ImportLibs on Mac and *ix @-$(RM) $@ diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk index 8d7489644bde..c60480bc5288 100644 --- a/solenv/inc/_tg_zip.mk +++ b/solenv/inc/_tg_zip.mk @@ -4,8 +4,6 @@ command_seperator=&& #command_seperator=^ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" -.ELIF "$(GUI)"=="OS2" -command_seperator=&& .ELSE command_seperator=; avoid_cvs_dir=-x "*CVS*" -x "*.svn*" @@ -137,8 +135,6 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS) command_seperator=&& #command_seperator=^ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" -.ELIF "$(GUI)"=="OS2" -command_seperator=&& .ELSE command_seperator=; avoid_cvs_dir=-x "*CVS*" -x "*.svn*" @@ -270,8 +266,6 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS) command_seperator=&& #command_seperator=^ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" -.ELIF "$(GUI)"=="OS2" -command_seperator=&& .ELSE command_seperator=; avoid_cvs_dir=-x "*CVS*" -x "*.svn*" @@ -403,8 +397,6 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS) command_seperator=&& #command_seperator=^ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" -.ELIF "$(GUI)"=="OS2" -command_seperator=&& .ELSE command_seperator=; avoid_cvs_dir=-x "*CVS*" -x "*.svn*" @@ -536,8 +528,6 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS) command_seperator=&& #command_seperator=^ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" -.ELIF "$(GUI)"=="OS2" -command_seperator=&& .ELSE command_seperator=; avoid_cvs_dir=-x "*CVS*" -x "*.svn*" @@ -669,8 +659,6 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS) command_seperator=&& #command_seperator=^ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" -.ELIF "$(GUI)"=="OS2" -command_seperator=&& .ELSE command_seperator=; avoid_cvs_dir=-x "*CVS*" -x "*.svn*" @@ -802,8 +790,6 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS) command_seperator=&& #command_seperator=^ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" -.ELIF "$(GUI)"=="OS2" -command_seperator=&& .ELSE command_seperator=; avoid_cvs_dir=-x "*CVS*" -x "*.svn*" @@ -935,8 +921,6 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS) command_seperator=&& #command_seperator=^ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" -.ELIF "$(GUI)"=="OS2" -command_seperator=&& .ELSE command_seperator=; avoid_cvs_dir=-x "*CVS*" -x "*.svn*" @@ -1068,8 +1052,6 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS) command_seperator=&& #command_seperator=^ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" -.ELIF "$(GUI)"=="OS2" -command_seperator=&& .ELSE command_seperator=; avoid_cvs_dir=-x "*CVS*" -x "*.svn*" @@ -1201,8 +1183,6 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS) command_seperator=&& #command_seperator=^ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" -.ELIF "$(GUI)"=="OS2" -command_seperator=&& .ELSE command_seperator=; avoid_cvs_dir=-x "*CVS*" -x "*.svn*" diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 52dfada097c0..3ec4bdcb2f02 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -32,7 +32,7 @@ LIBSMKREV!:="$$Revision: 1.134.2.3 $$" .INCLUDE .IGNORE : ucbhelper/version.mk .INCLUDE .IGNORE : connectivity/version.mk -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") # No ODMA on UNX ODMA_LIB_LIB= @@ -344,7 +344,7 @@ UNOPKGAPPLIB=-lunopkgapp TESTLIB=-ltest XMLREADERLIB=-lxmlreader -.ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" +.ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") ODMA_LIB_LIB=odma_lib.lib AWTLIB*=jawt.lib @@ -364,11 +364,7 @@ LDAPBERLIB=ldapber.lib CPPULIB=icppu.lib CPPUHELPERLIB=icppuhelper.lib UCBHELPERLIB=iucbhelper.lib -.IF "$(GUI)"=="OS2" -OPENSSLLIB=ssl.lib crypto.lib -.ELSE OPENSSLLIB=ssleay32.lib libeay32.lib -.ENDIF ODBCLIB=iodbc.lib ODBCBASELIB=iodbcbase.lib DBFILELIB=ifile.lib @@ -474,11 +470,7 @@ HELPLINKERLIB=ihelplinker.lib JVMACCESSLIB = ijvmaccess.lib CPPUNITLIB = icppunit_dll.lib XSLTLIB = libxslt.lib $(LIBXML2LIB) -.IF "$(GUI)"=="OS2" -REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib -.ELSE REDLANDLIB = librdf.lib -.ENDIF JVMFWKLIB = ijvmfwk.lib @@ -522,4 +514,4 @@ TESTLIB=itest.lib BOOSTTHREADLIB=boostthread.lib XMLREADERLIB=ixmlreader.lib -.ENDIF # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" +.ENDIF # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index a845b9ae86fe..9dd6cc1963c4 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -138,9 +138,6 @@ $(PAR)/%.par : $(COMMAND_ECHO)$(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre .ENDIF # YD: INCLUDE macro too long, include only few items (scp2 compile) -.IF "$(GUI)"=="OS2" - $(CPPLCC) -+ -P -I..\..\inc -I..\..\os2gcci.pro\inc $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -.ENDIF .IF "$(GUI)"=="UNX" $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre .ENDIF diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 1bfe7fd49972..a694295baf1c 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -571,7 +571,7 @@ ROUT=$(OUTPATH).tlk .ENDIF .IF "$(PRJ)"!="." -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" PATH_IN_MODULE:=\ $(subst,$(normpath $(shell @+cd $(PRJ) && pwd $(PWDFLAGS)))/, $(PWD)) .ELSE # "$(GUI)"=="WNT" @@ -698,7 +698,7 @@ PROCESSOUT*:=$(MISC) # Makros fuer die Librarynamen des Solar .INCLUDE : libs.mk -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" VERSIONOBJ=$(SLO)/_version.obj .ENDIF @@ -706,11 +706,11 @@ VERSIONOBJ=$(SLO)/_version.obj VERSIONOBJ=$(SLO)/_version.o .ENDIF -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" WINVERSIONNAMES=$(UNIXVERSIONNAMES) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" SHELLLIB=-lgdi32 -lshell32 -ladvapi32 -lcomdlg32 .ELSE @@ -875,10 +875,6 @@ SCPDEFS+=-DCCNUMVER=$(CCNUMVER) .IF "$(COM)"=="GCC" SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3) -DSHORTSTDC3=$(SHORTSTDC3) .ENDIF # "$(SHORTSTDCPP3)"!="" -# extend library path for OS/2 gcc/wlink -.IF "$(GUI)"=="OS2" -LIB:=$(LB);$(SLB);$(ILIB) -.ENDIF UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD) @@ -889,7 +885,7 @@ UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CPUNAME) -.IF "$(USE_DEBUG_RUNTIME)" != "" && "$(GUI)"!="OS2" +.IF "$(USE_DEBUG_RUNTIME)" != "" CDEFS+=-D_DEBUG_RUNTIME .ENDIF @@ -1016,10 +1012,6 @@ LNTFLAGSOUTOBJ=-os .INCLUDE : unx.mk .ENDIF -.IF "$(GUI)" == "OS2" -.INCLUDE : os2.mk -.ENDIF - .IF "$(OOO_LIBRARY_PATH_VAR)" != "" # Add SOLARLIBDIR at the begin of a (potentially previously undefined) library # path (LD_LIBRARY_PATH, PATH, etc.; prepending avoids fetching libraries from diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc index 2a43b0f092a2..be5a3bbd0e7a 100644 --- a/solenv/inc/shlinfo.rc +++ b/solenv/inc/shlinfo.rc @@ -27,13 +27,6 @@ #define VER_FIRSTYEAR 2010 - -#if defined(OS2) - -#define OS2_VERSION "hello world" - -#else - #include <windows.h> #include "version.hrc" @@ -82,5 +75,3 @@ VS_VERSION_INFO versioninfo value "Translation", 0x0409, 1252 } } - -#endif // OS2 diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk index fd1d0ff7d01a..02bd45fb18ce 100644 --- a/solenv/inc/startup/startup.mk +++ b/solenv/inc/startup/startup.mk @@ -42,9 +42,7 @@ OS_variable_needed # Customize macro definitions based on seting of OS. # This must come before the default macro definitions which follow. -.IF "$(OS)" == "OS2" -.INCLUDE: $(INCFILENAME:d)OS2/macros.mk -.ELIF "$(OS)" == "WNT" +.IF "$(OS)" == "WNT" .INCLUDE: $(INCFILENAME:d)wnt/macros.mk .END diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 3da903e7c2ed..8b5902fede73 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -31,9 +31,6 @@ MKFILENAME:=TARGET.MK # INCLUDE-Path # ------------------------------------------------------------------ -.IF "$(STL_OS2_BUILDING)" != "" -CDEFS+=-DSTL_OS2_BUILDING -.ENDIF .IF "$(VISIBILITY_HIDDEN)" != "" .IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" CFLAGS += -fvisibility=hidden @@ -197,7 +194,7 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)/$i) DEPIDLFILES:=$(IDLFILES) .ENDIF # "$(EXTERNIDLFILES)"!="" .ELSE # "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i) $i $(shell @($(FIND) $(IDLDIRS) -name $(i:f)) | $(SED) s/\//\\/g ))) .ELSE # "$(GUI)"=="WNT" DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print) $i $(shell @$(FIND) $(IDLDIRS) -name $(i:f) -print ) )) @@ -441,7 +438,7 @@ APP2BASEX=/BASE:$(APP2BASE) .IF "$(APP3TARGET)"!="" APP3TARGETN=$(BIN)/$(APP3TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP3BASE)"=="" APP3BASE=$(BASE) .ENDIF @@ -501,7 +498,7 @@ APP7BASEX=/BASE:$(APP7BASE) .IF "$(APP8TARGET)"!="" APP8TARGETN=$(BIN)/$(APP8TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP8BASE)"=="" APP8BASE=$(BASE) .ENDIF @@ -513,7 +510,7 @@ APP8BASEX=/BASE:$(APP8BASE) .IF "$(APP9TARGET)"!="" APP9TARGETN=$(BIN)/$(APP9TARGET)$(EXECPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP9BASE)"=="" APP9BASE=$(BASE) .ENDIF @@ -529,7 +526,7 @@ SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL1DLLPRE*=$(DLLPRE) SHL1TARGETN=$(DLLDEST)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL1BASE)"=="" SHL1BASE=$(BASE) .ENDIF @@ -545,7 +542,7 @@ SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL2DLLPRE*=$(DLLPRE) SHL2TARGETN=$(DLLDEST)/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL2BASE)"=="" SHL2BASE=$(BASE) .ENDIF @@ -561,7 +558,7 @@ SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL3DLLPRE*=$(DLLPRE) SHL3TARGETN=$(DLLDEST)/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL3BASE)"=="" SHL3BASE=$(BASE) .ENDIF @@ -577,7 +574,7 @@ SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL4DLLPRE*=$(DLLPRE) SHL4TARGETN=$(DLLDEST)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL4BASE)"=="" SHL4BASE=$(BASE) .ENDIF @@ -593,7 +590,7 @@ SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL5DLLPRE*=$(DLLPRE) SHL5TARGETN=$(DLLDEST)/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL5BASE)"=="" SHL5BASE=$(BASE) .ENDIF @@ -609,7 +606,7 @@ SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL6DLLPRE*=$(DLLPRE) SHL6TARGETN=$(DLLDEST)/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL6BASE)"=="" SHL6BASE=$(BASE) .ENDIF @@ -625,7 +622,7 @@ SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL7DLLPRE*=$(DLLPRE) SHL7TARGETN=$(DLLDEST)/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL7BASE)"=="" SHL7BASE=$(BASE) .ENDIF @@ -641,7 +638,7 @@ SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL8DLLPRE*=$(DLLPRE) SHL8TARGETN=$(DLLDEST)/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL8BASE)"=="" SHL8BASE=$(BASE) .ENDIF @@ -657,7 +654,7 @@ SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR) SHL9DLLPRE*=$(DLLPRE) SHL9TARGETN=$(DLLDEST)/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST) .IF "$(BASE)" != "" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(SHL9BASE)"=="" SHL9BASE=$(BASE) .ENDIF @@ -779,7 +776,7 @@ LIB8TARGETN=$(LIB8TARGET) LIB9TARGETN=$(LIB9TARGET) .ENDIF -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" LIB1ARCHIV= LIB2ARCHIV= @@ -1756,7 +1753,7 @@ ALLTAR : forcedeps @$(TOUCH) $(TMP)/makedt.don killbin: -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" @$(IFEXIST) $(BIN)/$(SHL1TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL1TARGET).dll $(FI) @$(IFEXIST) $(BIN)/$(SHL2TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL2TARGET).dll $(FI) @$(IFEXIST) $(BIN)/$(SHL3TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL3TARGET).dll $(FI) diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index cefdf14db033..1133bc38bd0b 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -29,10 +29,6 @@ # instructions for linking # unroll begin -.IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP$(TNR)DEF = $(MISC)/$(APP$(TNR)TARGET).def -.ENDIF - .IF "$(APP$(TNR)LINKTYPE)" != "" #must be either STATIC or SHARED APP$(TNR)LINKTYPEFLAG=$(APPLINK$(APP$(TNR)LINKTYPE)) @@ -88,7 +84,7 @@ APP$(TNR)PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\" .ENDIF # "$(APP$(TNR)PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(APP$(TNR)LIBS)"!="" $(MISC)/$(APP$(TNR)TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -103,16 +99,8 @@ $(APP$(TNR)TARGETN) : $(LINKINCTARGETS) # Allow for target specific LIBSALCPPRT override APP$(TNR)LIBSALCPPRT*=$(LIBSALCPPRT) -.IF "$(GUI)" == "OS2" -_APP$(TNR)IMP_ORD = $(APP$(TNR)STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP$(TNR)STDLIBS:^"$(LB)/") -APP$(TNR)IMP_ORD = $(foreach,i,$(_APP$(TNR)IMP_ORD) $(shell @-ls $i)) -.ELSE -APP$(TNR)IMP_ORD = -.ENDIF - $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ $(APP$(TNR)RES) \ - $(APP$(TNR)IMP_ORD) \ $(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF) @echo "Making: " $(@:f) .IF "$(GUI)"=="UNX" @@ -247,66 +235,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ .ENDIF # "$(GUI)" == "WNT" -.IF "$(GUI)" == "OS2" - @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) -.IF "$(APP$(TNR)LINKRES)" != "" - @+-$(RM) $(MISC)/$(APP$(TNR)LINKRES:b).rc >& $(NULLDEV) -.IF "$(APP$(TNR)ICON)" != "" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP$(TNR)ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP$(TNR)LINKRES:b).rc -.ENDIF # "$(APP$(TNR)ICON)" != "" -.IF "$(APP$(TNR)VERINFO)" != "" - @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP$(TNR)LINKRES:b).rc - @-+echo $(EMQ)#include $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)/$(APP$(TNR)LINKRES:b).rc -.ENDIF # "$(APP$(TNR)VERINFO)" != "" - $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc -.ENDIF # "$(APP$(TNR)LINKRES)" != "" - -.IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP$(TNR)TARGET) WINDOWAPI > $(MISC)/$(APP$(TNR)TARGET).def -.ENDIF - - .IF "$(VERBOSE)" == "TRUE" - @+echo $(APP$(TNR)LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \ - $(APP$(TNR)STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP$(TNR)LINKRES) \ - $(APP$(TNR)RES) \ - $(APP$(TNR)DEF) \ - $(APP$(TNR)OBJS) \ - $(APP$(TNR)LIBS) \ - $(APP$(TNR)STDLIBS:^"-l") \ - $(APP$(TNR)STDLIB:^"-l") $(STDLIB$(TNR):^"-l") - .ENDIF - $(COMMAND_ECHO)$(APP$(TNR)LINKER) -v \ - $(APP$(TNR)LINKFLAGS) \ - $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \ - $(APP$(TNR)STACKN) \ - -o $@ \ - -Zmap -L$(LB) \ - -L$(SOLARVERSION)/$(INPATH)/lib \ - $(STDOBJ) \ - $(APP$(TNR)LINKRES) \ - $(APP$(TNR)RES) \ - $(APP$(TNR)DEF) \ - $(APP$(TNR)OBJS) \ - $(APP$(TNR)LIBS) \ - $(APP$(TNR)STDLIBS:^"-l") \ - $(APP$(TNR)STDLIB:^"-l") $(STDLIB$(TNR):^"-l") - - -.IF "$(APP$(TNR)TARGET)" == "loader" - $(COMMAND_ECHO)+$(PERL) loader.pl $@ - $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe - $(COMMAND_ECHO)+$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe -.ENDIF # "$(TARGET)" == "setup" - -.ENDIF # "$(GUI)" == "OS2" - .ENDIF # "$(APP$(TNR)TARGETN)"!="" diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk index cfe2fe147ebe..bd3e7bbd9413 100644 --- a/solenv/inc/tg_config.mk +++ b/solenv/inc/tg_config.mk @@ -32,10 +32,6 @@ XCSROOTURL!:=$(ABSXCSROOT) XCSROOTURL!:=file:///$(subst,\,/ $(XCSROOTURL)) .ENDIF SYSXSLDIR*:=$(XSLDIR)/ -.IF $(GUI)==OS2 -XCSROOTURL!:=$(subst,\,/ $(XCSROOTURL)) -SYSXSLDIR!:=$(subst,\,/ $(SYSXSLDIR))/ -.ENDIF # # --- XCS --- diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk index 0bbd1f6b1ab1..c2056a69938d 100644 --- a/solenv/inc/tg_def.mk +++ b/solenv/inc/tg_def.mk @@ -65,12 +65,6 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -DEF$(TNR)EXPORTFILE=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET).dxp -$(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(DEF$(TNR)EXPORTFILE)"=="" .ENDIF # "$(SHL$(TNR)VERSIONMAP)"!="" @@ -192,112 +186,6 @@ $(DEF$(TNR)TARGETN) .PHONY : @$(RENAME) $@.tmpfile $@ .ENDIF # "$(GUI)"=="WNT" -.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)TARGETN:f)) - -DEF$(TNR)FILTER=$(SOLARENV)/inc/dummy.flt -DEF$(TNR)NAMELIST=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) - -.IF "$(link_always)"=="" -$(DEF$(TNR)TARGETN) : \ - $(DEF$(TNR)DEPN) \ - $(DEF$(TNR)EXPORTFILE) -.ELSE # "$(link_always)"=="" -$(DEF$(TNR)TARGETN) .PHONY : -.ENDIF # "$(link_always)"=="" - @+-$(RM) $@.tmpfile - @echo "Making: module definition file" $(@:f) - @echo LIBRARY $(SHL$(TNR)TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile - @echo DATA MULTIPLE >>$@.tmpfile - @echo DESCRIPTION 'StarView 3.00 $(DEF$(TNR)DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile - @echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - @echo _GetVersionInfo >$@.tmp_ord -.ENDIF - -.IF "$(DEFLIB$(TNR)NAME)"!="" - @+echo $(SLB)/$(DEFLIB$(TNR)NAME).lib - @+emxexpr $(DEF$(TNR)NAMELIST) | fix_exp_file >> $@.tmp_ord -.ENDIF # "$(DEFLIB$(TNR)NAME)"!="" - -.IF "$(DEF$(TNR)EXPORT1)"!="" - @echo $(DEF$(TNR)EXPORT1) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT2)"!="" - @echo $(DEF$(TNR)EXPORT2) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT3)"!="" - @echo $(DEF$(TNR)EXPORT3) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT4)"!="" - @echo $(DEF$(TNR)EXPORT4) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT5)"!="" - @echo $(DEF$(TNR)EXPORT5) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT6)"!="" - @echo $(DEF$(TNR)EXPORT6) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT7)"!="" - @echo $(DEF$(TNR)EXPORT7) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT8)"!="" - @echo $(DEF$(TNR)EXPORT8) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT9)"!="" - @echo $(DEF$(TNR)EXPORT9) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT10)"!="" - @echo $(DEF$(TNR)EXPORT10) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT11)"!="" - @echo $(DEF$(TNR)EXPORT11) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT12)"!="" - @echo $(DEF$(TNR)EXPORT12) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT13)"!="" - @echo $(DEF$(TNR)EXPORT13) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT14)"!="" - @echo $(DEF$(TNR)EXPORT14) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT15)"!="" - @echo $(DEF$(TNR)EXPORT15) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT16)"!="" - @echo $(DEF$(TNR)EXPORT16) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT17)"!="" - @echo $(DEF$(TNR)EXPORT17) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT18)"!="" - @echo $(DEF$(TNR)EXPORT18) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT19)"!="" - @echo $(DEF$(TNR)EXPORT19) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORT20)"!="" - @echo $(DEF$(TNR)EXPORT20) >>$@.tmpfile -.ENDIF -.IF "$(DEF$(TNR)EXPORTFILE)"!="" - @fix_def_file < $(DEF$(TNR)EXPORTFILE) >> $@.tmp_ord -.ENDIF - @sort < $@.tmp_ord | uniq > $@.exptmpfile - @fix_def_ord < $@.exptmpfile >> $@.tmpfile - @+-$(RM) $@ - $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@ - @+-$(RM) $@.tmp_ord - @+-$(RM) $@.exptmpfile - $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL$(TNR)IMPLIBN:s/.lib/.a/) $@ - $(COMMAND_ECHO)+emxomf -o $(SHL$(TNR)IMPLIBN) $(SHL$(TNR)IMPLIBN:s/.lib/.a/) - -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" $(DEF$(TNR)TARGETN): \ $(DEF$(TNR)DEPN) \ diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index baa020c877d9..d219302c6e1b 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -227,11 +227,7 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) .ELSE # "$(CONFIGURE_ACTION)"=="none" || "$(CONFIGURE_ACTION)"=="" $(COMMAND_ECHO)-$(MKDIR) $(P_CONFIGURE_DIR) -.IF "$(OS)"=="OS2" - $(COMMAND_ECHO)cd $(P_CONFIGURE_DIR) && sh -c "$(CONFIGURE_ACTION:s!\!/!) $(CONFIGURE_FLAGS:s!\!/!)" && $(TOUCH) $(CONFIGURE_FLAG_FILE) -.ELSE $(COMMAND_ECHO)cd $(P_CONFIGURE_DIR) && $(CONFIGURE_ACTION) $(CONFIGURE_FLAGS) && $(TOUCH) $(CONFIGURE_FLAG_FILE) -.ENDIF $(COMMAND_ECHO)mv $(P_CONFIGURE_DIR)/$(CONFIGURE_FLAG_FILE) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) .ENDIF # "$(CONFIGURE_ACTION)"=="none" || "$(CONFIGURE_ACTION)"=="" diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk index 121455d9b3ec..3af7a00e002a 100644 --- a/solenv/inc/tg_lib.mk +++ b/solenv/inc/tg_lib.mk @@ -85,17 +85,6 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \ @nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF -.ELIF "$(GUI)"=="OS2" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES) - @+-$(RM) $(@:s/.lib/.lin/) -.IF "$(LIB$(TNR)OBJFILES)"!="" - @+$(TYPE) $(mktmp $(LIB$(TNR)OBJFILES)) > $(null,$(LIB$(TNR)OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/)) -.ENDIF # "$(LIB$(TNR)OBJFILES)"!="" -.IF "$(LIB$(TNR)FILES)"!="" - @-$(TYPE) $(foreach,i,$(LIB$(TNR)FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) -.ENDIF # "$(LIB$(TNR)FILES)"!="" - @+$(ECHONL) - .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk index 3a597c2409b3..73fae59d6762 100644 --- a/solenv/inc/tg_obj.mk +++ b/solenv/inc/tg_obj.mk @@ -30,12 +30,6 @@ MKFILENAME:=TG_OBJ.MK .IF "$(OBJTARGET)"!="" $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES) @echo "Making: " $(@:f) -.IF "$(GUI)"=="OS2" -.IF "$(LIBTARGET)"!="NO" - @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) -.ENDIF # "$(LIBTARGET)"!="NO" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&) -.ENDIF # "$(GUI)"=="OS2" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -62,12 +56,6 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES) .IF "$($(SECOND_BUILD)OBJTARGET)"!="" $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES) @echo "Making: " $(@:f) -.IF "$(GUI)"=="OS2" -.IF "$(LIBTARGET)"!="NO" - @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) -.ENDIF # "$(LIBTARGET)"!="NO" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&) -.ENDIF # "$(GUI)"=="OS2" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -85,10 +73,3 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$($(SECOND_BUILD)OBJTARGET)"!="" .ENDIF # "$(SECOND_BUILD)"!="" - -.IF "$(GUI)"=="OS2" -.IF "$(LIBTARGET)"!="NO" - @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) -.ENDIF # "$(LIBTARGET)"!="NO" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&) -.ENDIF # "$(GUI)"=="OS2" 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) $@ diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk index 0a0ae789a8c7..4195ffda1c1d 100644 --- a/solenv/inc/tg_slo.mk +++ b/solenv/inc/tg_slo.mk @@ -47,13 +47,6 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES) .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -.IF "$(LIBTARGET)"!="NO" - @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) -.ENDIF # "$(LIBTARGET)"!="NO" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&) -.ENDIF # "$(GUI)"=="OS2" - .IF "$(GUI)"=="UNX" @echo $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@ .IF "$(OS)"=="MACOSX" @@ -81,13 +74,6 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES) .ENDIF # "$(LIBTARGET)"!="NO" $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n")) -.IF "$(GUI)"=="OS2" -.IF "$(LIBTARGET)"!="NO" - @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) -.ENDIF # "$(LIBTARGET)"!="NO" - $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&) -.ENDIF # "$(GUI)"=="OS2" - .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="WNT" diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk index d3236fd84a7f..4468a2139397 100644 --- a/solenv/inc/tg_zip.mk +++ b/solenv/inc/tg_zip.mk @@ -32,8 +32,6 @@ command_seperator=&& #command_seperator=^ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" -.ELIF "$(GUI)"=="OS2" -command_seperator=&& .ELSE command_seperator=; avoid_cvs_dir=-x "*CVS*" -x "*.svn*" diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index f54918b78b0c..03ac05dd04b1 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -149,33 +149,6 @@ FIND=find LS=ls ECHON=echo -n ECHONL=echo -.ELIF "$(GUI)"=="OS2" -SED*=sed -SORT*=sort -PERL*=perl -TYPE=cat -CDD=@cd -COPY*=$(SHELL) /c copy /b -COPYRECURSE=/s -COPYUPDATE=/u -DELAY=sleep -ECHON*=echos -ECHONL=+echo. -AWK*=awk -GNUCOPY*=cp -GNUPATCH*=gnupatch -GNUMAKE*=make -TOUCH=touch /c -#YD rename doesn't work across different drives! -RENAME=mv -MKDIR=+md -MKDIRHIER=+md /s -GREP=grep -FIND=find -LS=ls -DUMPBIN=echo -4nt_force_shell:=+ - .ENDIF # "$(GUI)"=="UNX" # (Global) Set if not set before diff --git a/solenv/src/version.c b/solenv/src/version.c index f383f8393557..f39f29872262 100644 --- a/solenv/src/version.c +++ b/solenv/src/version.c @@ -51,11 +51,11 @@ static const struct VersionInfo g_aVersionInfo = _INPATH }; -#if defined(WNT) || defined(OS2) +#if defined(WNT) __declspec(dllexport) const struct VersionInfo* GetVersionInfo(void); #endif -#if defined(WNT) || defined(OS2) +#if defined(WNT) __declspec(dllexport) const struct VersionInfo* GetVersionInfo(void) #else const struct VersionInfo *GetVersionInfo(void) diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk index 71c581a38325..44db211b6f53 100644 --- a/soltools/cpp/makefile.mk +++ b/soltools/cpp/makefile.mk @@ -63,9 +63,7 @@ CDEFS += -DHAVE_GETOPT .ENDIF APP1TARGET = $(TARGET) -.IF "$(GUI)" != "OS2" APP1STACK = 1000000 -.ENDIF APP1LIBS = $(LB)$/$(TARGET).lib APP1DEPN = $(LB)$/$(TARGET).lib diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk index bab26d2e7e1b..a463f5a55569 100644 --- a/soltools/giparser/makefile.mk +++ b/soltools/giparser/makefile.mk @@ -32,10 +32,6 @@ TARGET=soltools_giparser TARGETTYPE=CUI ENABLE_EXCEPTIONS=TRUE -.IF "$(GUI)" == "OS2" -STL_OS2_BUILDING=1 -.ENDIF - # --- Settings ----------------------------------------------------- .INCLUDE : $(PRJ)$/util$/makefile.pmk diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c index 86032c7f7cc9..351177a76c6c 100644 --- a/soltools/javadep/javadep.c +++ b/soltools/javadep/javadep.c @@ -39,7 +39,7 @@ #include <ctype.h> #include <limits.h> -#if defined(UNX) || defined(OS2) +#if defined(UNX) #include <unistd.h> #include <netinet/in.h> /* ntohl(), ntohs() */ #elif defined(WNT) @@ -55,10 +55,6 @@ #define ntohs(x) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) #endif -#if defined(OS2) -#define CDECL -#endif - /* max. length of line in response file */ #define RES_FILE_BUF 65536 @@ -105,10 +101,10 @@ enum { NGROW_INIT = 10, NGROW = 2 }; static char *pprogname = "javadep"; static char csep = ';'; -#if defined (UNX) || defined(OS2) +#if defined (UNX) #define CDECL static char cpathsep = '/'; -#elif defined (WNT) || defined(OS2) +#elif defined (WNT) static char cpathsep = '\\'; #endif static FILE *pfsout = NULL; @@ -302,7 +298,7 @@ add_to_dependencies(struct growable *pdep, } /* get the canonical path */ -#if defined (UNX) || defined(OS2) +#if defined (UNX) if ( !(realpath(pclass_file, cnp_class_file) && realpath(path, cnp_str) ) ) { err_quit("can't get the canonical path"); diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx index ebe6983e18be..d8dab54b2390 100644 --- a/soltools/ldump/ldump.cxx +++ b/soltools/ldump/ldump.cxx @@ -542,17 +542,9 @@ bool LibDump::CheckDataBase() char *pTmp = "defs\\"; FILE *fp; -#ifdef OS2 - _mkdir ("defs", 0777); -#else _mkdir ("defs"); -#endif strcpy(cBName,pTmp); -#ifdef OS2 - strcat(cBName,"gcc"); -#else strcat(cBName,getenv ("COMP_ENV")); -#endif fp = fopen (cBName,"r"); if (fp) diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk index 51ff42e60772..6d0eda3bf99e 100644 --- a/soltools/ldump/makefile.mk +++ b/soltools/ldump/makefile.mk @@ -42,7 +42,7 @@ LIBSALCPPRT=$(0) # --- Files -------------------------------------------------------- # ldump only supports windows environment -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)"=="WNT" .IF "$(COM)"!="GCC" #ldump4 reimplements feature set of ldump2 and ldump3 APP1TARGET= ldump4 |