[Libreoffice-commits] .: configure.in post_download.in set_soenv.in soldep/bootstrp soldep/inc solenv/bin solenv/inc solenv/src soltools/cpp soltools/giparser soltools/javadep soltools/ldump
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Apr 15 04:09:12 PDT 2011
configure.in | 49 -
post_download.in | 3
set_soenv.in | 111 ----
soldep/bootstrp/command.cxx | 6
soldep/inc/soldep/command.hxx | 3
solenv/bin/build.pl | 1
solenv/inc/_tg_app.mk | 740 ---------------------------
solenv/inc/_tg_def.mk | 1120 ------------------------------------------
solenv/inc/_tg_lib.mk | 110 ----
solenv/inc/_tg_shl.mk | 890 +--------------------------------
solenv/inc/_tg_zip.mk | 20
solenv/inc/libs.mk | 14
solenv/inc/pstrules.mk | 3
solenv/inc/settings.mk | 18
solenv/inc/shlinfo.rc | 9
solenv/inc/startup/startup.mk | 4
solenv/inc/target.mk | 33 -
solenv/inc/tg_app.mk | 74 --
solenv/inc/tg_config.mk | 4
solenv/inc/tg_def.mk | 112 ----
solenv/inc/tg_ext.mk | 4
solenv/inc/tg_lib.mk | 11
solenv/inc/tg_obj.mk | 19
solenv/inc/tg_shl.mk | 89 ---
solenv/inc/tg_slo.mk | 14
solenv/inc/tg_zip.mk | 2
solenv/inc/unitools.mk | 27 -
solenv/src/version.c | 4
soltools/cpp/makefile.mk | 2
soltools/giparser/makefile.mk | 4
soltools/javadep/javadep.c | 12
soltools/ldump/ldump.cxx | 8
soltools/ldump/makefile.mk | 2
33 files changed, 99 insertions(+), 3423 deletions(-)
New commits:
commit 6ba7fcdb76e212ee616f50a9150ae2c58e1ea5d6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Apr 15 13:36:58 2011 +0300
Kill OS/2 stuff
diff --git a/configure.in b/configure.in
index 2b907b4..a0e7825 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 3c542b8..ce09523 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 e5ad0fd..4a65034 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 1cc252d..786568e 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 5c642ba..7ed533a 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 a4d4e49..b13a582 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 bf7e874..959edd2 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 cf4414a..488f638 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 35af207..19db84c 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 5f58147..21f2a4f 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)\
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list