diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-09-28 17:14:56 +0200 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-09-28 17:14:56 +0200 |
| commit | eede210b11921ae92386ded4431b350e43c54049 (patch) | |
| tree | 644c24847f64f4a470246407409a3967d2781fd2 | |
| parent | c6703df672656c8203eb1dee3882e00fd9f11e16 (diff) | |
| parent | 41821fa93ada11053a53be14429e5f7236b9bf03 (diff) | |
update to DEV300_m60
122 files changed, 4768 insertions, 4862 deletions
diff --git a/configure b/configure index 4afd6e3777fe..06ed74cb9b58 100755 --- a/configure +++ b/configure @@ -753,11 +753,11 @@ SYSTEM_AGG AGG_LIBS AGG_CFLAGS ENABLE_AGG -NEON_VERSION -SYSTEM_NEON SYSTEM_OPENSSL OPENSSL_LIBS OPENSSL_CFLAGS +NEON_VERSION +SYSTEM_NEON NEON_LIBS NEON_CFLAGS DISABLE_NEON @@ -890,6 +890,8 @@ SOLAR_JAVA BUILD_VER_STRING ALLOC HAVE_GCC_VISIBILITY_FEATURE +CCACHE +USE_CCACHE USE_SYSTEM_STL STLPORT_VER STLPORT4 @@ -1176,6 +1178,7 @@ with_mozilla_build with_local_solenv with_local_solver enable_check_only +enable_ccache_skip with_lang with_poor_help_localizations with_dict @@ -2015,6 +2018,14 @@ Optional Features: Usage: --enable-check-only=yes + --enable-ccache-skip [default=auto] allow the use of --ccache-skip to + escape compiler flags that would otherwise prevent + caching of the result (currently used on Mac only) + NOTE: requires patched version because of a bug in + ccache (see issue 104567 for details and patch) + explicitly enable if your version of ccache doesn't + identify as version 2.4_OOo + --enable-sgistl for IRIX users, use this option option to build OpenOffice.org using SGI's STL. @@ -2053,10 +2064,10 @@ Optional Packages: Usage: --with-vba-package-format="builtin" or --with-vba-package-format="extn" - --without-fonts Removes Bitstream Vera fonts from - openoffice.org installation set, for people building - for specific distributions where the fonts are known - to be already available + --without-fonts OOo includes some third-party fonts to provide a reliable + basis for help content, templates, samples, etc. + When these fonts are already known to be available on the + system then you should use this option. --without-ppds Removes Postscript Printer definition files from openoffice.org installation set, for people building @@ -3778,6 +3789,13 @@ if test "${enable_check_only+set}" = set; then enableval=$enable_check_only; fi +# Check whether --enable-ccache-skip was given. +if test "${enable_ccache_skip+set}" = set; then + enableval=$enable_ccache_skip; +else + enable_ccache_skip=auto +fi + # Check whether --with-lang was given. if test "${with_lang+set}" = set; then @@ -11383,6 +11401,159 @@ $as_echo "no" >&6; } fi fi +# =================================================================== +# use --ccache-skip? +# =================================================================== +{ $as_echo "$as_me:$LINENO: checking whether we are allowed and able to use --ccache-skip" >&5 +$as_echo_n "checking whether we are allowed and able to use --ccache-skip... " >&6; } +if test "$_os" != "Darwin" ; then + { $as_echo "$as_me:$LINENO: result: only used on Mac currently, skipping" >&5 +$as_echo "only used on Mac currently, skipping" >&6; } +elif test "$enable_ccache_skip" = "no" ; then + { $as_echo "$as_me:$LINENO: result: no - diabled explicitly" >&5 +$as_echo "no - diabled explicitly" >&6; } +elif test "$enable_ccache_skip" = "yes" ; then + { $as_echo "$as_me:$LINENO: result: yes - enabled explicitly, skipping checks" >&5 +$as_echo "yes - enabled explicitly, skipping checks" >&6; } + USE_CCACHE=YES + +elif test "$enable_ccache_skip" = "auto" ; then + # checking for ccache presence/version + { $as_echo "$as_me:$LINENO: result: probing..." >&5 +$as_echo "probing..." >&6; } + # Extract the first word of "ccache", so it can be a program name with args. +set dummy ccache; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_CCACHE+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $CCACHE in + [\\/]* | ?:[\\/]*) + ac_cv_path_CCACHE="$CCACHE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_CCACHE" && ac_cv_path_CCACHE="not_found" + ;; +esac +fi +CCACHE=$ac_cv_path_CCACHE +if test -n "$CCACHE"; then + { $as_echo "$as_me:$LINENO: result: $CCACHE" >&5 +$as_echo "$CCACHE" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "$CCACHE" = "not_found" ; then + { $as_echo "$as_me:$LINENO: not enabling --ccache-skip (ccache not found)" >&5 +$as_echo "$as_me: not enabling --ccache-skip (ccache not found)" >&6;} + else + # check ccache version + { $as_echo "$as_me:$LINENO: checking whether version of ccache is suitable" >&5 +$as_echo_n "checking whether version of ccache is suitable... " >&6; } + CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'` + if test "$CCACHE_VERSION" = "2.4_OOo"; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:$LINENO: checking whether ccache is actually used for the build" >&5 +$as_echo_n "checking whether ccache is actually used for the build... " >&6; } + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS --ccache-skip -O2" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + use_ccache=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + use_ccache=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $use_ccache = yes ; then + { $as_echo "$as_me:$LINENO: result: yes, will enable --ccache-skip" >&5 +$as_echo "yes, will enable --ccache-skip" >&6; } + USE_CCACHE=YES + + else + { $as_echo "$as_me:$LINENO: result: no, will not enable --ccache-skip" >&5 +$as_echo "no, will not enable --ccache-skip" >&6; } + fi + CXXFLAGS=$save_CXXFLAGS + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&5 +$as_echo "$as_me: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&6;} + fi + fi +else + { { $as_echo "$as_me:$LINENO: error: invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" >&5 +$as_echo "$as_me: error: invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" >&2;} + { (exit 1); exit 1; }; } +fi + if test "$USE_SYSTEM_STL" = "YES"; then { $as_echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5 $as_echo_n "checking if hash_map will be in __gnu_cxx namespace... " >&6; } @@ -16779,18 +16950,18 @@ $as_echo "$as_me: error: boost/shared_ptr.hpp not found. install boost" >&2;} fi - if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 -$as_echo_n "checking for boost/spirit/core.hpp... " >&6; } -if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then + if test "${ac_cv_header_boost_spirit_include_classic_core_hpp+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for boost/spirit/include/classic_core.hpp" >&5 +$as_echo_n "checking for boost/spirit/include/classic_core.hpp... " >&6; } +if test "${ac_cv_header_boost_spirit_include_classic_core_hpp+set}" = set; then $as_echo_n "(cached) " >&6 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 -$as_echo "$ac_cv_header_boost_spirit_core_hpp" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_include_classic_core_hpp" >&5 +$as_echo "$ac_cv_header_boost_spirit_include_classic_core_hpp" >&6; } else # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking boost/spirit/core.hpp usability" >&5 -$as_echo_n "checking boost/spirit/core.hpp usability... " >&6; } +{ $as_echo "$as_me:$LINENO: checking boost/spirit/include/classic_core.hpp usability" >&5 +$as_echo_n "checking boost/spirit/include/classic_core.hpp usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16798,7 +16969,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <boost/spirit/core.hpp> +#include <boost/spirit/include/classic_core.hpp> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -16831,15 +17002,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext $as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ $as_echo "$as_me:$LINENO: checking boost/spirit/core.hpp presence" >&5 -$as_echo_n "checking boost/spirit/core.hpp presence... " >&6; } +{ $as_echo "$as_me:$LINENO: checking boost/spirit/include/classic_core.hpp presence" >&5 +$as_echo_n "checking boost/spirit/include/classic_core.hpp presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <boost/spirit/core.hpp> +#include <boost/spirit/include/classic_core.hpp> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -16873,48 +17044,242 @@ $as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: boost/spirit/core.hpp: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: in the future, the compiler will take precedence" >&2;} ;; esac -{ $as_echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5 -$as_echo_n "checking for boost/spirit/core.hpp... " >&6; } -if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then +{ $as_echo "$as_me:$LINENO: checking for boost/spirit/include/classic_core.hpp" >&5 +$as_echo_n "checking for boost/spirit/include/classic_core.hpp... " >&6; } +if test "${ac_cv_header_boost_spirit_include_classic_core_hpp+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_cv_header_boost_spirit_core_hpp=$ac_header_preproc + ac_cv_header_boost_spirit_include_classic_core_hpp=$ac_header_preproc fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_core_hpp" >&5 -$as_echo "$ac_cv_header_boost_spirit_core_hpp" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_include_classic_core_hpp" >&5 +$as_echo "$ac_cv_header_boost_spirit_include_classic_core_hpp" >&6; } fi -if test "x$ac_cv_header_boost_spirit_core_hpp" = x""yes; then +if test "x$ac_cv_header_boost_spirit_include_classic_core_hpp" = x""yes; then : else - { { $as_echo "$as_me:$LINENO: error: boost/spirit/core.hpp not found. install boost" >&5 -$as_echo "$as_me: error: boost/spirit/core.hpp not found. install boost" >&2;} + { { $as_echo "$as_me:$LINENO: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" >&5 +$as_echo "$as_me: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" >&2;} { (exit 1); exit 1; }; } fi + if test "${ac_cv_header_boost_function_hpp+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for boost/function.hpp" >&5 +$as_echo_n "checking for boost/function.hpp... " >&6; } +if test "${ac_cv_header_boost_function_hpp+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_function_hpp" >&5 +$as_echo "$ac_cv_header_boost_function_hpp" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking boost/function.hpp usability" >&5 +$as_echo_n "checking boost/function.hpp usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <boost/function.hpp> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking boost/function.hpp presence" >&5 +$as_echo_n "checking boost/function.hpp presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <boost/function.hpp> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: boost/function.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: boost/function.hpp: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: boost/function.hpp: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: boost/function.hpp: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: boost/function.hpp: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: boost/function.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: boost/function.hpp: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/function.hpp: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: boost/function.hpp: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for boost/function.hpp" >&5 +$as_echo_n "checking for boost/function.hpp... " >&6; } +if test "${ac_cv_header_boost_function_hpp+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_boost_function_hpp=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_function_hpp" >&5 +$as_echo "$ac_cv_header_boost_function_hpp" >&6; } + +fi +if test "x$ac_cv_header_boost_function_hpp" = x""yes; then + : +else + { { $as_echo "$as_me:$LINENO: error: boost/function.hpp not found. install boost" >&5 +$as_echo "$as_me: error: boost/function.hpp not found. install boost" >&2;} + { (exit 1); exit 1; }; } +fi + + + + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS -fno-exceptions" + { $as_echo "$as_me:$LINENO: checking whether boost/function.hpp compiles with -fno-exceptions" >&5 +$as_echo_n "checking whether boost/function.hpp compiles with -fno-exceptions... " >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <boost/function.hpp> + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_cxx_boost_no_exceptons_broken=no +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_cxx_boost_no_exceptons_broken=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then + { { $as_echo "$as_me:$LINENO: error: no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" >&5 +$as_echo "$as_me: error: no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" >&2;} + { (exit 1); exit 1; }; } + else + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + fi + CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18540,11 +18905,11 @@ $as_echo "found" >&6; } { { $as_echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: -http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&5 +ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&5 $as_echo "$as_me: error: Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: -http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&2;} +ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then @@ -18720,23 +19085,23 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:$LINENO: checking for libIDL >= 0.6.3 libIDL <= 0.6.8" >&5 -$as_echo_n "checking for libIDL >= 0.6.3 libIDL <= 0.6.8... " >&6; } + { $as_echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.6.3" >&5 +$as_echo_n "checking for libIDL-2.0 >= 0.6.3... " >&6; } - if $PKG_CONFIG --exists "libIDL >= 0.6.3 libIDL <= 0.6.8" ; then + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.6.3" ; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } succeeded=yes { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 $as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } - MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL >= 0.6.3 libIDL <= 0.6.8"` + MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.6.3"` { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 $as_echo "$MOZLIBREQ_CFLAGS" >&6; } { $as_echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 $as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } - MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL >= 0.6.3 libIDL <= 0.6.8"` + MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.6.3"` { $as_echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 $as_echo "$MOZLIBREQ_LIBS" >&6; } else @@ -18744,7 +19109,7 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } MOZLIBREQ_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - MOZLIBREQ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libIDL >= 0.6.3 libIDL <= 0.6.8"` + MOZLIBREQ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libIDL-2.0 >= 0.6.3"` fi @@ -18763,8 +19128,8 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } fi if test -z "$MOZIDL"; then - { { $as_echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5 -$as_echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;} + { { $as_echo "$as_me:$LINENO: error: libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." >&5 +$as_echo "$as_me: error: libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." >&2;} { (exit 1); exit 1; }; } fi fi @@ -22581,6 +22946,12 @@ $as_echo "internal" >&6; } NEON_CFLAGS= BUILD_TYPE="$BUILD_TYPE NEON" fi + + + + +fi + if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then with_system_openssl=yes fi @@ -22707,12 +23078,6 @@ fi - - - - -fi - { $as_echo "$as_me:$LINENO: checking whether to enable agg" >&5 $as_echo_n "checking whether to enable agg... " >&6; } if test "$with_agg" = "no"; then @@ -28042,8 +28407,8 @@ KDE4_CFLAGS="" KDE4_LIBS="" MOC4="moc" if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then - qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes" - qt_libdirs="$QTLIB /usr/lib $x_libraries" + qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes" + qt_libdirs="$QT4LIB /usr/lib $x_libraries" kde_incdirs="/usr/include $x_includes" kde_libdirs="/usr/lib $x_libraries" @@ -28053,6 +28418,15 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4" fi + if test -n "$KDE4DIR" ; then + kde_incdirs="$KDE4DIR/include $kde_incdirs" + if test "$build_cpu" != "x86_64" ; then + kde_libdirs="$KDE4DIR/lib $kde_libdirs" + else + kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs" + fi + fi + qt_test_include="Qt/qobject.h" qt_test_library="libQtCore.so" kde_test_include="ksharedptr.h" @@ -28071,8 +28445,8 @@ $as_echo_n "checking for Qt4 headers... " >&6; } { $as_echo "$as_me:$LINENO: result: $qt_header_dir" >&5 $as_echo "$qt_header_dir" >&6; } if test "x$qt_header_dir" = "xno" ; then - { { $as_echo "$as_me:$LINENO: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&5 -$as_echo "$as_me: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&2;} + { { $as_echo "$as_me:$LINENO: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&5 +$as_echo "$as_me: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi @@ -28090,8 +28464,8 @@ $as_echo_n "checking for Qt4 libraries... " >&6; } $as_echo "$qt_lib_dir" >&6; } if test "x$qt_lib_dir" = "xno" ; then - { { $as_echo "$as_me:$LINENO: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&5 -$as_echo "$as_me: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&2;} + { { $as_echo "$as_me:$LINENO: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&5 +$as_echo "$as_me: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi @@ -28108,7 +28482,7 @@ else ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:$QTDIR/bin " +as_dummy="$PATH:$QT4DIR/bin " for as_dir in $as_dummy do IFS=$as_save_IFS @@ -28139,9 +28513,9 @@ fi if test "$MOC4" = "no" ; then { { $as_echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify -the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 +the root of your Qt installation by exporting QT4DIR before running \"configure\"." >&5 $as_echo "$as_me: error: Qt Meta Object Compiler not found. Please specify -the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} +the root of your Qt installation by exporting QT4DIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi @@ -28157,8 +28531,8 @@ $as_echo_n "checking for KDE4 headers... " >&6; } { $as_echo "$as_me:$LINENO: result: $kde_incdir" >&5 $as_echo "$kde_incdir" >&6; } if test "x$kde_incdir" = "xno" ; then - { { $as_echo "$as_me:$LINENO: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&5 -$as_echo "$as_me: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&2;} + { { $as_echo "$as_me:$LINENO: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&5 +$as_echo "$as_me: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi @@ -28175,8 +28549,8 @@ $as_echo_n "checking for KDE4 libraries... " >&6; } { $as_echo "$as_me:$LINENO: result: $kde_libdir" >&5 $as_echo "$kde_libdir" >&6; } if test "x$kde_libdir" = "xno" ; then - { { $as_echo "$as_me:$LINENO: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&5 -$as_echo "$as_me: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&2;} + { { $as_echo "$as_me:$LINENO: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&5 +$as_echo "$as_me: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&2;} { (exit 1); exit 1; }; } fi diff --git a/configure.cmd b/configure.cmd index 389efd2f37ff..1d847525f6f9 100755 --- a/configure.cmd +++ b/configure.cmd @@ -1,7 +1,7 @@ @echo off setlocal -SET ANT_HOME=C:\PROGRAMMI\jsdk142\apache-ant-1.7.0 -SET JAVA_HOME=C:\PROGRAMMI\jsdk142 -SET PATH=%JAVA_HOME%\bin;%PATH%;%ANT_HOME%\bin; -sh -c "configure --disable-werror --with-use-shell=4nt --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts" | tee configure.log +SET MY_ANT_HOME=e:/java150/apache-ant-1.7.0 +SET JAVA_HOME=e:\java150 +SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin; +sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=4nt --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log endlocal diff --git a/configure.in b/configure.in index 8ebcc3dc4a97..aff65d6d1583 100644 --- a/configure.in +++ b/configure.in @@ -72,10 +72,10 @@ AC_ARG_ENABLE(mozilla, version, use this option. ],,enable_mozilla="yes") AC_ARG_WITH(fonts, -[ --without-fonts Removes Bitstream Vera fonts from - openoffice.org installation set, for people building - for specific distributions where the fonts are known - to be already available +[ --without-fonts OOo includes some third-party fonts to provide a reliable + basis for help content, templates, samples, etc. + When these fonts are already known to be available on the + system then you should use this option. ],,) AC_ARG_WITH(ppds, [ --without-ppds Removes Postscript Printer definition files from @@ -676,6 +676,15 @@ AC_ARG_ENABLE(check-only, Usage: --enable-check-only=yes ],,) +AC_ARG_ENABLE(ccache-skip, +[[ --enable-ccache-skip [default=auto] allow the use of --ccache-skip to + escape compiler flags that would otherwise prevent + caching of the result (currently used on Mac only) + NOTE: requires patched version because of a bug in + ccache (see issue 104567 for details and patch) + explicitly enable if your version of ccache doesn't + identify as version 2.4_OOo +]],,enable_ccache_skip=auto) AC_ARG_WITH(lang, [ --with-lang Use this option to build OpenOffice.org with additional language support. English (US) is always @@ -2588,6 +2597,55 @@ if test "$GCC" = "yes"; then fi fi +# =================================================================== +# use --ccache-skip? +# =================================================================== +dnl used to escape compiler options for ccache that otherwise prevent +dnl caching of the results (like "-x objective-c++" for Mac) +AC_MSG_CHECKING([whether we are allowed and able to use --ccache-skip]) +if test "$_os" != "Darwin" ; then + AC_MSG_RESULT([only used on Mac currently, skipping]) +elif test "$enable_ccache_skip" = "no" ; then + AC_MSG_RESULT([no - diabled explicitly]) +elif test "$enable_ccache_skip" = "yes" ; then + AC_MSG_RESULT([yes - enabled explicitly, skipping checks]) + AC_SUBST([USE_CCACHE], [YES]) +elif test "$enable_ccache_skip" = "auto" ; then + # checking for ccache presence/version + AC_MSG_RESULT([probing...]) + AC_PATH_PROG([CCACHE],[ccache],[not_found]) + if test "$CCACHE" = "not_found" ; then + AC_MSG_NOTICE([not enabling --ccache-skip (ccache not found)]) + else + # check ccache version + AC_MSG_CHECKING([whether version of ccache is suitable]) + CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'` + if test "$CCACHE_VERSION" = "2.4_OOo"; then + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([whether ccache is actually used for the build]) + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS --ccache-skip -O2" + dnl an empty program will do, we're checking the compiler flags + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]), + [use_ccache=yes], [use_ccache=no]) + if test $use_ccache = yes ; then + AC_MSG_RESULT([yes, will enable --ccache-skip]) + AC_SUBST([USE_CCACHE], [YES]) + else + AC_MSG_RESULT([no, will not enable --ccache-skip]) + fi + CXXFLAGS=$save_CXXFLAGS + AC_LANG_POP([C++]) + else + AC_MSG_RESULT([no]) + AC_MSG_NOTICE([ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip]) + fi + fi +else + AC_MSG_ERROR([invalid option to --enable-ccache-skip. Valid values are "auto", "yes" and "no"]) +fi + dnl =================================================================== dnl system stl sanity tests dnl =================================================================== @@ -4025,8 +4083,24 @@ if test -n "$with_system_boost" -o -n "$with_system_headers" && \ AC_LANG_PUSH([C++]) AC_CHECK_HEADER(boost/shared_ptr.hpp, [], [AC_MSG_ERROR(boost/shared_ptr.hpp not found. install boost)], []) - AC_CHECK_HEADER(boost/spirit/core.hpp, [], - [AC_MSG_ERROR(boost/spirit/core.hpp not found. install boost)], []) + AC_CHECK_HEADER(boost/spirit/include/classic_core.hpp, [], + [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.38)], []) + AC_CHECK_HEADER(boost/function.hpp, [], + [AC_MSG_ERROR(boost/function.hpp not found. install boost)], []) + + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS -fno-exceptions" + AC_MSG_CHECKING([whether boost/function.hpp compiles with -fno-exceptions]) + AC_TRY_COMPILE([#include <boost/function.hpp> +], [], + ac_cv_cxx_boost_no_exceptons_broken=no, ac_cv_cxx_boost_no_exceptons_broken=yes) + + if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then + AC_MSG_ERROR([no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131]) + else + AC_MSG_RESULT([yes]) + fi + CXXFLAGS=$save_CXXFLAGS AC_LANG_POP([C++]) else AC_MSG_RESULT([internal]) @@ -4353,7 +4427,7 @@ if test "$BUILD_MOZAB" = "TRUE"; then AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found. Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. The archives can be found here: -http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/]) +ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/]) fi if test "$_os" = "WINNT"; then AC_MSG_CHECKING([for moztools binaries]) @@ -4368,9 +4442,9 @@ http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/ AC_MSG_NOTICE([checking whether mozilla can be built...]) PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build mozilla]), AC_MSG_ERROR([Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages])) else - PKG_CHECK_MODULES(MOZLIBREQ, libIDL >= 0.6.3 libIDL <= 0.6.8, MOZIDL="TRUE", MOZIDL="") + PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3, MOZIDL="TRUE", MOZIDL="") if test -z "$MOZIDL"; then - AC_MSG_ERROR([libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla.]) + AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit.]) fi fi else @@ -4721,8 +4795,14 @@ else NEON_CFLAGS= BUILD_TYPE="$BUILD_TYPE NEON" fi +AC_SUBST(SYSTEM_NEON) +AC_SUBST(NEON_VERSION) +AC_SUBST(NEON_LIBS) +AC_SUBST(NEON_CFLAGS) +fi + dnl =================================================================== -dnl Check for system openssl (only neon needs it!) +dnl Check for system openssl dnl =================================================================== if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then with_system_openssl=yes @@ -4749,12 +4829,6 @@ AC_SUBST(SYSTEM_OPENSSL) AC_SUBST(OPENSSL_CFLAGS) AC_SUBST(OPENSSL_LIBS) -AC_SUBST(SYSTEM_NEON) -AC_SUBST(NEON_VERSION) -AC_SUBST(NEON_LIBS) -AC_SUBST(NEON_CFLAGS) -fi - dnl =================================================================== dnl Test for disabling agg dnl =================================================================== @@ -6027,8 +6101,8 @@ KDE4_CFLAGS="" KDE4_LIBS="" MOC4="moc" if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then - qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes" - qt_libdirs="$QTLIB /usr/lib $x_libraries" + qt_incdirs="$QT4INC $QT4DIR /usr/include/qt4 /usr/include $x_includes" + qt_libdirs="$QT4LIB /usr/lib $x_libraries" kde_incdirs="/usr/include $x_includes" kde_libdirs="/usr/lib $x_libraries" @@ -6038,6 +6112,15 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4" fi + if test -n "$KDE4DIR" ; then + kde_incdirs="$KDE4DIR/include $kde_incdirs" + if test "$build_cpu" != "x86_64" ; then + kde_libdirs="$KDE4DIR/lib $kde_libdirs" + else + kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs" + fi + fi + qt_test_include="Qt/qobject.h" qt_test_library="libQtCore.so" kde_test_include="ksharedptr.h" @@ -6054,7 +6137,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then AC_MSG_RESULT([$qt_header_dir]) if test "x$qt_header_dir" = "xno" ; then - AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".]) + AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".]) fi AC_MSG_CHECKING([for Qt4 libraries]) @@ -6069,14 +6152,14 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then AC_MSG_RESULT([$qt_lib_dir]) if test "x$qt_lib_dir" = "xno" ; then - AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".]) + AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".]) fi dnl Check for Meta Object Compiler - AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] ) + AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] ) if test "$MOC4" = "no" ; then AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify -the root of your Qt installation by exporting QTDIR before running "configure".]) +the root of your Qt installation by exporting QT4DIR before running "configure".]) fi dnl Check for KDE4 headers @@ -6090,7 +6173,7 @@ the root of your Qt installation by exporting QTDIR before running "configure".] done AC_MSG_RESULT([$kde_incdir]) if test "x$kde_incdir" = "xno" ; then - AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".]) + AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".]) fi dnl Check for KDE4 libraries @@ -6105,7 +6188,7 @@ the root of your Qt installation by exporting QTDIR before running "configure".] AC_MSG_RESULT([$kde_libdir]) if test "x$kde_libdir" = "xno" ; then - AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".]) + AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".]) fi KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt index 50e48530e782..e5be5e4d6ea7 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt @@ -23,13 +23,13 @@ AdminNetworkLocation BannerLine Line 0 44 374 0 1 AdminNetworkLocation Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName] AdminNetworkLocation Branding2 Text 3 228 140 13 65537 [ProductName] AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back -AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 SetupPathEdit +AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19 AdminNetworkLocation DlgLine Line 145 234 229 0 1 AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20 AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21 AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel -AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 +AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse AdminWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_24 Next AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt index c5cc29d7dd61..100074c408bf 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Dialog.idt @@ -1,11 +1,11 @@ Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel s72 i2 i2 i2 i2 I4 L128 s50 S50 S50 Dialog Dialog -AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel +AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel AdminNetworkLocation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel AdminWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel CancelSetup 50 50 260 85 3 [ProductName] [Setup] No No No -CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameEdit Next Cancel +CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameLabel Next Cancel CustomSetup 50 50 374 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] Tree Next Cancel CustomSetupTips 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK DatabaseFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel @@ -13,7 +13,7 @@ DestinationFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next DiskSpaceRequirements 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retry Exit FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel -InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel +InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel InstallWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel LicenseAgreement 50 50 374 266 2 [ProductName] - [STR_INSTALLATION_WIZARD] Agree Next Cancel MaintenanceType 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index df12081ed1ef..1142348f65b8 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -23,13 +23,13 @@ AdminNetworkLocation BannerLine Line 0 44 374 0 1 AdminNetworkLocation Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName] AdminNetworkLocation Branding2 Text 3 228 88 13 65537 [ProductName] AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back -AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 SetupPathEdit +AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19 AdminNetworkLocation DlgLine Line 90 234 284 0 1 AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20 AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21 AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel -AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 +AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse AdminWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_24 Next AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt index 5636eee45f34..48f5d2aa3782 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt @@ -1,12 +1,12 @@ Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel s72 i2 i2 i2 i2 I4 L128 s50 S50 S50 Dialog Dialog -AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel +AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel AdminNetworkLocation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel AdminWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel ApplicationInfo1 50 50 260 85 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK CancelSetup 50 50 260 85 3 [ProductName] [Setup] No No No -CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameEdit Next Cancel +CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameLabel Next Cancel CustomSetup 50 50 374 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] Tree Next Cancel CustomSetupTips 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK DatabaseFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel @@ -14,7 +14,7 @@ DestinationFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next DiskSpaceRequirements 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retry Exit FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel -InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel +InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel InstallWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel LanguageInfo1 50 50 260 85 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK LanguageSelection 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt index aff3c06d6cf3..b9a811eb14d4 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt @@ -23,13 +23,13 @@ AdminNetworkLocation BannerLine Line 0 44 374 0 1 AdminNetworkLocation Branding1 Text 4 229 92 13 3 {&MSSWhiteSerif8}[ProductName] AdminNetworkLocation Branding2 Text 3 228 92 13 65537 [ProductName] AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back -AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 SetupPathEdit +AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19 AdminNetworkLocation DlgLine Line 95 234 279 0 1 AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20 AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21 AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel -AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 +AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse AdminWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_24 Next AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt index 11c035f0b30f..54a594fd9e32 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Dialog.idt @@ -1,11 +1,11 @@ Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel s72 i2 i2 i2 i2 I4 L128 s50 S50 S50 Dialog Dialog -AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel +AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel AdminNetworkLocation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel AdminWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel CancelSetup 50 50 260 85 3 [ProductName] [Setup] No No No -CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameEdit Next Cancel +CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameLabel Next Cancel CustomSetup 50 50 374 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] Tree Next Cancel CustomSetupTips 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK DatabaseFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel @@ -13,7 +13,7 @@ DestinationFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next DiskSpaceRequirements 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retry Exit FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel -InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel +InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel InstallWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel LicenseAgreement 50 50 374 266 2 [ProductName] - [STR_INSTALLATION_WIZARD] Agree Next Cancel MaintenanceType 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt index 512f2d355785..61fdd63907fc 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/Control.idt @@ -23,13 +23,13 @@ AdminNetworkLocation BannerLine Line 0 44 374 0 1 AdminNetworkLocation Branding1 Text 4 229 32 13 3 {&MSSWhiteSerif8}[ProductName] AdminNetworkLocation Branding2 Text 3 228 32 13 65537 [ProductName] AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back -AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 SetupPathEdit +AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19 AdminNetworkLocation DlgLine Line 35 234 339 0 1 AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20 AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21 AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel -AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 +AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse AdminWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_24 Next AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt index 11c035f0b30f..54a594fd9e32 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/Dialog.idt @@ -1,11 +1,11 @@ Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel s72 i2 i2 i2 i2 I4 L128 s50 S50 S50 Dialog Dialog -AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel +AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel AdminNetworkLocation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel AdminWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel CancelSetup 50 50 260 85 3 [ProductName] [Setup] No No No -CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameEdit Next Cancel +CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameLabel Next Cancel CustomSetup 50 50 374 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] Tree Next Cancel CustomSetupTips 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK DatabaseFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel @@ -13,7 +13,7 @@ DestinationFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next DiskSpaceRequirements 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retry Exit FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel -InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Tail OK Cancel +InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel InstallWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel LicenseAgreement 50 50 374 266 2 [ProductName] - [STR_INSTALLATION_WIZARD] Agree Next Cancel MaintenanceType 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index fa9e97e5516e..23face9e04ca 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -99,7 +99,7 @@ xxxx: echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml .IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"=="" -ALLTAR : $(LOCALPYFILES) +#ALLTAR : $(LOCALPYFILES) @echo "No EPM: do no packaging at this stage" .ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"=="" .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" @@ -348,9 +348,9 @@ openoffice: .IF "$(LOCALPYFILES)"!="" .IF "$(PKGFORMAT)"=="" -$(foreach,i,$(alllangiso) openoffice_$i openofficewithjre_$i openofficedev_$i broffice_$i brofficewithjre_$i brofficedev_$i ooolanguagepack_$i ooodevlanguagepack_$i sdkoo_$i) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py +$(foreach,i,$(alllangiso) openoffice_$i openofficewithjre_$i openofficedev_$i broffice_$i brofficewithjre_$i brofficedev_$i sdkoo_$i) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py .ELSE # "$(PKGFORMAT)"=="" -$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".")} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} ooolanguagepack_$i{$(PKGFORMAT:^".")} ooodevlanguagepack_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py +$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".")} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py .ENDIF # "$(PKGFORMAT)"=="" .ENDIF # "$(LOCALPYFILES)"!="" diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst index 200bf3708f5a..9f5fbfd93246 100755 --- a/instsetoo_native/util/pack.lst +++ b/instsetoo_native/util/pack.lst @@ -19,6 +19,6 @@ OpenOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci1 #URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de ooolanguagepack OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi de ooolanguagepack -OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro de|fr|ja|ar ooodevlanguagepack +OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de|fr|ja|ar ooodevlanguagepack #BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR broolanguagepack diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index a6e2eba60361..62b569e8f730 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -902,6 +902,11 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators HostName = "Accelerators"; End +Directory gid_Dir_Share_Registry_Modules_Oo_Office_Paths + ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; + HostName = "Paths"; +End + Directory gid_Dir_Share_Registry_Modules_Oo_Office_Common ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; HostName = "Common"; diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 442c688a171d..59d829b29830 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -40,54 +40,54 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSansBold.ttf, DejaVu Sans Bold) +STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSansOblique.ttf, DejaVu Sans Oblique) +STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSansBoldOblique.ttf, DejaVu Sans Bold Oblique) +STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique) #endif // DejaVuSans ExtraLight #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSansExtraLight.ttf, DejaVu Sans ExtraLight) +STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSans-ExtraLight.ttf, DejaVu Sans ExtraLight) #endif // DejaVuSans Condensed #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuCondensedSans.ttf, DejaVu Sans Condensed) +STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuCondensedSansBold.ttf, DejaVu Sans Condensed Bold) +STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuCondensedSansOblique.ttf, DejaVu Sans Condensed Oblique) +STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuCondensedSansBoldOblique.ttf, DejaVu Sans Condensed Bold Oblique) +STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique) #endif // DejaVuSans Mono #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuMonoSans.ttf, DejaVu Sans Mono) +STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuSansMono.ttf, DejaVu Sans Mono) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuMonoSansBold.ttf, DejaVu Sans Mono Bold) +STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuMonoSansOblique.ttf, DejaVu Sans Mono Oblique) +STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuMonoSansBoldOblique.ttf, DejaVu Sans Mono Bold Oblique) +STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuSansMono-BoldOblique.ttf, DejaVu Sans Mono Bold Oblique) #endif // DejaVuSerif Proportional @@ -96,32 +96,23 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerif, DejaVuSerif.ttf, DejaVu Serif) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerifBold.ttf, DejaVu Serif Bold) +STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerifItalic.ttf, DejaVu Serif Italic) +STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic) #endif #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerifBoldItalic.ttf, DejaVu Serif Bold Italic) +STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerif-BoldItalic.ttf, DejaVu Serif Bold Italic) #endif // DejaVuSerif Condensed #ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuCondensedSerif.ttf, DejaVu Serif Condensed) -#endif - -#ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuCondensedSerifBold.ttf, DejaVu Serif Condensed Bold) -#endif - -#ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuCondensedSerifItalic.ttf, DejaVu Serif Condensed Italic) -#endif - -#ifndef WITHOUT_FONTS -STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuCondensedSerifBoldItalic.ttf, DejaVu Serif Condensed Bold Italic) +STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, DejaVu Serif Condensed) +STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold) +STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuSerifCondensed-Italic.ttf, DejaVu Serif Condensed Italic) +STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic) #endif @@ -201,3 +192,20 @@ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic) #endif #endif + +// Gentium fonts + +#ifndef WITHOUT_FONTS +STD_FONT_FILE( gid_File_Fnt_GentiumBasicRegular, GenBasR.ttf, Gentium Basic) +STD_FONT_FILE( gid_File_Fnt_GentiumBasicBold, GenBasB.ttf, Gentium Basic Bold) +STD_FONT_FILE( gid_File_Fnt_GentiumBasicItalic, GenBasI.ttf, Gentium Basic Bold) +STD_FONT_FILE( gid_File_Fnt_GentiumBasicBoldItalic, GenBasBI.ttf, Gentium Basic Bold Italic) +#endif + +#ifndef WITHOUT_FONTS +STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicRegular, GenBkBasR.ttf, Gentium Book Basic) +STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBold, GenBkBasB.ttf, Gentium Book Basic Bold) +STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book Basic Bold) +STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic) +#endif + diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 4508d303be7f..1a28d5d71d9d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: file_library_ooo.scp,v $ - * $Revision: 1.303.16.2 $ * * This file is part of OpenOffice.org. * @@ -818,17 +817,6 @@ End #endif -File gid_File_Lib_J - TXT_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT5(lib,j,DLLPOSTFIX,_g,UNXSUFFIX)); - #else - Name = STRING(CONCAT4(j,DLLPOSTFIX,_g,.dll)); - #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); -End - #ifdef SOLAR_JAVA STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc) @@ -1001,7 +989,7 @@ File gid_File_Lib_Mozbootstrap #ifdef UNX Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX)); #else - Name = "libmozbootstrap.dll"; + Name = "mozbootstrap.dll"; #endif End @@ -1213,6 +1201,12 @@ STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload) SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno ) #if defined(UNX) && ! defined(QUARTZ) +File gid_File_Lib_Desktop_Detector + Name = LIBNAME(desktop_detector); + TXT_FILE_BODY; + Styles = (PACKED,PATCH); + Dir = SCP2_OOO_BIN_DIR; +End File gid_File_Lib_Vclplug_Gen Name = LIBNAME(vclplug_gen); TXT_FILE_BODY; @@ -1492,21 +1486,15 @@ STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui) STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword ) +#if ! defined UNX File gid_File_Lib_Sysdtrans TXT_FILE_BODY; Styles = (PACKED,PATCH,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - #ifdef QUARTZ - Name = STRING(CONCAT3(libdtransaqua,DLLPOSTFIX,UNXSUFFIX)); - #else - Name = STRING(CONCAT3(libdtransX11,DLLPOSTFIX,UNXSUFFIX)); - #endif - #else Name = "sysdtrans.dll"; - #endif End +#endif SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno ) SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno ) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 211a473c00aa..519a2f865a38 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -456,12 +456,6 @@ STD_JAR_FILE( gid_File_Jar_Bsh, bsh ) #endif #ifdef SOLAR_JAVA - -STD_JAR_FILE( gid_File_Jar_Classes, classes ) - -#endif - -#ifdef SOLAR_JAVA #ifndef SYSTEM_LUCENE STD_JAR_FILE( gid_File_Jar_Lucene_Core, lucene-core-2.3 ) STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 ) @@ -1393,7 +1387,6 @@ File gid_File_Oo_Office_Extendedcolorscheme_Xcs Name = "/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs"; End - File gid_File_Oo_Office_Paths_Xcs TXT_FILE_BODY; Styles = (PACKED); @@ -2252,6 +2245,17 @@ File gid_File_Registry_Spool_Oo_Accelerators_System_Xcu #endif End +File gid_File_Oo_Office_Paths_System_Xcu + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Paths; +#ifdef MACOSX + Name = "/registry/spool/org/openoffice/Office/Paths-macosx.xcu"; +#else + Name = "/registry/spool/org/openoffice/Office/Paths-unxwnt.xcu"; +#endif +End + File gid_File_Registry_Spool_Oo_Common_System_Xcu TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 3a002f04da10..5fbcbdda7107 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -371,10 +371,10 @@ en-US = "Icelandic" en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION" [STR_NAME_MODULE_LANGPACK_NB] -en-US = "Norwegian (Bokmal)" +en-US = "Norwegian (Bokmål)" [STR_DESC_MODULE_LANGPACK_NB] -en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs Norwegian (Bokmål) support in %PRODUCTNAME %PRODUCTVERSION" [STR_NAME_MODULE_LANGPACK_NN] en-US = "Norwegian (Nynorsk)" diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 92a1d704c650..427f698bd467 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -41,7 +41,11 @@ WindowsCustomAction gid_Customaction_InstallRuntime End ScpAction scp_Copy_vcredist_x86 + #if defined(BUILD_SPECIAL) + Copy = "vcredist_x86_9.0.21022.218.exe"; + #else Copy = "vcredist_x86.exe"; + #endif Name = "vcredist_x86.exe"; Subdir = "redist"; End diff --git a/set_soenv.in b/set_soenv.in index ed9603d9f13f..1a7fdc7d0da8 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1808,6 +1808,7 @@ ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" ); ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS", "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" ); ToFile( "CXX", $CXX, "e" ); +ToFile( "USE_CCACHE", "@USE_CCACHE@", "e" ); ToFile( "MINGWCXX", "@MINGWCXX@", "e" ); ToFile( "MINGWSTRIP", "@MINGWSTRIP@", "e" ); ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" ); diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index c9c29bf40b72..fba2336f8852 100644 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -890,17 +890,7 @@ sub CorrectPath { sub check_dmake { #print "Checking dmake..."; -# my $dmake_batch = CorrectPath("$tmp_dir/dmake.bat"); - if ($QuantityToBuild && ($ENV{GUI} eq 'WNT') && ($ENV{USE_SHELL} eq '4nt')) { - if (open(DMAKEVERSION, "where dmake |")) { - my @output = <DMAKEVERSION>; - close DMAKEVERSION; - $dmake_bin = $output[0]; - $dmake_bin =~ /(\b)$/; - $dmake_bin = $`; - }; - return if (-e $dmake_bin); - } elsif (open(DMAKEVERSION, "dmake -V |")) { + if (open(DMAKEVERSION, "dmake -V |")) { # if (open(DMAKEVERSION, "dmake -V |")) { my @dmake_version = <DMAKEVERSION>; close DMAKEVERSION; @@ -1797,8 +1787,8 @@ sub do_custom_job { } else { $error_code = run_job($job, $module_paths{$module}, $module_job); if ($error_code) { - # give windows (4nt) one more chance - if ($ENV{GUI} eq 'WNT' && !$cygwin) { + # give windows one more chance + if ($ENV{GUI} eq 'WNT') { $error_code = run_job($job, $module_paths{$module}, $module_job); }; }; @@ -1955,14 +1945,14 @@ sub clear_module { my $dir = CorrectPath($module_paths{$module}.'/'.$_); if ((!-d $dir.'/.svn') && is_output_tree($dir)) { #print "I would delete $dir\n"; - rmtree("$dir", 0, 1) if ($ENV{USE_SHELL} ne '4nt'); + rmtree("$dir", 0, 1); if (-d $dir) { system("$remove_command $dir"); if (-d $dir) { push(@warnings, "Cannot delete $dir"); #print_error("Cannot delete $dir"); } else { - print STDERR (">>> Removed $dir by force\n") if ($ENV{USE_SHELL} ne '4nt'); + print STDERR (">>> Removed $dir by force\n"); }; }; }; diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl index 3d37654c7534..8c8151f0a9b8 100755 --- a/solenv/bin/build_client.pl +++ b/solenv/bin/build_client.pl @@ -330,9 +330,6 @@ sub do_job { if (defined $job_hash{setenv_string}) { # use configuration string from server $setenv_string .= $job_hash{setenv_string}; - if ((defined $ENV{USE_SHELL}) && ($ENV{USE_SHELL} eq '4nt')) { - $cmd_file .= '.btm'; - }; print "Environment: $setenv_string\n"; my $directory = $job_hash{job_dir}; @@ -349,19 +346,11 @@ sub do_job { print COMMAND_FILE "pushd $job_hash{job_dir} && "; print COMMAND_FILE $job_hash{job} ." >& $tmp_log_file\n"; - if ((defined $ENV{USE_SHELL}) && ($ENV{USE_SHELL} eq '4nt')) { - print COMMAND_FILE "exit %?\n"; - } else { - print COMMAND_FILE "exit \$?\n"; - }; + print COMMAND_FILE "exit \$?\n"; close COMMAND_FILE; $job_temp_files{$cmd_file} = 0; $job_temp_files{$tmp_log_file} = $job_hash{log}; - if ((defined $ENV{USE_SHELL}) && ($ENV{USE_SHELL} eq '4nt')) { - $error_code = system($ENV{COMSPEC}, '/c', $cmd_file); - } else { - $error_code = system($ENV{SHELL}, $cmd_file); - }; + $error_code = system($ENV{SHELL}, $cmd_file); unlink $cmd_file or system("rm -rf $cmd_file"); delete $job_temp_files{$cmd_file}; } else { @@ -411,22 +400,6 @@ sub get_setsolar_environment { my $error_code = 0; my $cmd_file = File::Temp::tmpnam($ENV_BACKUP{TMP}); my $tmp_log_file = File::Temp::tmpnam($ENV_BACKUP{TMP}); - if ((defined $ENV{USE_SHELL}) && ($ENV{USE_SHELL} eq '4nt')) { - my $setsolar = $ENV{ENV_ROOT} . '/etools/setsolar.pl'; - $setsolar_string =~ s/^(\S+\s)\S+/$1$setsolar/; #replace the use of the local script with generic setsolar - $cmd_file .= '.btm'; - my $setsolar_tmp_file = File::Temp::tmpnam($ENV_BACKUP{TMP}); - $setsolar_tmp_file .= '.btm'; - open (COMMAND_FILE, ">$setsolar_tmp_file") or return $?; - print COMMAND_FILE "set SOURCE_ROOT=$$job_hash{source_root}\n" if ($$job_hash{source_root}); - print COMMAND_FILE "unset UPDATER\n" if (!defined $$job_hash{updater}); - print COMMAND_FILE "$setsolar_string -file $cmd_file"; - close COMMAND_FILE; - $error_code = system($ENV{COMSPEC}, '/c', $setsolar_tmp_file); - unlink $setsolar_tmp_file or system("rm -rf $setsolar_tmp_file"); - store_env_hash($cmd_file); - return $error_code; - }; if (defined $$job_hash{updater}) { $ENV{UPDATER} = $$job_hash{updater}; } else { @@ -454,20 +427,11 @@ sub store_env_hash { my $env_vars_file = File::Temp::tmpnam($ENV_BACKUP{TMP}); print "$cmd_file $env_vars_file\n"; #get all env variables in $env_vars_file - if ((defined $ENV{USE_SHELL}) && ($ENV{USE_SHELL} eq '4nt')) { - $cmd_file .= '.btm'; - open (COMMAND_FILE, ">$cmd_file"); - print COMMAND_FILE "call $ss_setenv_file\n"; - print COMMAND_FILE "set > $env_vars_file\n"; - close COMMAND_FILE; - system($ENV{COMSPEC}, '/c', $cmd_file); - } else { - open (COMMAND_FILE, ">$cmd_file"); - print COMMAND_FILE "source $ss_setenv_file\n"; - print COMMAND_FILE "env > $env_vars_file\n"; - close COMMAND_FILE; - system($ENV{SHELL}, $cmd_file); - }; + open (COMMAND_FILE, ">$cmd_file"); + print COMMAND_FILE "source $ss_setenv_file\n"; + print COMMAND_FILE "env > $env_vars_file\n"; + close COMMAND_FILE; + system($ENV{SHELL}, $cmd_file); print_error($?) if ($?); unlink $cmd_file or system("rm -rf $cmd_file"); unlink $ss_setenv_file or system("rm -rf $ss_setenv_file"); diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl index 4a50eb891636..0d297e289b3f 100755 --- a/solenv/bin/installoffice.pl +++ b/solenv/bin/installoffice.pl @@ -115,7 +115,7 @@ our $bootstrapiniTemp ; our $packpackage ; our $user; -if (($gui eq "WNT") and ($ENV{USE_SHELL} ne "4nt")) { +if ($gui eq "WNT") { $gui = $cygwin; } diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl index 6970ad275c3f..f7e5193a3ec4 100644 --- a/solenv/bin/mhids.pl +++ b/solenv/bin/mhids.pl @@ -143,10 +143,6 @@ $workfile = "$tmpdir/${filebase}_".$$; # now get $workfile ready for shell usage... $shell_workfile = $workfile; -$shell_workfile =~ s/\//\\/g if ( "$ENV{USE_SHELL}" eq "4nt" ); -if (( "$ENV{USE_SHELL}" eq "4nt" ) && ( "$^O" eq "cygwin" )) { - $shell_workfile =~ s/\//\\\\/; -} print "workfile: $workfile\n"; diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm index 814b8f6abd27..72901448598a 100644 --- a/solenv/bin/modules/installer/converter.pm +++ b/solenv/bin/modules/installer/converter.pm @@ -92,12 +92,10 @@ sub convert_stringlist_into_array_without_linebreak_and_quotes { $first = $1; $last = $2; - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; } $first =~ s/\"//g; push(@newarray, $first); } - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; } $last =~ s/\"//g; push(@newarray, $last); @@ -121,13 +119,11 @@ sub convert_stringlist_into_array { $first = $1; $last = $2; - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; } # Problem with two directly following listseparators. For example a path with two ";;" directly behind each other $first =~ s/^$listseparator//; push(@newarray, "$first\n"); } - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; } push(@newarray, "$last\n"); return \@newarray; @@ -150,11 +146,9 @@ sub convert_stringlist_into_array_without_newline { $first = $1; $last = $2; - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; } push(@newarray, "$first"); } - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; } push(@newarray, "$last"); return \@newarray; @@ -177,11 +171,9 @@ sub convert_stringlist_into_hash { $first = $1; $last = $2; - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; } $newhash{$first} = 1; } - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; } $newhash{$last} = 1; return \%newhash; @@ -204,11 +196,9 @@ sub convert_whitespace_stringlist_into_array { $first = $1; $last = $2; - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; } push(@newarray, "$first\n"); } - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; } push(@newarray, "$last\n"); return \@newarray; diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 07062d306e11..4fbe8d4255f8 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -1531,7 +1531,7 @@ sub get_path_to_nsis_sdk # do we have nsis already in path ? @paths = split(/:/, $ENV{'PATH'}); foreach $paths (@paths) { - $path =~ s/[\/\\]+$//; # remove trailing slashes; + $paths =~ s/[\/\\]+$//; # remove trailing slashes; $nsispath = $paths . "/nsis"; if ( -x $nsispath ) { @@ -1548,11 +1548,11 @@ sub get_path_to_nsis_sdk $nsispath = $ENV{'NSISSDK_SOURCE'}; # overriding the NSIS SDK with NSISSDK_SOURCE } - if( ($^O =~ /cygwin/i) and $nsispath =~ /\\/ ) { - # We need a POSIX path for W32-4nt-cygwin-perl - $nsispath =~ s/\\/\\\\/g; - chomp( $nsispath = qx{cygpath -u "$nsispath"} ); - } +# if( ($^O =~ /cygwin/i) and $nsispath =~ /\\/ ) { +# # We need a POSIX path for W32-4nt-cygwin-perl +# $nsispath =~ s/\\/\\\\/g; +# chomp( $nsispath = qx{cygpath -u "$nsispath"} ); +# } if ( $nsispath eq "" ) { diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 1fbd06f2a99d..8b8a7aa2bafb 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -453,8 +453,9 @@ sub create_epm_header if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find license file $licensefilename!", "create_epm_header"); } - # Special handling to add the content of the file "license_en-US" to the solaris copyrightfile - if ( $installer::globals::issolarispkgbuild ) + # Special handling to add the content of the file "license_en-US" to the solaris copyrightfile. But not for all products + + if (( $installer::globals::issolarispkgbuild ) && ( ! $variableshashref->{'NO_LICENSE_INTO_COPYRIGHT'} )) { if ( ! $installer::globals::englishlicenseset ) { installer::worker::set_english_license() } @@ -3113,7 +3114,7 @@ sub put_systemintegration_into_installset if ( ! $installer::globals::issolarispkgbuild ) { ($newcontent, $subdir) = control_subdirectories($newcontent); } # Adding license content into Solaris packages - if (( $installer::globals::issolarispkgbuild ) && ( $installer::globals::englishlicenseset )) { installer::worker::add_license_into_systemintegrationpackages($destdir, $newcontent); } + if (( $installer::globals::issolarispkgbuild ) && ( $installer::globals::englishlicenseset ) && ( ! $variableshashref->{'NO_LICENSE_INTO_COPYRIGHT'} )) { installer::worker::add_license_into_systemintegrationpackages($destdir, $newcontent); } if (( $installer::globals::isxpdplatform ) && ( $allvariables->{'XPDINSTALLER'} )) { diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm index 128dbcd9ed7e..0a1ef456adcb 100644 --- a/solenv/bin/modules/installer/followme.pm +++ b/solenv/bin/modules/installer/followme.pm @@ -145,22 +145,18 @@ sub read_followme_info if ( $line =~ /^\s*finalinstalldir:\s*(.*?)\s*$/ ) { $finalinstalldir = $1; } if( $^O =~ /cygwin/i ) { $finalinstalldir =~ s/\\/\//; } - if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $finalinstalldir =~ s/\//\\/; } if ( $line =~ /^\s*downloadname:\s*(.*?)\s*$/ ) { $downloadname = $1; } if ( $line =~ /^\s*currentinstallnumber:\s*(.*?)\s*$/ ) { $currentinstallnumber = $1; } if ( $line =~ /^\s*loggingdir:\s*(.*?)\s*$/ ) { $loggingdir = $1; } if( $^O =~ /cygwin/i ) { $loggingdir =~ s/\\/\//; } - if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $loggingdir =~ s/\//\\/; } if ( $line =~ /^\s*installlogdir:\s*(.*?)\s*$/ ) { $installlogdir = $1; } if( $^O =~ /cygwin/i ) { $installlogdir =~ s/\\/\//; } - if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installlogdir =~ s/\//\\/; } if ( $line =~ /^\s*languagestring:\s*(.*?)\s*$/ ) { $languagestring = $1; } if ( $line =~ /^\s*languagesarray:\s*(.*?)\s*$/ ) { push(@languagesarray, $1); } if ( $line =~ /^\s*includepatharray:\s*(.*?)\s*$/ ) { my $path = $1; if( $^O =~ /cygwin/i ) { $path =~ s/\\/\//; } - if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $path =~ s/\//\\/; } push(@includepatharray, $path . "\n"); } if ( $line =~ /^\s*allvariableshash:\s*(.*?)\s*:\s*(.*?)\s*$/ ) { $allvariableshash{$1} = $2; } @@ -189,13 +185,10 @@ sub read_followme_info if ( $name eq "islinux" ) { $installer::globals::islinux = $value; } if ( $name eq "unpackpath" ) { $installer::globals::unpackpath = $value; } if( $^O =~ /cygwin/i ) { $installer::globals::unpackpath =~ s/\\/\//; } - if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installer::globals::unpackpath =~ s/\//\\/; } if ( $name eq "idttemplatepath" ) { $installer::globals::idttemplatepath = $value; } if( $^O =~ /cygwin/i ) { $installer::globals::idttemplatepath =~ s/\\/\//; } - if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installer::globals::idttemplatepath =~ s/\//\\/; } if ( $name eq "idtlanguagepath" ) { $installer::globals::idtlanguagepath = $value; } if( $^O =~ /cygwin/i ) { $installer::globals::idtlanguagepath =~ s/\\/\//; } - if (( $^O =~ /MSWin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" )) { $installer::globals::idtlanguagepath =~ s/\//\\/; } if ( $name eq "logfilename" ) { $installer::globals::logfilename = $value; } if ( $name eq "product" ) { $installer::globals::product = $value; } if ( $name eq "patch" ) { $installer::globals::patch = $value; } diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 8b5f13c7ae5b..cde8204972f9 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -483,33 +483,7 @@ BEGIN $plat = $^O; - if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" ))) - { - $zippath= "zip.exe"; # Has to be in the path: r:\btw\zip.exe - $checksumfile = "so_checksum.exe"; - $unopkgfile = "unopkg.exe"; - if ( $plat =~ /cygwin/i ) - { - $separator = "/"; - $pathseparator = "\:"; - $quote = "\'"; - } - else - { - $separator = "\\"; - $pathseparator = "\;"; - $quote = "\""; - } - $libextension = "\.dll"; - $isunix = 0; - $iswin = 1; - $archiveformat = ".zip"; - %savedmapping = (); - %savedrevmapping = (); - %savedrev83mapping = (); - %saved83dirmapping = (); - } - elsif (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} ne "4nt" )) + if ( $plat =~ /cygwin/i ) { $zippath = "zip"; # Has to be in the path: /usr/bin/zip $checksumfile = "so_checksum"; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index e4fb19f0c537..a0d91954ddb5 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -49,7 +49,7 @@ sub usage print <<Ende; -------------------------------------------------------------------------------- -$installer::globals::prog V1.0 (c) Ingo Schmidt 2003 +$installer::globals::prog The following parameter are needed: -f: Path to the product list (required) -s: Path to the setup script (optional, if defined in product list) diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 204c009141c6..5f02acab8e81 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1241,6 +1241,8 @@ sub get_Source_Directory_For_Files_From_Includepathlist if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; } if (( $styles =~ /\bSTARREGISTRY\b/ ) || ( $styles =~ /\bFILE_CAN_MISS\b/ )) { $file_can_miss = 1; } + if (( $installer::globals::languagepack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))) { $file_can_miss = 1; } + my $sourcepathref = ""; if ( $file_can_miss ) { $sourcepathref = get_sourcepath_from_filename_and_includepath(\$onefilename, $includepatharrayref, 0); } @@ -1370,13 +1372,39 @@ sub remove_Files_Without_Sourcedirectory if ( ! ( $styles =~ /\bSTARREGISTRY\b/ )) # StarRegistry files will be created later { my $filename = $onefile->{'Name'}; - $infoline = "ERROR: Removing file $filename from file list.\n"; - push( @installer::globals::logfileinfo, $infoline); - push(@missingfiles, "ERROR: File not found: $filename\n"); - $error_occured = 1; + if ( ! $installer::globals::languagepack ) + { + $infoline = "ERROR: Removing file $filename from file list.\n"; + push( @installer::globals::logfileinfo, $infoline); + + push(@missingfiles, "ERROR: File not found: $filename\n"); + $error_occured = 1; + + next; # removing this file from list, if sourcepath is empty + } + else # special case for language packs + { + if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ )) + { + $infoline = "ERROR: Removing file $filename from file list.\n"; + push( @installer::globals::logfileinfo, $infoline); + + push(@missingfiles, "ERROR: File not found: $filename\n"); + $error_occured = 1; + + next; # removing this file from list, if sourcepath is empty + } + else + { + $infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n"; + push( @installer::globals::logfileinfo, $infoline); + $infoline = "INFO: It is not language dependent and can be ignored in language packs.\n"; + push( @installer::globals::logfileinfo, $infoline); - next; # removing this file from list, if sourcepath is empty + next; # removing this file from list, if sourcepath is empty + } + } } } diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm index 631db68da9dd..f0afea5583a6 100644 --- a/solenv/bin/modules/installer/servicesfile.pm +++ b/solenv/bin/modules/installer/servicesfile.pm @@ -274,7 +274,7 @@ sub fix_cygwin_path { my ( $path ) = @_; - if ( $installer::globals::iswin eq 1 && $ENV{'USE_SHELL'} ne "4nt" && $installer::globals::wrapcmd eq "" ) + if ( $installer::globals::iswin eq 1 && $installer::globals::wrapcmd eq "" ) { $path = qx{cygpath -m "$path"}; chomp($path); @@ -293,7 +293,7 @@ sub get_source_path_cygwin_safe my ( $name, $array, $int ) = @_; my $ret = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$name, $array, $int); - if ( $installer::globals::iswin eq 1 && $ENV{'USE_SHELL'} ne "4nt" ) + if ( $installer::globals::iswin eq 1 ) { if( substr( $$ret, 1,1 ) eq ":" ) { @@ -523,7 +523,7 @@ sub prepare_classpath_for_java_registration if ( $ENV{'CLASSPATH'} ) { $oldclasspathstring = $ENV{'CLASSPATH'}; } else { $oldclasspathstring = "\."; } my $classpathstring = $$jarfileref . $local_pathseparator . $oldclasspathstring; - if (( $^O =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} ne "4nt" )) { + if ( $^O =~ /cygwin/i ) { $classpathstring =~ s/\//\\/g; # guw.pl likes '\' in $PATH. } $ENV{'CLASSPATH'} = $classpathstring; @@ -933,12 +933,12 @@ sub create_services_rdb # my $servicesdir = installer::systemactions::create_directories($servicesname, $languagestringref); my $servicesdir = installer::systemactions::create_directories($uniquedirname, $languagestringref); - if ( $^O =~ /cygwin/i && $ENV{'USE_SHELL'} eq "4nt" ) - { # $servicesdir is used as a parameter for regcomp and has to be DOS style - $servicesdir = qx{cygpath -d "$servicesdir"}; - chomp($servicesdir); - $servicesdir =~ s/\\/\//g; - } +# if ( $^O =~ /cygwin/i ) +# { # $servicesdir is used as a parameter for regcomp and has to be DOS style +# $servicesdir = qx{cygpath -d "$servicesdir"}; +# chomp($servicesdir); +# $servicesdir =~ s/\\/\//g; +# } push(@installer::globals::removedirs, $servicesdir); diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm index 4ed369d625e5..ba04d1085532 100644 --- a/solenv/bin/modules/installer/systemactions.pm +++ b/solenv/bin/modules/installer/systemactions.pm @@ -59,11 +59,7 @@ sub create_directory $infoline = "\nCreated directory: $directory\n"; push(@installer::globals::logfileinfo, $infoline); - if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" ) - { - my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1"; - system($localcall); - } + my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1"; } else { @@ -89,11 +85,8 @@ sub create_directory $infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n"; push(@installer::globals::logfileinfo, $infoline); - if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" ) - { - my $localcall = "chmod 775 $parentdir \>\/dev\/null 2\>\&1"; - system($localcall); - } + my $localcall = "chmod 775 $parentdir \>\/dev\/null 2\>\&1"; + system($localcall); } else { @@ -122,11 +115,8 @@ sub create_directory $infoline = "\nAttention: Created directory \"$directory\" in the second try.\n"; push(@installer::globals::logfileinfo, $infoline); - if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" ) - { - my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1"; - system($localcall); - } + my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1"; + system($localcall); } else { @@ -177,11 +167,8 @@ sub create_directory_with_privileges $infoline = "\nCreated directory: $directory\n"; push(@installer::globals::logfileinfo, $infoline); - if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" ) - { - my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1"; - system($localcall); - } + my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1"; + system($localcall); } else { @@ -207,11 +194,8 @@ sub create_directory_with_privileges $infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n"; push(@installer::globals::logfileinfo, $infoline); - if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" ) - { - my $localcall = "chmod $privileges $parentdir \>\/dev\/null 2\>\&1"; - system($localcall); - } + my $localcall = "chmod $privileges $parentdir \>\/dev\/null 2\>\&1"; + system($localcall); } else { @@ -240,11 +224,8 @@ sub create_directory_with_privileges $infoline = "\nAttention: Created directory \"$directory\" in the second try.\n"; push(@installer::globals::logfileinfo, $infoline); - if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" ) - { - my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1"; - system($localcall); - } + my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1"; + system($localcall); } else { @@ -272,11 +253,8 @@ sub create_directory_with_privileges $infoline = "\nAlready existing directory, did not create: $directory\n"; push(@installer::globals::logfileinfo, $infoline); - if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" ) - { - my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1"; - system($localcall); - } + my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1"; + system($localcall); } } @@ -1423,11 +1401,8 @@ sub try_to_create_directory $infoline = "\nCreated directory: $directory\n"; push(@installer::globals::logfileinfo, $infoline); - if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" ) - { - my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1"; - system($localcall); - } + my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1"; + system($localcall); } else { diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index bac79e83d2e1..6c49a8db3cf2 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -1697,12 +1697,10 @@ sub include_cabs_into_msi $msifilename = installer::converter::make_path_conform($msifilename); - if ( $ENV{'USE_SHELL'} ne "4nt" ) { - # msidb.exe really wants backslashes. (And double escaping because system() expands the string.) - $idtdirbase =~ s/\//\\\\/g; - $msifilename =~ s/\//\\\\/g; - $extraslash = "\\"; - } + # msidb.exe really wants backslashes. (And double escaping because system() expands the string.) + $idtdirbase =~ s/\//\\\\/g; + $msifilename =~ s/\//\\\\/g; + $extraslash = "\\"; my $allcabfiles = installer::systemactions::find_file_with_file_extension("cab", $installdir); diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm index 83404388d611..ecefbd9fd1f8 100644 --- a/solenv/bin/modules/installer/windows/sign.pm +++ b/solenv/bin/modules/installer/windows/sign.pm @@ -583,10 +583,8 @@ sub extract_cabs_from_database my $fullsuccess = 1; my $msidb = "msidb.exe"; # Has to be in the path - if ( $ENV{'USE_SHELL'} ne "4nt" ) { - # msidb.exe really wants backslashes. (And double escaping because system() expands the string.) - $msidatabase =~ s/\//\\\\/g; - } + # msidb.exe really wants backslashes. (And double escaping because system() expands the string.) + $msidatabase =~ s/\//\\\\/g; foreach my $onefile ( keys %{$allcabfiles} ) { @@ -617,10 +615,8 @@ sub include_cabs_into_database my $fullsuccess = 1; my $msidb = "msidb.exe"; # Has to be in the path - if ( $ENV{'USE_SHELL'} ne "4nt" ) { - # msidb.exe really wants backslashes. (And double escaping because system() expands the string.) - $msidatabase =~ s/\//\\\\/g; - } + # msidb.exe really wants backslashes. (And double escaping because system() expands the string.) + $msidatabase =~ s/\//\\\\/g; foreach my $onefile ( keys %{$allcabfiles} ) { diff --git a/solenv/bin/modules/packager/globals.pm b/solenv/bin/modules/packager/globals.pm index f1581126ef24..85bd58fef690 100644 --- a/solenv/bin/modules/packager/globals.pm +++ b/solenv/bin/modules/packager/globals.pm @@ -49,18 +49,9 @@ BEGIN $plat = $^O; - if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" ))) - { - $separator = "\\"; - $iswin = 1; - $isunix = 0; - } - else - { - $separator = "/"; - $iswin = 0; - $isunix = 1; - } + $separator = "/"; + $iswin = 0; + $isunix = 1; } diff --git a/solenv/bin/modules/par2script/globals.pm b/solenv/bin/modules/par2script/globals.pm index dbadb5462f06..1968b1907bda 100644 --- a/solenv/bin/modules/par2script/globals.pm +++ b/solenv/bin/modules/par2script/globals.pm @@ -69,20 +69,10 @@ BEGIN $plat = $^O; - if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" ))) - { - $separator = "\\"; - $pathseparator = "\;"; - $isunix = 0; - $iswin = 1; - } - else - { - $separator = "/"; - $pathseparator = "\:"; - $isunix = 1; - $iswin = 0; - } + $separator = "/"; + $pathseparator = "\:"; + $isunix = 1; + $iswin = 0; $islinux = 0; $issolaris = 0; diff --git a/solenv/bin/modules/par2script/parameter.pm b/solenv/bin/modules/par2script/parameter.pm index 982a4ae51b6b..d24b2ea9e641 100644 --- a/solenv/bin/modules/par2script/parameter.pm +++ b/solenv/bin/modules/par2script/parameter.pm @@ -53,7 +53,7 @@ sub usage print <<Ende; -------------------------------------------------------------- -$par2script::globals::prog V1.0 (c) Ingo Schmidt 2003 +$par2script::globals::prog The following parameter are needed: -i: include pathes, comma separated list -o: setup script file name diff --git a/solenv/bin/modules/pre2par/globals.pm b/solenv/bin/modules/pre2par/globals.pm index 215cd3b10bcf..9f9e498ce227 100644 --- a/solenv/bin/modules/pre2par/globals.pm +++ b/solenv/bin/modules/pre2par/globals.pm @@ -55,20 +55,10 @@ BEGIN $plat = $^O; - if (( $plat =~ /MSWin/i ) || (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "4nt" ))) - { - $separator = "\\"; - $pathseparator = "\;"; - $isunix = 0; - $iswin = 1; - } - else - { - $separator = "/"; - $pathseparator = "\:"; - $isunix = 1; - $iswin = 0; - } + $separator = "/"; + $pathseparator = "\:"; + $isunix = 1; + $iswin = 0; $islinux = 0; $issolaris = 0; diff --git a/solenv/bin/modules/pre2par/parameter.pm b/solenv/bin/modules/pre2par/parameter.pm index 64129187adc3..9d9f9cbd3572 100644 --- a/solenv/bin/modules/pre2par/parameter.pm +++ b/solenv/bin/modules/pre2par/parameter.pm @@ -45,7 +45,7 @@ sub usage { print <<Ende; --------------------------------------------------------- -$pre2par::globals::prog V1.0 (c) Ingo Schmidt 2003 +$pre2par::globals::prog The following parameter are needed: -s: path to the pre file -o: path to the par file diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm index a45d5f234905..c92bfd805a3e 100644 --- a/solenv/bin/modules/pre2par/systemactions.pm +++ b/solenv/bin/modules/pre2par/systemactions.pm @@ -47,6 +47,11 @@ sub create_directory my $returnvalue = 1; my $infoline = ""; + if ($directory eq "" ) + { + return 0; + } + if (!(-d $directory)) { $returnvalue = mkdir($directory, 0775); diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 2cc7b56b4a7d..f5aec06e9ed2 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -214,16 +214,11 @@ finish { MWS_BUILD TRUE } - common_a:0 IF %USE_SHELL% != 4nt + common_a { *o: cd %SOLARSRC% ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so } - common_a:1 IF %USE_SHELL% == 4nt - { - *o cdd %SOLARSRC% - ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so - } common_jre:0 IF %JREPATH% == { HIER set @@ -307,7 +302,7 @@ finish LIB %LIB%$;%JDKLIB% } } - order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 ca cax cap common_a:0 common_a:1 + order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk13 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 ca cax cap common_a switches { cwsname CWS_WORK_STAMP @@ -1359,6 +1354,7 @@ unxmacxi SYSTEM_PYTHON YES SYSTEM_ZLIB YES USE_SYSTEM_STL YES + BUILD_PIXMAN YES WITH_MOZILLA YES } common2 @@ -2510,8 +2506,6 @@ unxubti8 HAVE_GCC_VISIBILITY_FEATURE TRUE LD_LIBRARY_PATH .:/usr/lib:/usr/lib/jvm/java-6-openjdk/jre/lib/i386:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/xawt:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/native_threads:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%: MKOUT mkout.pl - PYTHONHOME %SOURCE_ROOT%/%INPATH% - PYTHONPATH .:%SOURCE_ROOT%$/%INPATH%$/lib%UPDMINOREXT%:%SOURCE_ROOT%/%INPATH%/lib%UPDMINOREXT%/python:/%SOURCE_ROOT%/%INPATH%/lib%UPDMINOREXT%/python/lib-dynload:%SOURCE_ROOT%/%INPATH%/bin%UPDMINOREXT%/pyuno SOLAREXTRAINC -I%SOLAR_STLPATH% SOLAREXTRALIB -L../lib SOLAR_JAVA TRUE @@ -2816,7 +2810,7 @@ wntgcci1 { SOLAR_ENV_ROOT r: SOLAR_SOURCE_ROOT o: - USE_SHELL 4nt + USE_SHELL bash } common1 { @@ -2986,16 +2980,6 @@ wntgcci1 } script { - 4nt - { - 150: set MYENV_PATH=%PATH - 160: set PATH=%SSX_PATH - 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC% - 260: set PATH=%MYENV_PATH - 270: unset MYENV_PATH - 400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR% - 401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2% - } csh { 150: setenv MYENV_PATH $PATH @@ -3487,7 +3471,7 @@ wntmsci12 XCLASSPATH . ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl } - common0:0 IF %OSTYPE% == cygwin + common0 { BS_ROOT n: SOLAR_ENV_ROOT r: @@ -3497,16 +3481,7 @@ wntmsci12 BTOOLDIR %WORK_STAMP%$/cygtools PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl } - common01:0 IF %OSTYPE% != cygwin - { - BS_ROOT n: - SOLAR_ENV_ROOT r: - SOLAR_SOURCE_ROOT o: - USE_SHELL 4nt - BTOOLDIR %WORK_STAMP% - PERLDIR btw\%WORK_STAMP%\perl\bin\perl - } - common02:0 IF %OSTYPE% == cygwin + common02 { PERL perl } @@ -3711,7 +3686,7 @@ wntmsci12 $dp(TMP) $dp(TEMP) } - order nojava common0:0 common01:0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02:0 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre + order nojava common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 ca cap cax common02 psdk compath common2 common:3 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 stl:1 stl:0 common jdk13 jdk14 jdk15 ojdk16 pre reset { COPYALL @@ -3732,17 +3707,6 @@ wntmsci12 } script { - 4nt - { - 150: set MYENV_PATH=%PATH - 160: set PATH=%SSX_PATH - 200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %ZIPSOURCE% %BTARGET% %MAXPROC% - 260: set PATH=%MYENV_PATH - 270: unset MYENV_PATH - 300: call pcleaner.btm - 400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR% - 401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2% - } sh { 400: if [ $COPYALL ]; then @@ -3763,16 +3727,6 @@ wntmsci12 881: echo $SO_GEN_ERROR2 882: fi } - csh - { - 400: if ( ${?COPYALL} ) perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC - 600: umask 002 - 800: rehash - 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR - 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 - 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR - 901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2 - } } switches { diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index 8baa43cabdfe..6bee41aada14 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -39,6 +39,7 @@ common BUILD_OS_MINOR BUILD_OS_REV BUILD_OS_MAJOR + BUILD_PIXMAN BUILD_TOOLS BUILD_TYPE BUILD_SPECIAL @@ -270,7 +271,6 @@ common NO_HIDS PAM_LINK PAM - PYTHONHOME PYTHONPATH SOLAR_PLUGIN URE_BOOTSTRAP diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk index 318bb1e19917..cdb592d2f36e 100644 --- a/solenv/inc/_tg_app.mk +++ b/solenv/inc/_tg_app.mk @@ -1,7 +1,7 @@ # unroll begin .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP1DEF = $(MISC)$/$(APP1TARGET).def +APP1DEF = $(MISC)/$(APP1TARGET).def .ENDIF .IF "$(APP1LINKTYPE)" != "" @@ -43,7 +43,7 @@ APP1OBJS+= $(STDOBJVCL) .IF "$(GUI)$(COM)" == "WNTGCC" APP1RESO= .IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != "" -APP1RESO=$(MISC)$/$(APP1TARGET:b)_res.o +APP1RESO=$(MISC)/$(APP1TARGET:b)_res.o .ENDIF .ENDIF @@ -55,19 +55,19 @@ USE_APP1DEF= .IF "$(APP1TARGETN)"!="" .IF "$(APP1PRODUCTNAME)"!="" -APP1PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\" +APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\" .ENDIF # "$(APP1PRODUCTNAME)"!="" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP1LIBS)"!="" -$(MISC)$/$(APP1TARGET)_linkinc.ls .PHONY: +$(MISC)/$(APP1TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP1LIBS) $(i:s/.lib/.lin/)) >> $@ + sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP1LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF #"$(APP1LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(APP1TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(APP1TARGETN:b)_linkinc.ls $(APP1TARGETN) : $(LINKINCTARGETS) .ENDIF # "$(linkinc)"!="" @@ -75,7 +75,7 @@ $(APP1TARGETN) : $(LINKINCTARGETS) APP1LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP1IMP_ORD = $(APP1STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP1STDLIBS:^"$(LB)$/") +_APP1IMP_ORD = $(APP1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP1STDLIBS:^"$(LB)/") APP1IMP_ORD = $(foreach,i,$(_APP1IMP_ORD) $(shell @-ls $i)) .ELSE APP1IMP_ORD = @@ -90,24 +90,24 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd - @-$(RM) $(MISC)$/$(@:b).strip + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd + @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP1OBJS:s/.obj/.o/) \ - `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ - $(APP1LINKTYPEFLAG) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_1.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_1.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_1.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_1.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd + `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + $(APP1LINKTYPEFLAG) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_1.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_1.cmd + @cat $(MISC)/$(TARGET).$(@:b)_1.cmd + @+source $(MISC)/$(TARGET).$(@:b)_1.cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading # libraries at runtime - @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip - @strip -i -R $(MISC)$/$(@:b).strip -X $@ + @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip + @strip -i -R $(MISC)/$(@:b).strip -X $@ @ls -l $@ - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ app $(APP1RPATH) $@ .IF "$(TARGETTYPE)"=="GUI" @echo "Making: $@.app" @@ -115,44 +115,44 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ .ENDIF # "$(TARGETTYPE)"=="GUI" .ELSE # "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd - @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ - $(APP1OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_1.cmd - @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_1.cmd - @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd - cat $(MISC)$/$(TARGET).$(@:b)_1.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd + @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd + @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ + $(APP1OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_1.cmd + @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_1.cmd + @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)/$(TARGET).$(@:b)_1.cmd + cat $(MISC)/$(TARGET).$(@:b)_1.cmd + @+source $(MISC)/$(TARGET).$(@:b)_1.cmd @ls -l $@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP1LINKRES)" != "" - @@-$(RM) $(MISC)$/$(APP1LINKRES:b).rc + @@-$(RM) $(MISC)/$(APP1LINKRES:b).rc .IF "$(APP1ICON)" != "" - @-echo 1 ICON $(EMQ)"$(APP1ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP1LINKRES:b).rc + @-echo 1 ICON $(EMQ)"$(APP1ICON:s/\/\\/)$(EMQ)" >> $(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 + @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc + @-echo $(EMQ)#include $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc .ENDIF # "$(APP1VERINFO)" != "" - $(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc + $(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc .ENDIF # "$(APP1LINKRES)" != "" .IF "$(COM)" == "GCC" @echo mingw .IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != "" - @cat $(APP1LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) > $(MISC)$/$(@:b)_all.res - windres $(MISC)$/$(@:b)_all.res $(APP1RESO) + @cat $(APP1LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) > $(MISC)/$(@:b)_all.res + windres $(MISC)/$(@:b)_all.res $(APP1RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ $(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \ - -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP1RESO) \ + -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP1RESO) \ `$(TYPE) /dev/null $(APP1LIBS) | sed s#$(ROUT)#$(OUT)#g` \ $(APP_LINKTYPE) $(APP1LIBSALCPPRT) \ -Wl,--start-group $(APP1STDLIBS) -Wl,--end-group $(APP1STDLIB) \ - $(STDLIB1) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_1.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_1.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd + $(STDLIB1) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_1.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_1.cmd + @+source $(MISC)/$(TARGET).$(@:b)_1.cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" @@ -161,7 +161,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(LINKFLAGSAPP) $(APP1BASEX) \ $(APP1STACKN) \ -out:$@ \ - -map:$(MISC)$/{$(subst,$/,_ $(APP1TARGET)).map} \ + -map:$(MISC)/{$(subst,/,_ $(APP1TARGET)).map} \ $(STDOBJ) \ $(APP1LINKRES) \ $(APP1RES) \ @@ -172,7 +172,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ ) @-echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI) @@ -197,17 +197,13 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(APP1STDLIBS) \ $(APP1STDLIB) $(STDLIB1)) $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP1TARGETN:b)_linkobj.lst >> $(MISC)\$(APP1TARGET).lst - $(IFEXIST) $(MISC)$/$(APP1TARGET).lst $(THEN) type $(MISC)$/$(APP1TARGET).lst >> $(MISC)$/$(APP1TARGET).lnk $(FI) + $(IFEXIST) $(MISC)/$(APP1TARGET).lst $(THEN) type $(MISC)/$(APP1TARGET).lst >> $(MISC)/$(APP1TARGET).lnk $(FI) $(APP1LINKER) @$(MISC)\$(APP1TARGET).lnk .ENDIF # "$(linkinc)" == "" .ENDIF # "$(COM)" == "GCC" .IF "$(APP1TARGET)" == "loader" $(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" $(RM) $@ $(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -217,23 +213,19 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ .IF "$(GUI)" == "OS2" @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) .IF "$(APP1LINKRES)" != "" - @+-$(RM) $(MISC)$/$(APP1LINKRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(APP1LINKRES:b).rc >& $(NULLDEV) .IF "$(APP1ICON)" != "" -.IF "$(USE_SHELL)"=="4nt" - @-+echo ICON 1 "$(APP1ICON:s/\/\\/)" >> $(MISC)$/$(APP1LINKRES:b).rc -.ELSE # "$(USE_SHELL)"=="4nt" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP1LINKRES:b).rc -.ENDIF # "$(USE_SHELL)"=="4nt" + @-+$(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 + @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc .ENDIF # "$(APP1VERINFO)" != "" - $(RC) -r -DOS2 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc + $(RC) -r -DOS2 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc .ENDIF # "$(APP1LINKRES)" != "" .IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP1TARGET) WINDOWAPI > $(MISC)$/$(APP1TARGET).def + @echo NAME $(APP1TARGET) WINDOWAPI > $(MISC)/$(APP1TARGET).def .ENDIF @+echo $(APP1LINKFLAGS) \ @@ -241,7 +233,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(APP1STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP1LINKRES) \ $(APP1RES) \ @@ -256,7 +248,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ $(APP1STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP1LINKRES) \ $(APP1RES) \ @@ -269,11 +261,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ .IF "$(APP1TARGET)" == "loader" +$(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" +$(RM) $@ +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -287,7 +275,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \ # unroll begin .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP2DEF = $(MISC)$/$(APP2TARGET).def +APP2DEF = $(MISC)/$(APP2TARGET).def .ENDIF .IF "$(APP2LINKTYPE)" != "" @@ -329,7 +317,7 @@ APP2OBJS+= $(STDOBJVCL) .IF "$(GUI)$(COM)" == "WNTGCC" APP2RESO= .IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != "" -APP2RESO=$(MISC)$/$(APP2TARGET:b)_res.o +APP2RESO=$(MISC)/$(APP2TARGET:b)_res.o .ENDIF .ENDIF @@ -341,19 +329,19 @@ USE_APP2DEF= .IF "$(APP2TARGETN)"!="" .IF "$(APP2PRODUCTNAME)"!="" -APP2PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\" +APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\" .ENDIF # "$(APP2PRODUCTNAME)"!="" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP2LIBS)"!="" -$(MISC)$/$(APP2TARGET)_linkinc.ls .PHONY: +$(MISC)/$(APP2TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP2LIBS) $(i:s/.lib/.lin/)) >> $@ + sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP2LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF #"$(APP2LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(APP2TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(APP2TARGETN:b)_linkinc.ls $(APP2TARGETN) : $(LINKINCTARGETS) .ENDIF # "$(linkinc)"!="" @@ -361,7 +349,7 @@ $(APP2TARGETN) : $(LINKINCTARGETS) APP2LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP2IMP_ORD = $(APP2STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP2STDLIBS:^"$(LB)$/") +_APP2IMP_ORD = $(APP2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP2STDLIBS:^"$(LB)/") APP2IMP_ORD = $(foreach,i,$(_APP2IMP_ORD) $(shell @-ls $i)) .ELSE APP2IMP_ORD = @@ -376,24 +364,24 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd - @-$(RM) $(MISC)$/$(@:b).strip + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd + @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP2OBJS:s/.obj/.o/) \ - `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ - $(APP2LINKTYPEFLAG) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_2.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_2.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_2.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_2.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd + `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + $(APP2LINKTYPEFLAG) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_2.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_2.cmd + @cat $(MISC)/$(TARGET).$(@:b)_2.cmd + @+source $(MISC)/$(TARGET).$(@:b)_2.cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading # libraries at runtime - @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip - @strip -i -R $(MISC)$/$(@:b).strip -X $@ + @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip + @strip -i -R $(MISC)/$(@:b).strip -X $@ @ls -l $@ - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ app $(APP2RPATH) $@ .IF "$(TARGETTYPE)"=="GUI" @echo "Making: $@.app" @@ -401,44 +389,44 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ .ENDIF # "$(TARGETTYPE)"=="GUI" .ELSE # "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd - @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ - $(APP2OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_2.cmd - @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_2.cmd - @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd - cat $(MISC)$/$(TARGET).$(@:b)_2.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd + @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd + @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ + $(APP2OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_2.cmd + @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_2.cmd + @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)/$(TARGET).$(@:b)_2.cmd + cat $(MISC)/$(TARGET).$(@:b)_2.cmd + @+source $(MISC)/$(TARGET).$(@:b)_2.cmd @ls -l $@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP2LINKRES)" != "" - @@-$(RM) $(MISC)$/$(APP2LINKRES:b).rc + @@-$(RM) $(MISC)/$(APP2LINKRES:b).rc .IF "$(APP2ICON)" != "" - @-echo 1 ICON $(EMQ)"$(APP2ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP2LINKRES:b).rc + @-echo 1 ICON $(EMQ)"$(APP2ICON:s/\/\\/)$(EMQ)" >> $(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 + @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc + @-echo $(EMQ)#include $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc .ENDIF # "$(APP2VERINFO)" != "" - $(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc + $(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc .ENDIF # "$(APP2LINKRES)" != "" .IF "$(COM)" == "GCC" @echo mingw .IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != "" - @cat $(APP2LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) > $(MISC)$/$(@:b)_all.res - windres $(MISC)$/$(@:b)_all.res $(APP2RESO) + @cat $(APP2LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) > $(MISC)/$(@:b)_all.res + windres $(MISC)/$(@:b)_all.res $(APP2RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ $(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \ - -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP2RESO) \ + -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP2RESO) \ `$(TYPE) /dev/null $(APP2LIBS) | sed s#$(ROUT)#$(OUT)#g` \ $(APP_LINKTYPE) $(APP2LIBSALCPPRT) \ -Wl,--start-group $(APP2STDLIBS) -Wl,--end-group $(APP2STDLIB) \ - $(STDLIB2) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_2.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_2.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd + $(STDLIB2) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_2.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_2.cmd + @+source $(MISC)/$(TARGET).$(@:b)_2.cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" @@ -447,7 +435,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(LINKFLAGSAPP) $(APP2BASEX) \ $(APP2STACKN) \ -out:$@ \ - -map:$(MISC)$/{$(subst,$/,_ $(APP2TARGET)).map} \ + -map:$(MISC)/{$(subst,/,_ $(APP2TARGET)).map} \ $(STDOBJ) \ $(APP2LINKRES) \ $(APP2RES) \ @@ -458,7 +446,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ ) @-echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI) @@ -483,17 +471,13 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(APP2STDLIBS) \ $(APP2STDLIB) $(STDLIB2)) $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP2TARGETN:b)_linkobj.lst >> $(MISC)\$(APP2TARGET).lst - $(IFEXIST) $(MISC)$/$(APP2TARGET).lst $(THEN) type $(MISC)$/$(APP2TARGET).lst >> $(MISC)$/$(APP2TARGET).lnk $(FI) + $(IFEXIST) $(MISC)/$(APP2TARGET).lst $(THEN) type $(MISC)/$(APP2TARGET).lst >> $(MISC)/$(APP2TARGET).lnk $(FI) $(APP2LINKER) @$(MISC)\$(APP2TARGET).lnk .ENDIF # "$(linkinc)" == "" .ENDIF # "$(COM)" == "GCC" .IF "$(APP2TARGET)" == "loader" $(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" $(RM) $@ $(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -503,23 +487,19 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ .IF "$(GUI)" == "OS2" @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) .IF "$(APP2LINKRES)" != "" - @+-$(RM) $(MISC)$/$(APP2LINKRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(APP2LINKRES:b).rc >& $(NULLDEV) .IF "$(APP2ICON)" != "" -.IF "$(USE_SHELL)"=="4nt" - @-+echo ICON 1 "$(APP2ICON:s/\/\\/)" >> $(MISC)$/$(APP2LINKRES:b).rc -.ELSE # "$(USE_SHELL)"=="4nt" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP2ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP2LINKRES:b).rc -.ENDIF # "$(USE_SHELL)"=="4nt" + @-+$(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 + @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc .ENDIF # "$(APP2VERINFO)" != "" - $(RC) -r -DOS2 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc + $(RC) -r -DOS2 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc .ENDIF # "$(APP2LINKRES)" != "" .IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP2TARGET) WINDOWAPI > $(MISC)$/$(APP2TARGET).def + @echo NAME $(APP2TARGET) WINDOWAPI > $(MISC)/$(APP2TARGET).def .ENDIF @+echo $(APP2LINKFLAGS) \ @@ -527,7 +507,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(APP2STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP2LINKRES) \ $(APP2RES) \ @@ -542,7 +522,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ $(APP2STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP2LINKRES) \ $(APP2RES) \ @@ -555,11 +535,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ .IF "$(APP2TARGET)" == "loader" +$(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" +$(RM) $@ +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -573,7 +549,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \ # unroll begin .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP3DEF = $(MISC)$/$(APP3TARGET).def +APP3DEF = $(MISC)/$(APP3TARGET).def .ENDIF .IF "$(APP3LINKTYPE)" != "" @@ -615,7 +591,7 @@ APP3OBJS+= $(STDOBJVCL) .IF "$(GUI)$(COM)" == "WNTGCC" APP3RESO= .IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != "" -APP3RESO=$(MISC)$/$(APP3TARGET:b)_res.o +APP3RESO=$(MISC)/$(APP3TARGET:b)_res.o .ENDIF .ENDIF @@ -627,19 +603,19 @@ USE_APP3DEF= .IF "$(APP3TARGETN)"!="" .IF "$(APP3PRODUCTNAME)"!="" -APP3PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\" +APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\" .ENDIF # "$(APP3PRODUCTNAME)"!="" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP3LIBS)"!="" -$(MISC)$/$(APP3TARGET)_linkinc.ls .PHONY: +$(MISC)/$(APP3TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP3LIBS) $(i:s/.lib/.lin/)) >> $@ + sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP3LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF #"$(APP3LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(APP3TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(APP3TARGETN:b)_linkinc.ls $(APP3TARGETN) : $(LINKINCTARGETS) .ENDIF # "$(linkinc)"!="" @@ -647,7 +623,7 @@ $(APP3TARGETN) : $(LINKINCTARGETS) APP3LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP3IMP_ORD = $(APP3STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP3STDLIBS:^"$(LB)$/") +_APP3IMP_ORD = $(APP3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP3STDLIBS:^"$(LB)/") APP3IMP_ORD = $(foreach,i,$(_APP3IMP_ORD) $(shell @-ls $i)) .ELSE APP3IMP_ORD = @@ -662,24 +638,24 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd - @-$(RM) $(MISC)$/$(@:b).strip + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd + @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP3OBJS:s/.obj/.o/) \ - `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ - $(APP3LINKTYPEFLAG) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_3.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_3.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_3.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_3.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd + `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + $(APP3LINKTYPEFLAG) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_3.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_3.cmd + @cat $(MISC)/$(TARGET).$(@:b)_3.cmd + @+source $(MISC)/$(TARGET).$(@:b)_3.cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading # libraries at runtime - @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip - @strip -i -R $(MISC)$/$(@:b).strip -X $@ + @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip + @strip -i -R $(MISC)/$(@:b).strip -X $@ @ls -l $@ - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ app $(APP3RPATH) $@ .IF "$(TARGETTYPE)"=="GUI" @echo "Making: $@.app" @@ -687,44 +663,44 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ .ENDIF # "$(TARGETTYPE)"=="GUI" .ELSE # "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd - @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ - $(APP3OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_3.cmd - @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_3.cmd - @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd - cat $(MISC)$/$(TARGET).$(@:b)_3.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd + @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd + @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ + $(APP3OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_3.cmd + @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_3.cmd + @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)/$(TARGET).$(@:b)_3.cmd + cat $(MISC)/$(TARGET).$(@:b)_3.cmd + @+source $(MISC)/$(TARGET).$(@:b)_3.cmd @ls -l $@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP3LINKRES)" != "" - @@-$(RM) $(MISC)$/$(APP3LINKRES:b).rc + @@-$(RM) $(MISC)/$(APP3LINKRES:b).rc .IF "$(APP3ICON)" != "" - @-echo 1 ICON $(EMQ)"$(APP3ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP3LINKRES:b).rc + @-echo 1 ICON $(EMQ)"$(APP3ICON:s/\/\\/)$(EMQ)" >> $(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 + @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc + @-echo $(EMQ)#include $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc .ENDIF # "$(APP3VERINFO)" != "" - $(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc + $(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc .ENDIF # "$(APP3LINKRES)" != "" .IF "$(COM)" == "GCC" @echo mingw .IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != "" - @cat $(APP3LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) > $(MISC)$/$(@:b)_all.res - windres $(MISC)$/$(@:b)_all.res $(APP3RESO) + @cat $(APP3LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) > $(MISC)/$(@:b)_all.res + windres $(MISC)/$(@:b)_all.res $(APP3RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ $(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \ - -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP3RESO) \ + -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP3RESO) \ `$(TYPE) /dev/null $(APP3LIBS) | sed s#$(ROUT)#$(OUT)#g` \ $(APP_LINKTYPE) $(APP3LIBSALCPPRT) \ -Wl,--start-group $(APP3STDLIBS) -Wl,--end-group $(APP3STDLIB) \ - $(STDLIB3) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_3.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_3.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd + $(STDLIB3) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_3.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_3.cmd + @+source $(MISC)/$(TARGET).$(@:b)_3.cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" @@ -733,7 +709,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(LINKFLAGSAPP) $(APP3BASEX) \ $(APP3STACKN) \ -out:$@ \ - -map:$(MISC)$/{$(subst,$/,_ $(APP3TARGET)).map} \ + -map:$(MISC)/{$(subst,/,_ $(APP3TARGET)).map} \ $(STDOBJ) \ $(APP3LINKRES) \ $(APP3RES) \ @@ -744,7 +720,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ ) @-echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI) @@ -769,17 +745,13 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(APP3STDLIBS) \ $(APP3STDLIB) $(STDLIB3)) $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP3TARGETN:b)_linkobj.lst >> $(MISC)\$(APP3TARGET).lst - $(IFEXIST) $(MISC)$/$(APP3TARGET).lst $(THEN) type $(MISC)$/$(APP3TARGET).lst >> $(MISC)$/$(APP3TARGET).lnk $(FI) + $(IFEXIST) $(MISC)/$(APP3TARGET).lst $(THEN) type $(MISC)/$(APP3TARGET).lst >> $(MISC)/$(APP3TARGET).lnk $(FI) $(APP3LINKER) @$(MISC)\$(APP3TARGET).lnk .ENDIF # "$(linkinc)" == "" .ENDIF # "$(COM)" == "GCC" .IF "$(APP3TARGET)" == "loader" $(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" $(RM) $@ $(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -789,23 +761,19 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ .IF "$(GUI)" == "OS2" @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) .IF "$(APP3LINKRES)" != "" - @+-$(RM) $(MISC)$/$(APP3LINKRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(APP3LINKRES:b).rc >& $(NULLDEV) .IF "$(APP3ICON)" != "" -.IF "$(USE_SHELL)"=="4nt" - @-+echo ICON 1 "$(APP3ICON:s/\/\\/)" >> $(MISC)$/$(APP3LINKRES:b).rc -.ELSE # "$(USE_SHELL)"=="4nt" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP3ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP3LINKRES:b).rc -.ENDIF # "$(USE_SHELL)"=="4nt" + @-+$(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 + @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc .ENDIF # "$(APP3VERINFO)" != "" - $(RC) -r -DOS2 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc + $(RC) -r -DOS2 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc .ENDIF # "$(APP3LINKRES)" != "" .IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP3TARGET) WINDOWAPI > $(MISC)$/$(APP3TARGET).def + @echo NAME $(APP3TARGET) WINDOWAPI > $(MISC)/$(APP3TARGET).def .ENDIF @+echo $(APP3LINKFLAGS) \ @@ -813,7 +781,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(APP3STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP3LINKRES) \ $(APP3RES) \ @@ -828,7 +796,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ $(APP3STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP3LINKRES) \ $(APP3RES) \ @@ -841,11 +809,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ .IF "$(APP3TARGET)" == "loader" +$(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" +$(RM) $@ +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -859,7 +823,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \ # unroll begin .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP4DEF = $(MISC)$/$(APP4TARGET).def +APP4DEF = $(MISC)/$(APP4TARGET).def .ENDIF .IF "$(APP4LINKTYPE)" != "" @@ -901,7 +865,7 @@ APP4OBJS+= $(STDOBJVCL) .IF "$(GUI)$(COM)" == "WNTGCC" APP4RESO= .IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != "" -APP4RESO=$(MISC)$/$(APP4TARGET:b)_res.o +APP4RESO=$(MISC)/$(APP4TARGET:b)_res.o .ENDIF .ENDIF @@ -913,19 +877,19 @@ USE_APP4DEF= .IF "$(APP4TARGETN)"!="" .IF "$(APP4PRODUCTNAME)"!="" -APP4PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\" +APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\" .ENDIF # "$(APP4PRODUCTNAME)"!="" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP4LIBS)"!="" -$(MISC)$/$(APP4TARGET)_linkinc.ls .PHONY: +$(MISC)/$(APP4TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP4LIBS) $(i:s/.lib/.lin/)) >> $@ + sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP4LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF #"$(APP4LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(APP4TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(APP4TARGETN:b)_linkinc.ls $(APP4TARGETN) : $(LINKINCTARGETS) .ENDIF # "$(linkinc)"!="" @@ -933,7 +897,7 @@ $(APP4TARGETN) : $(LINKINCTARGETS) APP4LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP4IMP_ORD = $(APP4STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP4STDLIBS:^"$(LB)$/") +_APP4IMP_ORD = $(APP4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP4STDLIBS:^"$(LB)/") APP4IMP_ORD = $(foreach,i,$(_APP4IMP_ORD) $(shell @-ls $i)) .ELSE APP4IMP_ORD = @@ -948,24 +912,24 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd - @-$(RM) $(MISC)$/$(@:b).strip + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd + @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP4OBJS:s/.obj/.o/) \ - `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ - $(APP4LINKTYPEFLAG) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_4.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_4.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_4.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_4.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd + `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + $(APP4LINKTYPEFLAG) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_4.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_4.cmd + @cat $(MISC)/$(TARGET).$(@:b)_4.cmd + @+source $(MISC)/$(TARGET).$(@:b)_4.cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading # libraries at runtime - @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip - @strip -i -R $(MISC)$/$(@:b).strip -X $@ + @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip + @strip -i -R $(MISC)/$(@:b).strip -X $@ @ls -l $@ - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ app $(APP4RPATH) $@ .IF "$(TARGETTYPE)"=="GUI" @echo "Making: $@.app" @@ -973,44 +937,44 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ .ENDIF # "$(TARGETTYPE)"=="GUI" .ELSE # "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd - @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ - $(APP4OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_4.cmd - @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_4.cmd - @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd - cat $(MISC)$/$(TARGET).$(@:b)_4.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd + @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd + @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ + $(APP4OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_4.cmd + @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_4.cmd + @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)/$(TARGET).$(@:b)_4.cmd + cat $(MISC)/$(TARGET).$(@:b)_4.cmd + @+source $(MISC)/$(TARGET).$(@:b)_4.cmd @ls -l $@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP4LINKRES)" != "" - @@-$(RM) $(MISC)$/$(APP4LINKRES:b).rc + @@-$(RM) $(MISC)/$(APP4LINKRES:b).rc .IF "$(APP4ICON)" != "" - @-echo 1 ICON $(EMQ)"$(APP4ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP4LINKRES:b).rc + @-echo 1 ICON $(EMQ)"$(APP4ICON:s/\/\\/)$(EMQ)" >> $(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 + @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc + @-echo $(EMQ)#include $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc .ENDIF # "$(APP4VERINFO)" != "" - $(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc + $(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc .ENDIF # "$(APP4LINKRES)" != "" .IF "$(COM)" == "GCC" @echo mingw .IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != "" - @cat $(APP4LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) > $(MISC)$/$(@:b)_all.res - windres $(MISC)$/$(@:b)_all.res $(APP4RESO) + @cat $(APP4LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) > $(MISC)/$(@:b)_all.res + windres $(MISC)/$(@:b)_all.res $(APP4RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ $(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \ - -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP4RESO) \ + -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP4RESO) \ `$(TYPE) /dev/null $(APP4LIBS) | sed s#$(ROUT)#$(OUT)#g` \ $(APP_LINKTYPE) $(APP4LIBSALCPPRT) \ -Wl,--start-group $(APP4STDLIBS) -Wl,--end-group $(APP4STDLIB) \ - $(STDLIB4) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_4.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_4.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd + $(STDLIB4) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_4.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_4.cmd + @+source $(MISC)/$(TARGET).$(@:b)_4.cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" @@ -1019,7 +983,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(LINKFLAGSAPP) $(APP4BASEX) \ $(APP4STACKN) \ -out:$@ \ - -map:$(MISC)$/{$(subst,$/,_ $(APP4TARGET)).map} \ + -map:$(MISC)/{$(subst,/,_ $(APP4TARGET)).map} \ $(STDOBJ) \ $(APP4LINKRES) \ $(APP4RES) \ @@ -1030,7 +994,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ ) @-echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI) @@ -1055,17 +1019,13 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(APP4STDLIBS) \ $(APP4STDLIB) $(STDLIB4)) $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP4TARGETN:b)_linkobj.lst >> $(MISC)\$(APP4TARGET).lst - $(IFEXIST) $(MISC)$/$(APP4TARGET).lst $(THEN) type $(MISC)$/$(APP4TARGET).lst >> $(MISC)$/$(APP4TARGET).lnk $(FI) + $(IFEXIST) $(MISC)/$(APP4TARGET).lst $(THEN) type $(MISC)/$(APP4TARGET).lst >> $(MISC)/$(APP4TARGET).lnk $(FI) $(APP4LINKER) @$(MISC)\$(APP4TARGET).lnk .ENDIF # "$(linkinc)" == "" .ENDIF # "$(COM)" == "GCC" .IF "$(APP4TARGET)" == "loader" $(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" $(RM) $@ $(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -1075,23 +1035,19 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ .IF "$(GUI)" == "OS2" @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) .IF "$(APP4LINKRES)" != "" - @+-$(RM) $(MISC)$/$(APP4LINKRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(APP4LINKRES:b).rc >& $(NULLDEV) .IF "$(APP4ICON)" != "" -.IF "$(USE_SHELL)"=="4nt" - @-+echo ICON 1 "$(APP4ICON:s/\/\\/)" >> $(MISC)$/$(APP4LINKRES:b).rc -.ELSE # "$(USE_SHELL)"=="4nt" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP4ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP4LINKRES:b).rc -.ENDIF # "$(USE_SHELL)"=="4nt" + @-+$(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 + @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc .ENDIF # "$(APP4VERINFO)" != "" - $(RC) -r -DOS2 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc + $(RC) -r -DOS2 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc .ENDIF # "$(APP4LINKRES)" != "" .IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP4TARGET) WINDOWAPI > $(MISC)$/$(APP4TARGET).def + @echo NAME $(APP4TARGET) WINDOWAPI > $(MISC)/$(APP4TARGET).def .ENDIF @+echo $(APP4LINKFLAGS) \ @@ -1099,7 +1055,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(APP4STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP4LINKRES) \ $(APP4RES) \ @@ -1114,7 +1070,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ $(APP4STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP4LINKRES) \ $(APP4RES) \ @@ -1127,11 +1083,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ .IF "$(APP4TARGET)" == "loader" +$(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" +$(RM) $@ +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -1145,7 +1097,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \ # unroll begin .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP5DEF = $(MISC)$/$(APP5TARGET).def +APP5DEF = $(MISC)/$(APP5TARGET).def .ENDIF .IF "$(APP5LINKTYPE)" != "" @@ -1187,7 +1139,7 @@ APP5OBJS+= $(STDOBJVCL) .IF "$(GUI)$(COM)" == "WNTGCC" APP5RESO= .IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != "" -APP5RESO=$(MISC)$/$(APP5TARGET:b)_res.o +APP5RESO=$(MISC)/$(APP5TARGET:b)_res.o .ENDIF .ENDIF @@ -1199,19 +1151,19 @@ USE_APP5DEF= .IF "$(APP5TARGETN)"!="" .IF "$(APP5PRODUCTNAME)"!="" -APP5PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\" +APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\" .ENDIF # "$(APP5PRODUCTNAME)"!="" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP5LIBS)"!="" -$(MISC)$/$(APP5TARGET)_linkinc.ls .PHONY: +$(MISC)/$(APP5TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP5LIBS) $(i:s/.lib/.lin/)) >> $@ + sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP5LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF #"$(APP5LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(APP5TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(APP5TARGETN:b)_linkinc.ls $(APP5TARGETN) : $(LINKINCTARGETS) .ENDIF # "$(linkinc)"!="" @@ -1219,7 +1171,7 @@ $(APP5TARGETN) : $(LINKINCTARGETS) APP5LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP5IMP_ORD = $(APP5STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP5STDLIBS:^"$(LB)$/") +_APP5IMP_ORD = $(APP5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP5STDLIBS:^"$(LB)/") APP5IMP_ORD = $(foreach,i,$(_APP5IMP_ORD) $(shell @-ls $i)) .ELSE APP5IMP_ORD = @@ -1234,24 +1186,24 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd - @-$(RM) $(MISC)$/$(@:b).strip + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd + @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP5OBJS:s/.obj/.o/) \ - `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ - $(APP5LINKTYPEFLAG) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_5.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_5.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_5.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_5.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd + `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + $(APP5LINKTYPEFLAG) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_5.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_5.cmd + @cat $(MISC)/$(TARGET).$(@:b)_5.cmd + @+source $(MISC)/$(TARGET).$(@:b)_5.cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading # libraries at runtime - @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip - @strip -i -R $(MISC)$/$(@:b).strip -X $@ + @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip + @strip -i -R $(MISC)/$(@:b).strip -X $@ @ls -l $@ - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ app $(APP5RPATH) $@ .IF "$(TARGETTYPE)"=="GUI" @echo "Making: $@.app" @@ -1259,44 +1211,44 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ .ENDIF # "$(TARGETTYPE)"=="GUI" .ELSE # "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd - @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ - $(APP5OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_5.cmd - @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_5.cmd - @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd - cat $(MISC)$/$(TARGET).$(@:b)_5.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd + @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd + @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ + $(APP5OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_5.cmd + @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_5.cmd + @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)/$(TARGET).$(@:b)_5.cmd + cat $(MISC)/$(TARGET).$(@:b)_5.cmd + @+source $(MISC)/$(TARGET).$(@:b)_5.cmd @ls -l $@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP5LINKRES)" != "" - @@-$(RM) $(MISC)$/$(APP5LINKRES:b).rc + @@-$(RM) $(MISC)/$(APP5LINKRES:b).rc .IF "$(APP5ICON)" != "" - @-echo 1 ICON $(EMQ)"$(APP5ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP5LINKRES:b).rc + @-echo 1 ICON $(EMQ)"$(APP5ICON:s/\/\\/)$(EMQ)" >> $(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 + @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc + @-echo $(EMQ)#include $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc .ENDIF # "$(APP5VERINFO)" != "" - $(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc + $(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc .ENDIF # "$(APP5LINKRES)" != "" .IF "$(COM)" == "GCC" @echo mingw .IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != "" - @cat $(APP5LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) > $(MISC)$/$(@:b)_all.res - windres $(MISC)$/$(@:b)_all.res $(APP5RESO) + @cat $(APP5LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) > $(MISC)/$(@:b)_all.res + windres $(MISC)/$(@:b)_all.res $(APP5RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ $(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \ - -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP5RESO) \ + -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP5RESO) \ `$(TYPE) /dev/null $(APP5LIBS) | sed s#$(ROUT)#$(OUT)#g` \ $(APP_LINKTYPE) $(APP5LIBSALCPPRT) \ -Wl,--start-group $(APP5STDLIBS) -Wl,--end-group $(APP5STDLIB) \ - $(STDLIB5) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_5.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_5.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd + $(STDLIB5) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_5.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_5.cmd + @+source $(MISC)/$(TARGET).$(@:b)_5.cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" @@ -1305,7 +1257,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(LINKFLAGSAPP) $(APP5BASEX) \ $(APP5STACKN) \ -out:$@ \ - -map:$(MISC)$/{$(subst,$/,_ $(APP5TARGET)).map} \ + -map:$(MISC)/{$(subst,/,_ $(APP5TARGET)).map} \ $(STDOBJ) \ $(APP5LINKRES) \ $(APP5RES) \ @@ -1316,7 +1268,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ ) @-echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI) @@ -1341,17 +1293,13 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(APP5STDLIBS) \ $(APP5STDLIB) $(STDLIB5)) $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP5TARGETN:b)_linkobj.lst >> $(MISC)\$(APP5TARGET).lst - $(IFEXIST) $(MISC)$/$(APP5TARGET).lst $(THEN) type $(MISC)$/$(APP5TARGET).lst >> $(MISC)$/$(APP5TARGET).lnk $(FI) + $(IFEXIST) $(MISC)/$(APP5TARGET).lst $(THEN) type $(MISC)/$(APP5TARGET).lst >> $(MISC)/$(APP5TARGET).lnk $(FI) $(APP5LINKER) @$(MISC)\$(APP5TARGET).lnk .ENDIF # "$(linkinc)" == "" .ENDIF # "$(COM)" == "GCC" .IF "$(APP5TARGET)" == "loader" $(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" $(RM) $@ $(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -1361,23 +1309,19 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ .IF "$(GUI)" == "OS2" @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) .IF "$(APP5LINKRES)" != "" - @+-$(RM) $(MISC)$/$(APP5LINKRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(APP5LINKRES:b).rc >& $(NULLDEV) .IF "$(APP5ICON)" != "" -.IF "$(USE_SHELL)"=="4nt" - @-+echo ICON 1 "$(APP5ICON:s/\/\\/)" >> $(MISC)$/$(APP5LINKRES:b).rc -.ELSE # "$(USE_SHELL)"=="4nt" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP5ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP5LINKRES:b).rc -.ENDIF # "$(USE_SHELL)"=="4nt" + @-+$(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 + @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc .ENDIF # "$(APP5VERINFO)" != "" - $(RC) -r -DOS2 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc + $(RC) -r -DOS2 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc .ENDIF # "$(APP5LINKRES)" != "" .IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP5TARGET) WINDOWAPI > $(MISC)$/$(APP5TARGET).def + @echo NAME $(APP5TARGET) WINDOWAPI > $(MISC)/$(APP5TARGET).def .ENDIF @+echo $(APP5LINKFLAGS) \ @@ -1385,7 +1329,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(APP5STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP5LINKRES) \ $(APP5RES) \ @@ -1400,7 +1344,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ $(APP5STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP5LINKRES) \ $(APP5RES) \ @@ -1413,11 +1357,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ .IF "$(APP5TARGET)" == "loader" +$(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" +$(RM) $@ +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -1431,7 +1371,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \ # unroll begin .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP6DEF = $(MISC)$/$(APP6TARGET).def +APP6DEF = $(MISC)/$(APP6TARGET).def .ENDIF .IF "$(APP6LINKTYPE)" != "" @@ -1473,7 +1413,7 @@ APP6OBJS+= $(STDOBJVCL) .IF "$(GUI)$(COM)" == "WNTGCC" APP6RESO= .IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != "" -APP6RESO=$(MISC)$/$(APP6TARGET:b)_res.o +APP6RESO=$(MISC)/$(APP6TARGET:b)_res.o .ENDIF .ENDIF @@ -1485,19 +1425,19 @@ USE_APP6DEF= .IF "$(APP6TARGETN)"!="" .IF "$(APP6PRODUCTNAME)"!="" -APP6PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\" +APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\" .ENDIF # "$(APP6PRODUCTNAME)"!="" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP6LIBS)"!="" -$(MISC)$/$(APP6TARGET)_linkinc.ls .PHONY: +$(MISC)/$(APP6TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP6LIBS) $(i:s/.lib/.lin/)) >> $@ + sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP6LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF #"$(APP6LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(APP6TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(APP6TARGETN:b)_linkinc.ls $(APP6TARGETN) : $(LINKINCTARGETS) .ENDIF # "$(linkinc)"!="" @@ -1505,7 +1445,7 @@ $(APP6TARGETN) : $(LINKINCTARGETS) APP6LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP6IMP_ORD = $(APP6STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP6STDLIBS:^"$(LB)$/") +_APP6IMP_ORD = $(APP6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP6STDLIBS:^"$(LB)/") APP6IMP_ORD = $(foreach,i,$(_APP6IMP_ORD) $(shell @-ls $i)) .ELSE APP6IMP_ORD = @@ -1520,24 +1460,24 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd - @-$(RM) $(MISC)$/$(@:b).strip + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd + @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP6OBJS:s/.obj/.o/) \ - `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ - $(APP6LINKTYPEFLAG) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_6.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_6.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_6.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_6.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd + `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + $(APP6LINKTYPEFLAG) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_6.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_6.cmd + @cat $(MISC)/$(TARGET).$(@:b)_6.cmd + @+source $(MISC)/$(TARGET).$(@:b)_6.cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading # libraries at runtime - @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip - @strip -i -R $(MISC)$/$(@:b).strip -X $@ + @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip + @strip -i -R $(MISC)/$(@:b).strip -X $@ @ls -l $@ - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ app $(APP6RPATH) $@ .IF "$(TARGETTYPE)"=="GUI" @echo "Making: $@.app" @@ -1545,44 +1485,44 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ .ENDIF # "$(TARGETTYPE)"=="GUI" .ELSE # "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd - @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ - $(APP6OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_6.cmd - @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_6.cmd - @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd - cat $(MISC)$/$(TARGET).$(@:b)_6.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd + @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd + @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ + $(APP6OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_6.cmd + @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_6.cmd + @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)/$(TARGET).$(@:b)_6.cmd + cat $(MISC)/$(TARGET).$(@:b)_6.cmd + @+source $(MISC)/$(TARGET).$(@:b)_6.cmd @ls -l $@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP6LINKRES)" != "" - @@-$(RM) $(MISC)$/$(APP6LINKRES:b).rc + @@-$(RM) $(MISC)/$(APP6LINKRES:b).rc .IF "$(APP6ICON)" != "" - @-echo 1 ICON $(EMQ)"$(APP6ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP6LINKRES:b).rc + @-echo 1 ICON $(EMQ)"$(APP6ICON:s/\/\\/)$(EMQ)" >> $(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 + @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc + @-echo $(EMQ)#include $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc .ENDIF # "$(APP6VERINFO)" != "" - $(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc + $(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc .ENDIF # "$(APP6LINKRES)" != "" .IF "$(COM)" == "GCC" @echo mingw .IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != "" - @cat $(APP6LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) > $(MISC)$/$(@:b)_all.res - windres $(MISC)$/$(@:b)_all.res $(APP6RESO) + @cat $(APP6LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) > $(MISC)/$(@:b)_all.res + windres $(MISC)/$(@:b)_all.res $(APP6RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ $(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \ - -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP6RESO) \ + -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP6RESO) \ `$(TYPE) /dev/null $(APP6LIBS) | sed s#$(ROUT)#$(OUT)#g` \ $(APP_LINKTYPE) $(APP6LIBSALCPPRT) \ -Wl,--start-group $(APP6STDLIBS) -Wl,--end-group $(APP6STDLIB) \ - $(STDLIB6) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_6.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_6.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd + $(STDLIB6) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_6.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_6.cmd + @+source $(MISC)/$(TARGET).$(@:b)_6.cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" @@ -1591,7 +1531,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(LINKFLAGSAPP) $(APP6BASEX) \ $(APP6STACKN) \ -out:$@ \ - -map:$(MISC)$/{$(subst,$/,_ $(APP6TARGET)).map} \ + -map:$(MISC)/{$(subst,/,_ $(APP6TARGET)).map} \ $(STDOBJ) \ $(APP6LINKRES) \ $(APP6RES) \ @@ -1602,7 +1542,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ ) @-echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI) @@ -1627,17 +1567,13 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(APP6STDLIBS) \ $(APP6STDLIB) $(STDLIB6)) $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP6TARGETN:b)_linkobj.lst >> $(MISC)\$(APP6TARGET).lst - $(IFEXIST) $(MISC)$/$(APP6TARGET).lst $(THEN) type $(MISC)$/$(APP6TARGET).lst >> $(MISC)$/$(APP6TARGET).lnk $(FI) + $(IFEXIST) $(MISC)/$(APP6TARGET).lst $(THEN) type $(MISC)/$(APP6TARGET).lst >> $(MISC)/$(APP6TARGET).lnk $(FI) $(APP6LINKER) @$(MISC)\$(APP6TARGET).lnk .ENDIF # "$(linkinc)" == "" .ENDIF # "$(COM)" == "GCC" .IF "$(APP6TARGET)" == "loader" $(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" $(RM) $@ $(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -1647,23 +1583,19 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ .IF "$(GUI)" == "OS2" @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) .IF "$(APP6LINKRES)" != "" - @+-$(RM) $(MISC)$/$(APP6LINKRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(APP6LINKRES:b).rc >& $(NULLDEV) .IF "$(APP6ICON)" != "" -.IF "$(USE_SHELL)"=="4nt" - @-+echo ICON 1 "$(APP6ICON:s/\/\\/)" >> $(MISC)$/$(APP6LINKRES:b).rc -.ELSE # "$(USE_SHELL)"=="4nt" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP6ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP6LINKRES:b).rc -.ENDIF # "$(USE_SHELL)"=="4nt" + @-+$(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 + @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc .ENDIF # "$(APP6VERINFO)" != "" - $(RC) -r -DOS2 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc + $(RC) -r -DOS2 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc .ENDIF # "$(APP6LINKRES)" != "" .IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP6TARGET) WINDOWAPI > $(MISC)$/$(APP6TARGET).def + @echo NAME $(APP6TARGET) WINDOWAPI > $(MISC)/$(APP6TARGET).def .ENDIF @+echo $(APP6LINKFLAGS) \ @@ -1671,7 +1603,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(APP6STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP6LINKRES) \ $(APP6RES) \ @@ -1686,7 +1618,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ $(APP6STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP6LINKRES) \ $(APP6RES) \ @@ -1699,11 +1631,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ .IF "$(APP6TARGET)" == "loader" +$(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" +$(RM) $@ +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -1717,7 +1645,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \ # unroll begin .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP7DEF = $(MISC)$/$(APP7TARGET).def +APP7DEF = $(MISC)/$(APP7TARGET).def .ENDIF .IF "$(APP7LINKTYPE)" != "" @@ -1759,7 +1687,7 @@ APP7OBJS+= $(STDOBJVCL) .IF "$(GUI)$(COM)" == "WNTGCC" APP7RESO= .IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != "" -APP7RESO=$(MISC)$/$(APP7TARGET:b)_res.o +APP7RESO=$(MISC)/$(APP7TARGET:b)_res.o .ENDIF .ENDIF @@ -1771,19 +1699,19 @@ USE_APP7DEF= .IF "$(APP7TARGETN)"!="" .IF "$(APP7PRODUCTNAME)"!="" -APP7PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\" +APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\" .ENDIF # "$(APP7PRODUCTNAME)"!="" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP7LIBS)"!="" -$(MISC)$/$(APP7TARGET)_linkinc.ls .PHONY: +$(MISC)/$(APP7TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP7LIBS) $(i:s/.lib/.lin/)) >> $@ + sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP7LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF #"$(APP7LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(APP7TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(APP7TARGETN:b)_linkinc.ls $(APP7TARGETN) : $(LINKINCTARGETS) .ENDIF # "$(linkinc)"!="" @@ -1791,7 +1719,7 @@ $(APP7TARGETN) : $(LINKINCTARGETS) APP7LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP7IMP_ORD = $(APP7STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP7STDLIBS:^"$(LB)$/") +_APP7IMP_ORD = $(APP7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP7STDLIBS:^"$(LB)/") APP7IMP_ORD = $(foreach,i,$(_APP7IMP_ORD) $(shell @-ls $i)) .ELSE APP7IMP_ORD = @@ -1806,24 +1734,24 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd - @-$(RM) $(MISC)$/$(@:b).strip + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd + @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP7OBJS:s/.obj/.o/) \ - `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ - $(APP7LINKTYPEFLAG) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_7.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_7.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_7.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_7.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd + `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + $(APP7LINKTYPEFLAG) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_7.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_7.cmd + @cat $(MISC)/$(TARGET).$(@:b)_7.cmd + @+source $(MISC)/$(TARGET).$(@:b)_7.cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading # libraries at runtime - @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip - @strip -i -R $(MISC)$/$(@:b).strip -X $@ + @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip + @strip -i -R $(MISC)/$(@:b).strip -X $@ @ls -l $@ - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ app $(APP7RPATH) $@ .IF "$(TARGETTYPE)"=="GUI" @echo "Making: $@.app" @@ -1831,44 +1759,44 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ .ENDIF # "$(TARGETTYPE)"=="GUI" .ELSE # "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd - @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ - $(APP7OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_7.cmd - @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_7.cmd - @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd - cat $(MISC)$/$(TARGET).$(@:b)_7.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd + @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd + @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ + $(APP7OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_7.cmd + @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_7.cmd + @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)/$(TARGET).$(@:b)_7.cmd + cat $(MISC)/$(TARGET).$(@:b)_7.cmd + @+source $(MISC)/$(TARGET).$(@:b)_7.cmd @ls -l $@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP7LINKRES)" != "" - @@-$(RM) $(MISC)$/$(APP7LINKRES:b).rc + @@-$(RM) $(MISC)/$(APP7LINKRES:b).rc .IF "$(APP7ICON)" != "" - @-echo 1 ICON $(EMQ)"$(APP7ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP7LINKRES:b).rc + @-echo 1 ICON $(EMQ)"$(APP7ICON:s/\/\\/)$(EMQ)" >> $(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 + @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc + @-echo $(EMQ)#include $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc .ENDIF # "$(APP7VERINFO)" != "" - $(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc + $(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc .ENDIF # "$(APP7LINKRES)" != "" .IF "$(COM)" == "GCC" @echo mingw .IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != "" - @cat $(APP7LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) > $(MISC)$/$(@:b)_all.res - windres $(MISC)$/$(@:b)_all.res $(APP7RESO) + @cat $(APP7LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) > $(MISC)/$(@:b)_all.res + windres $(MISC)/$(@:b)_all.res $(APP7RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ $(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \ - -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP7RESO) \ + -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP7RESO) \ `$(TYPE) /dev/null $(APP7LIBS) | sed s#$(ROUT)#$(OUT)#g` \ $(APP_LINKTYPE) $(APP7LIBSALCPPRT) \ -Wl,--start-group $(APP7STDLIBS) -Wl,--end-group $(APP7STDLIB) \ - $(STDLIB7) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_7.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_7.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd + $(STDLIB7) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_7.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_7.cmd + @+source $(MISC)/$(TARGET).$(@:b)_7.cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" @@ -1877,7 +1805,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(LINKFLAGSAPP) $(APP7BASEX) \ $(APP7STACKN) \ -out:$@ \ - -map:$(MISC)$/{$(subst,$/,_ $(APP7TARGET)).map} \ + -map:$(MISC)/{$(subst,/,_ $(APP7TARGET)).map} \ $(STDOBJ) \ $(APP7LINKRES) \ $(APP7RES) \ @@ -1888,7 +1816,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ ) @-echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI) @@ -1913,17 +1841,13 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(APP7STDLIBS) \ $(APP7STDLIB) $(STDLIB7)) $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP7TARGETN:b)_linkobj.lst >> $(MISC)\$(APP7TARGET).lst - $(IFEXIST) $(MISC)$/$(APP7TARGET).lst $(THEN) type $(MISC)$/$(APP7TARGET).lst >> $(MISC)$/$(APP7TARGET).lnk $(FI) + $(IFEXIST) $(MISC)/$(APP7TARGET).lst $(THEN) type $(MISC)/$(APP7TARGET).lst >> $(MISC)/$(APP7TARGET).lnk $(FI) $(APP7LINKER) @$(MISC)\$(APP7TARGET).lnk .ENDIF # "$(linkinc)" == "" .ENDIF # "$(COM)" == "GCC" .IF "$(APP7TARGET)" == "loader" $(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" $(RM) $@ $(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -1933,23 +1857,19 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ .IF "$(GUI)" == "OS2" @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) .IF "$(APP7LINKRES)" != "" - @+-$(RM) $(MISC)$/$(APP7LINKRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(APP7LINKRES:b).rc >& $(NULLDEV) .IF "$(APP7ICON)" != "" -.IF "$(USE_SHELL)"=="4nt" - @-+echo ICON 1 "$(APP7ICON:s/\/\\/)" >> $(MISC)$/$(APP7LINKRES:b).rc -.ELSE # "$(USE_SHELL)"=="4nt" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP7ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP7LINKRES:b).rc -.ENDIF # "$(USE_SHELL)"=="4nt" + @-+$(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 + @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc .ENDIF # "$(APP7VERINFO)" != "" - $(RC) -r -DOS2 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc + $(RC) -r -DOS2 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc .ENDIF # "$(APP7LINKRES)" != "" .IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP7TARGET) WINDOWAPI > $(MISC)$/$(APP7TARGET).def + @echo NAME $(APP7TARGET) WINDOWAPI > $(MISC)/$(APP7TARGET).def .ENDIF @+echo $(APP7LINKFLAGS) \ @@ -1957,7 +1877,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(APP7STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP7LINKRES) \ $(APP7RES) \ @@ -1972,7 +1892,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ $(APP7STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP7LINKRES) \ $(APP7RES) \ @@ -1985,11 +1905,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ .IF "$(APP7TARGET)" == "loader" +$(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" +$(RM) $@ +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -2003,7 +1919,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \ # unroll begin .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP8DEF = $(MISC)$/$(APP8TARGET).def +APP8DEF = $(MISC)/$(APP8TARGET).def .ENDIF .IF "$(APP8LINKTYPE)" != "" @@ -2045,7 +1961,7 @@ APP8OBJS+= $(STDOBJVCL) .IF "$(GUI)$(COM)" == "WNTGCC" APP8RESO= .IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != "" -APP8RESO=$(MISC)$/$(APP8TARGET:b)_res.o +APP8RESO=$(MISC)/$(APP8TARGET:b)_res.o .ENDIF .ENDIF @@ -2057,19 +1973,19 @@ USE_APP8DEF= .IF "$(APP8TARGETN)"!="" .IF "$(APP8PRODUCTNAME)"!="" -APP8PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\" +APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\" .ENDIF # "$(APP8PRODUCTNAME)"!="" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP8LIBS)"!="" -$(MISC)$/$(APP8TARGET)_linkinc.ls .PHONY: +$(MISC)/$(APP8TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP8LIBS) $(i:s/.lib/.lin/)) >> $@ + sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP8LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF #"$(APP8LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(APP8TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(APP8TARGETN:b)_linkinc.ls $(APP8TARGETN) : $(LINKINCTARGETS) .ENDIF # "$(linkinc)"!="" @@ -2077,7 +1993,7 @@ $(APP8TARGETN) : $(LINKINCTARGETS) APP8LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP8IMP_ORD = $(APP8STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP8STDLIBS:^"$(LB)$/") +_APP8IMP_ORD = $(APP8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP8STDLIBS:^"$(LB)/") APP8IMP_ORD = $(foreach,i,$(_APP8IMP_ORD) $(shell @-ls $i)) .ELSE APP8IMP_ORD = @@ -2092,24 +2008,24 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd - @-$(RM) $(MISC)$/$(@:b).strip + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd + @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP8OBJS:s/.obj/.o/) \ - `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ - $(APP8LINKTYPEFLAG) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_8.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_8.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_8.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_8.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd + `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + $(APP8LINKTYPEFLAG) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_8.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_8.cmd + @cat $(MISC)/$(TARGET).$(@:b)_8.cmd + @+source $(MISC)/$(TARGET).$(@:b)_8.cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading # libraries at runtime - @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip - @strip -i -R $(MISC)$/$(@:b).strip -X $@ + @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip + @strip -i -R $(MISC)/$(@:b).strip -X $@ @ls -l $@ - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ app $(APP8RPATH) $@ .IF "$(TARGETTYPE)"=="GUI" @echo "Making: $@.app" @@ -2117,44 +2033,44 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ .ENDIF # "$(TARGETTYPE)"=="GUI" .ELSE # "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd - @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ - $(APP8OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_8.cmd - @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_8.cmd - @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd - cat $(MISC)$/$(TARGET).$(@:b)_8.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd + @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd + @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ + $(APP8OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_8.cmd + @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_8.cmd + @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)/$(TARGET).$(@:b)_8.cmd + cat $(MISC)/$(TARGET).$(@:b)_8.cmd + @+source $(MISC)/$(TARGET).$(@:b)_8.cmd @ls -l $@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP8LINKRES)" != "" - @@-$(RM) $(MISC)$/$(APP8LINKRES:b).rc + @@-$(RM) $(MISC)/$(APP8LINKRES:b).rc .IF "$(APP8ICON)" != "" - @-echo 1 ICON $(EMQ)"$(APP8ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP8LINKRES:b).rc + @-echo 1 ICON $(EMQ)"$(APP8ICON:s/\/\\/)$(EMQ)" >> $(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 + @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc + @-echo $(EMQ)#include $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc .ENDIF # "$(APP8VERINFO)" != "" - $(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc + $(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc .ENDIF # "$(APP8LINKRES)" != "" .IF "$(COM)" == "GCC" @echo mingw .IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != "" - @cat $(APP8LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) > $(MISC)$/$(@:b)_all.res - windres $(MISC)$/$(@:b)_all.res $(APP8RESO) + @cat $(APP8LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) > $(MISC)/$(@:b)_all.res + windres $(MISC)/$(@:b)_all.res $(APP8RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ $(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \ - -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP8RESO) \ + -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP8RESO) \ `$(TYPE) /dev/null $(APP8LIBS) | sed s#$(ROUT)#$(OUT)#g` \ $(APP_LINKTYPE) $(APP8LIBSALCPPRT) \ -Wl,--start-group $(APP8STDLIBS) -Wl,--end-group $(APP8STDLIB) \ - $(STDLIB8) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_8.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_8.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd + $(STDLIB8) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_8.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_8.cmd + @+source $(MISC)/$(TARGET).$(@:b)_8.cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" @@ -2163,7 +2079,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(LINKFLAGSAPP) $(APP8BASEX) \ $(APP8STACKN) \ -out:$@ \ - -map:$(MISC)$/{$(subst,$/,_ $(APP8TARGET)).map} \ + -map:$(MISC)/{$(subst,/,_ $(APP8TARGET)).map} \ $(STDOBJ) \ $(APP8LINKRES) \ $(APP8RES) \ @@ -2174,7 +2090,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ ) @-echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI) @@ -2199,17 +2115,13 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(APP8STDLIBS) \ $(APP8STDLIB) $(STDLIB8)) $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP8TARGETN:b)_linkobj.lst >> $(MISC)\$(APP8TARGET).lst - $(IFEXIST) $(MISC)$/$(APP8TARGET).lst $(THEN) type $(MISC)$/$(APP8TARGET).lst >> $(MISC)$/$(APP8TARGET).lnk $(FI) + $(IFEXIST) $(MISC)/$(APP8TARGET).lst $(THEN) type $(MISC)/$(APP8TARGET).lst >> $(MISC)/$(APP8TARGET).lnk $(FI) $(APP8LINKER) @$(MISC)\$(APP8TARGET).lnk .ENDIF # "$(linkinc)" == "" .ENDIF # "$(COM)" == "GCC" .IF "$(APP8TARGET)" == "loader" $(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" $(RM) $@ $(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -2219,23 +2131,19 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ .IF "$(GUI)" == "OS2" @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) .IF "$(APP8LINKRES)" != "" - @+-$(RM) $(MISC)$/$(APP8LINKRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(APP8LINKRES:b).rc >& $(NULLDEV) .IF "$(APP8ICON)" != "" -.IF "$(USE_SHELL)"=="4nt" - @-+echo ICON 1 "$(APP8ICON:s/\/\\/)" >> $(MISC)$/$(APP8LINKRES:b).rc -.ELSE # "$(USE_SHELL)"=="4nt" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP8ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP8LINKRES:b).rc -.ENDIF # "$(USE_SHELL)"=="4nt" + @-+$(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 + @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc .ENDIF # "$(APP8VERINFO)" != "" - $(RC) -r -DOS2 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc + $(RC) -r -DOS2 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc .ENDIF # "$(APP8LINKRES)" != "" .IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP8TARGET) WINDOWAPI > $(MISC)$/$(APP8TARGET).def + @echo NAME $(APP8TARGET) WINDOWAPI > $(MISC)/$(APP8TARGET).def .ENDIF @+echo $(APP8LINKFLAGS) \ @@ -2243,7 +2151,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(APP8STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP8LINKRES) \ $(APP8RES) \ @@ -2258,7 +2166,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ $(APP8STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP8LINKRES) \ $(APP8RES) \ @@ -2271,11 +2179,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ .IF "$(APP8TARGET)" == "loader" +$(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" +$(RM) $@ +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -2289,7 +2193,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \ # unroll begin .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP9DEF = $(MISC)$/$(APP9TARGET).def +APP9DEF = $(MISC)/$(APP9TARGET).def .ENDIF .IF "$(APP9LINKTYPE)" != "" @@ -2331,7 +2235,7 @@ APP9OBJS+= $(STDOBJVCL) .IF "$(GUI)$(COM)" == "WNTGCC" APP9RESO= .IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != "" -APP9RESO=$(MISC)$/$(APP9TARGET:b)_res.o +APP9RESO=$(MISC)/$(APP9TARGET:b)_res.o .ENDIF .ENDIF @@ -2343,19 +2247,19 @@ USE_APP9DEF= .IF "$(APP9TARGETN)"!="" .IF "$(APP9PRODUCTNAME)"!="" -APP9PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\" +APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\" .ENDIF # "$(APP9PRODUCTNAME)"!="" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP9LIBS)"!="" -$(MISC)$/$(APP9TARGET)_linkinc.ls .PHONY: +$(MISC)/$(APP9TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP9LIBS) $(i:s/.lib/.lin/)) >> $@ + sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP9LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF #"$(APP9LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(APP9TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(APP9TARGETN:b)_linkinc.ls $(APP9TARGETN) : $(LINKINCTARGETS) .ENDIF # "$(linkinc)"!="" @@ -2363,7 +2267,7 @@ $(APP9TARGETN) : $(LINKINCTARGETS) APP9LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP9IMP_ORD = $(APP9STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP9STDLIBS:^"$(LB)$/") +_APP9IMP_ORD = $(APP9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP9STDLIBS:^"$(LB)/") APP9IMP_ORD = $(foreach,i,$(_APP9IMP_ORD) $(shell @-ls $i)) .ELSE APP9IMP_ORD = @@ -2378,24 +2282,24 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd - @-$(RM) $(MISC)$/$(@:b).strip + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd + @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP9OBJS:s/.obj/.o/) \ - `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ - $(APP9LINKTYPEFLAG) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_9.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_9.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_9.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_9.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd + `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + $(APP9LINKTYPEFLAG) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_9.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_9.cmd + @cat $(MISC)/$(TARGET).$(@:b)_9.cmd + @+source $(MISC)/$(TARGET).$(@:b)_9.cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading # libraries at runtime - @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip - @strip -i -R $(MISC)$/$(@:b).strip -X $@ + @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip + @strip -i -R $(MISC)/$(@:b).strip -X $@ @ls -l $@ - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ app $(APP9RPATH) $@ .IF "$(TARGETTYPE)"=="GUI" @echo "Making: $@.app" @@ -2403,44 +2307,44 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ .ENDIF # "$(TARGETTYPE)"=="GUI" .ELSE # "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd - @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ - $(APP9OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_9.cmd - @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_9.cmd - @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd - cat $(MISC)$/$(TARGET).$(@:b)_9.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd + @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd + @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ + $(APP9OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_9.cmd + @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_9.cmd + @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)/$(TARGET).$(@:b)_9.cmd + cat $(MISC)/$(TARGET).$(@:b)_9.cmd + @+source $(MISC)/$(TARGET).$(@:b)_9.cmd @ls -l $@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP9LINKRES)" != "" - @@-$(RM) $(MISC)$/$(APP9LINKRES:b).rc + @@-$(RM) $(MISC)/$(APP9LINKRES:b).rc .IF "$(APP9ICON)" != "" - @-echo 1 ICON $(EMQ)"$(APP9ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP9LINKRES:b).rc + @-echo 1 ICON $(EMQ)"$(APP9ICON:s/\/\\/)$(EMQ)" >> $(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 + @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc + @-echo $(EMQ)#include $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc .ENDIF # "$(APP9VERINFO)" != "" - $(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc + $(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc .ENDIF # "$(APP9LINKRES)" != "" .IF "$(COM)" == "GCC" @echo mingw .IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != "" - @cat $(APP9LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) > $(MISC)$/$(@:b)_all.res - windres $(MISC)$/$(@:b)_all.res $(APP9RESO) + @cat $(APP9LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) > $(MISC)/$(@:b)_all.res + windres $(MISC)/$(@:b)_all.res $(APP9RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ $(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \ - -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP9RESO) \ + -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP9RESO) \ `$(TYPE) /dev/null $(APP9LIBS) | sed s#$(ROUT)#$(OUT)#g` \ $(APP_LINKTYPE) $(APP9LIBSALCPPRT) \ -Wl,--start-group $(APP9STDLIBS) -Wl,--end-group $(APP9STDLIB) \ - $(STDLIB9) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_9.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_9.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd + $(STDLIB9) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_9.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_9.cmd + @+source $(MISC)/$(TARGET).$(@:b)_9.cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" @@ -2449,7 +2353,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(LINKFLAGSAPP) $(APP9BASEX) \ $(APP9STACKN) \ -out:$@ \ - -map:$(MISC)$/{$(subst,$/,_ $(APP9TARGET)).map} \ + -map:$(MISC)/{$(subst,/,_ $(APP9TARGET)).map} \ $(STDOBJ) \ $(APP9LINKRES) \ $(APP9RES) \ @@ -2460,7 +2364,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ ) @-echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI) @@ -2485,17 +2389,13 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(APP9STDLIBS) \ $(APP9STDLIB) $(STDLIB9)) $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP9TARGETN:b)_linkobj.lst >> $(MISC)\$(APP9TARGET).lst - $(IFEXIST) $(MISC)$/$(APP9TARGET).lst $(THEN) type $(MISC)$/$(APP9TARGET).lst >> $(MISC)$/$(APP9TARGET).lnk $(FI) + $(IFEXIST) $(MISC)/$(APP9TARGET).lst $(THEN) type $(MISC)/$(APP9TARGET).lst >> $(MISC)/$(APP9TARGET).lnk $(FI) $(APP9LINKER) @$(MISC)\$(APP9TARGET).lnk .ENDIF # "$(linkinc)" == "" .ENDIF # "$(COM)" == "GCC" .IF "$(APP9TARGET)" == "loader" $(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" $(RM) $@ $(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -2505,23 +2405,19 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ .IF "$(GUI)" == "OS2" @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) .IF "$(APP9LINKRES)" != "" - @+-$(RM) $(MISC)$/$(APP9LINKRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(APP9LINKRES:b).rc >& $(NULLDEV) .IF "$(APP9ICON)" != "" -.IF "$(USE_SHELL)"=="4nt" - @-+echo ICON 1 "$(APP9ICON:s/\/\\/)" >> $(MISC)$/$(APP9LINKRES:b).rc -.ELSE # "$(USE_SHELL)"=="4nt" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP9ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP9LINKRES:b).rc -.ENDIF # "$(USE_SHELL)"=="4nt" + @-+$(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 + @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc .ENDIF # "$(APP9VERINFO)" != "" - $(RC) -r -DOS2 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc + $(RC) -r -DOS2 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc .ENDIF # "$(APP9LINKRES)" != "" .IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP9TARGET) WINDOWAPI > $(MISC)$/$(APP9TARGET).def + @echo NAME $(APP9TARGET) WINDOWAPI > $(MISC)/$(APP9TARGET).def .ENDIF @+echo $(APP9LINKFLAGS) \ @@ -2529,7 +2425,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(APP9STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP9LINKRES) \ $(APP9RES) \ @@ -2544,7 +2440,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ $(APP9STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP9LINKRES) \ $(APP9RES) \ @@ -2557,11 +2453,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ .IF "$(APP9TARGET)" == "loader" +$(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" +$(RM) $@ +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -2575,7 +2467,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \ # unroll begin .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP10DEF = $(MISC)$/$(APP10TARGET).def +APP10DEF = $(MISC)/$(APP10TARGET).def .ENDIF .IF "$(APP10LINKTYPE)" != "" @@ -2617,7 +2509,7 @@ APP10OBJS+= $(STDOBJVCL) .IF "$(GUI)$(COM)" == "WNTGCC" APP10RESO= .IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != "" -APP10RESO=$(MISC)$/$(APP10TARGET:b)_res.o +APP10RESO=$(MISC)/$(APP10TARGET:b)_res.o .ENDIF .ENDIF @@ -2629,19 +2521,19 @@ USE_APP10DEF= .IF "$(APP10TARGETN)"!="" .IF "$(APP10PRODUCTNAME)"!="" -APP10PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\" +APP10PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP10PRODUCTNAME)\" .ENDIF # "$(APP10PRODUCTNAME)"!="" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP10LIBS)"!="" -$(MISC)$/$(APP10TARGET)_linkinc.ls .PHONY: +$(MISC)/$(APP10TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP10LIBS) $(i:s/.lib/.lin/)) >> $@ + sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP10LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF #"$(APP10LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(APP10TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(APP10TARGETN:b)_linkinc.ls $(APP10TARGETN) : $(LINKINCTARGETS) .ENDIF # "$(linkinc)"!="" @@ -2649,7 +2541,7 @@ $(APP10TARGETN) : $(LINKINCTARGETS) APP10LIBSALCPPRT*=$(LIBSALCPPRT) .IF "$(GUI)" == "OS2" -_APP10IMP_ORD = $(APP10STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(APP10STDLIBS:^"$(LB)$/") +_APP10IMP_ORD = $(APP10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(APP10STDLIBS:^"$(LB)/") APP10IMP_ORD = $(foreach,i,$(_APP10IMP_ORD) $(shell @-ls $i)) .ELSE APP10IMP_ORD = @@ -2664,24 +2556,24 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd - @-$(RM) $(MISC)$/$(@:b).strip + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd + @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP10OBJS:s/.obj/.o/) \ - `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ - $(APP10LINKTYPEFLAG) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_10.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_10.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_10.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_10.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd + `cat /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + $(APP10LINKTYPEFLAG) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_10.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_10.cmd + @cat $(MISC)/$(TARGET).$(@:b)_10.cmd + @+source $(MISC)/$(TARGET).$(@:b)_10.cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading # libraries at runtime - @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip - @strip -i -R $(MISC)$/$(@:b).strip -X $@ + @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip + @strip -i -R $(MISC)/$(@:b).strip -X $@ @ls -l $@ - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ app $(APP10RPATH) $@ .IF "$(TARGETTYPE)"=="GUI" @echo "Making: $@.app" @@ -2689,44 +2581,44 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ .ENDIF # "$(TARGETTYPE)"=="GUI" .ELSE # "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd - @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ - $(APP10OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_10.cmd - @cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_10.cmd - @echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_10.cmd - cat $(MISC)$/$(TARGET).$(@:b)_10.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd + @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd + @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ + $(APP10OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_10.cmd + @cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_10.cmd + @echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)/$(TARGET).$(@:b)_10.cmd + cat $(MISC)/$(TARGET).$(@:b)_10.cmd + @+source $(MISC)/$(TARGET).$(@:b)_10.cmd @ls -l $@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP10LINKRES)" != "" - @@-$(RM) $(MISC)$/$(APP10LINKRES:b).rc + @@-$(RM) $(MISC)/$(APP10LINKRES:b).rc .IF "$(APP10ICON)" != "" - @-echo 1 ICON $(EMQ)"$(APP10ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP10LINKRES:b).rc + @-echo 1 ICON $(EMQ)"$(APP10ICON:s/\/\\/)$(EMQ)" >> $(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 + @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc + @-echo $(EMQ)#include $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc .ENDIF # "$(APP10VERINFO)" != "" - $(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc + $(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc .ENDIF # "$(APP10LINKRES)" != "" .IF "$(COM)" == "GCC" @echo mingw .IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != "" - @cat $(APP10LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) > $(MISC)$/$(@:b)_all.res - windres $(MISC)$/$(@:b)_all.res $(APP10RESO) + @cat $(APP10LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) > $(MISC)/$(@:b)_all.res + windres $(MISC)/$(@:b)_all.res $(APP10RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ $(APP10BASEX) $(APP10STACKN) -o $@ $(APP10OBJS) \ - -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP10RESO) \ + -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP10RESO) \ `$(TYPE) /dev/null $(APP10LIBS) | sed s#$(ROUT)#$(OUT)#g` \ $(APP_LINKTYPE) $(APP10LIBSALCPPRT) \ -Wl,--start-group $(APP10STDLIBS) -Wl,--end-group $(APP10STDLIB) \ - $(STDLIB10) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_10.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_10.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd + $(STDLIB10) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_10.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_10.cmd + @+source $(MISC)/$(TARGET).$(@:b)_10.cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" @@ -2735,7 +2627,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(LINKFLAGSAPP) $(APP10BASEX) \ $(APP10STACKN) \ -out:$@ \ - -map:$(MISC)$/{$(subst,$/,_ $(APP10TARGET)).map} \ + -map:$(MISC)/{$(subst,/,_ $(APP10TARGET)).map} \ $(STDOBJ) \ $(APP10LINKRES) \ $(APP10RES) \ @@ -2746,7 +2638,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ ) @-echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI) @@ -2771,17 +2663,13 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(APP10STDLIBS) \ $(APP10STDLIB) $(STDLIB10)) $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP10TARGETN:b)_linkobj.lst >> $(MISC)\$(APP10TARGET).lst - $(IFEXIST) $(MISC)$/$(APP10TARGET).lst $(THEN) type $(MISC)$/$(APP10TARGET).lst >> $(MISC)$/$(APP10TARGET).lnk $(FI) + $(IFEXIST) $(MISC)/$(APP10TARGET).lst $(THEN) type $(MISC)/$(APP10TARGET).lst >> $(MISC)/$(APP10TARGET).lnk $(FI) $(APP10LINKER) @$(MISC)\$(APP10TARGET).lnk .ENDIF # "$(linkinc)" == "" .ENDIF # "$(COM)" == "GCC" .IF "$(APP10TARGET)" == "loader" $(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" $(RM) $@ $(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -2791,23 +2679,19 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ .IF "$(GUI)" == "OS2" @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) .IF "$(APP10LINKRES)" != "" - @+-$(RM) $(MISC)$/$(APP10LINKRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(APP10LINKRES:b).rc >& $(NULLDEV) .IF "$(APP10ICON)" != "" -.IF "$(USE_SHELL)"=="4nt" - @-+echo ICON 1 "$(APP10ICON:s/\/\\/)" >> $(MISC)$/$(APP10LINKRES:b).rc -.ELSE # "$(USE_SHELL)"=="4nt" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP10ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP10LINKRES:b).rc -.ENDIF # "$(USE_SHELL)"=="4nt" + @-+$(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 + @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc + @-+echo $(EMQ)#include $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc .ENDIF # "$(APP10VERINFO)" != "" - $(RC) -r -DOS2 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc + $(RC) -r -DOS2 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc .ENDIF # "$(APP10LINKRES)" != "" .IF "$(TARGETTYPE)" == "GUI" - @echo NAME $(APP10TARGET) WINDOWAPI > $(MISC)$/$(APP10TARGET).def + @echo NAME $(APP10TARGET) WINDOWAPI > $(MISC)/$(APP10TARGET).def .ENDIF @+echo $(APP10LINKFLAGS) \ @@ -2815,7 +2699,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(APP10STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP10LINKRES) \ $(APP10RES) \ @@ -2830,7 +2714,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ $(APP10STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP10LINKRES) \ $(APP10RES) \ @@ -2843,11 +2727,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \ .IF "$(APP10TARGET)" == "loader" +$(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" +$(RM) $@ +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk index 06d4174200ba..cae6cd48a6b1 100644 --- a/solenv/inc/_tg_def.mk +++ b/solenv/inc/_tg_def.mk @@ -8,19 +8,19 @@ DEFLIB1NAME*=$(DEF1LIBNAME) .ENDIF # "$(DEF1LIBNAME)"!="" .IF "$(DEFLIB1NAME)"!="" -DEF1DEPN+=$(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib) +DEF1DEPN+=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) .ENDIF .IF "$(SHL1VERSIONMAP)"!="" .IF "$(DEF1EXPORTFILE)"=="" .IF "$(GUI)"=="WNT" -DEF1EXPORTFILE=$(MISC)$/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp +DEF1EXPORTFILE=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp .IF "$(COM)"=="GCC" $(DEF1EXPORTFILE) : $(SHL1OBJS) $(SHL1LIBS) .ENDIF # .IF "$(COM)"=="GCC" $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .IF "$(COM)"=="GCC" -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols -$(GREP) "\*\|?" $@ > $@.symbols-regexp @@ -28,7 +28,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL1OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -37,9 +37,9 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -DEF1EXPORTFILE=$(MISC)$/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp +DEF1EXPORTFILE=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET).dxp $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .ENDIF # "$(GUI)"=="OS2" .ENDIF # "$(DEF1EXPORTFILE)"=="" @@ -47,7 +47,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP) .IF "$(GUI)"=="WNT" -DEF1FILTER=$(SOLARENV)$/inc$/dummy.flt +DEF1FILTER=$(SOLARENV)/inc/dummy.flt RMHACK1:=$(RM) @@ -76,20 +76,20 @@ $(DEF1TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB1NAME)"!="" .IF "$(COM)"=="GCC" - @-$(RM) $(MISC)$/$(SHL1TARGET).exp - dlltool --output-def $(MISC)$/$(SHL1TARGET).exp --export-all-symbols \ - `$(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` - tail --lines +3 $(MISC)$/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile - @-$(RM) $(MISC)$/$(SHL1TARGET).exp + @-$(RM) $(MISC)/$(SHL1TARGET).exp + dlltool --output-def $(MISC)/$(SHL1TARGET).exp --export-all-symbols \ + `$(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g` + tail --lines +3 $(MISC)/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-$(RM) $(MISC)/$(SHL1TARGET).exp .ELSE .IF "$(SHL1USE_EXPORTS)"=="" - @-$(RMHACK1) $(MISC)$/$(SHL1TARGET).exp - @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL1TARGET).exp $(SLB)$/$(DEFLIB1NAME).lib - @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL1TARGET).flt $(MISC)$/$(SHL1TARGET).exp >>$@.tmpfile - $(RMHACK1) $(MISC)$/$(SHL1TARGET).exp + @-$(RMHACK1) $(MISC)/$(SHL1TARGET).exp + @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL1TARGET).exp $(SLB)/$(DEFLIB1NAME).lib + @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL1TARGET).flt $(MISC)/$(SHL1TARGET).exp >>$@.tmpfile + $(RMHACK1) $(MISC)/$(SHL1TARGET).exp .ELSE # "$(SHL1USE_EXPORTS)"=="" - @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB1NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL1TARGET).direct - @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)$/$(SHL1TARGET).direct >>$@.tmpfile + @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL1TARGET).direct + @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)/$(SHL1TARGET).direct >>$@.tmpfile .ENDIF # "$(SHL1USE_EXPORTS)"=="" .ENDIF .ENDIF # "$(DEFLIB1NAME)"!="" @@ -170,8 +170,8 @@ $(DEF1TARGETN) .PHONY : #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) +DEF1FILTER=$(SOLARENV)/inc/dummy.flt +DEF1NAMELIST=$(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) .IF "$(link_always)"=="" $(DEF1TARGETN) : \ @@ -193,7 +193,7 @@ $(DEF1TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB1NAME)"!="" - @+echo $(SLB)$/$(DEFLIB1NAME).lib + @+echo $(SLB)/$(DEFLIB1NAME).lib @+emxexpr $(DEF1NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB1NAME)"!="" @@ -291,19 +291,19 @@ DEFLIB2NAME*=$(DEF2LIBNAME) .ENDIF # "$(DEF2LIBNAME)"!="" .IF "$(DEFLIB2NAME)"!="" -DEF2DEPN+=$(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib) +DEF2DEPN+=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) .ENDIF .IF "$(SHL2VERSIONMAP)"!="" .IF "$(DEF2EXPORTFILE)"=="" .IF "$(GUI)"=="WNT" -DEF2EXPORTFILE=$(MISC)$/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp +DEF2EXPORTFILE=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp .IF "$(COM)"=="GCC" $(DEF2EXPORTFILE) : $(SHL2OBJS) $(SHL2LIBS) .ENDIF # .IF "$(COM)"=="GCC" $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .IF "$(COM)"=="GCC" -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols -$(GREP) "\*\|?" $@ > $@.symbols-regexp @@ -311,7 +311,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL2OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -320,9 +320,9 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -DEF2EXPORTFILE=$(MISC)$/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp +DEF2EXPORTFILE=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET).dxp $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .ENDIF # "$(GUI)"=="OS2" .ENDIF # "$(DEF2EXPORTFILE)"=="" @@ -330,7 +330,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP) .IF "$(GUI)"=="WNT" -DEF2FILTER=$(SOLARENV)$/inc$/dummy.flt +DEF2FILTER=$(SOLARENV)/inc/dummy.flt RMHACK2:=$(RM) @@ -359,20 +359,20 @@ $(DEF2TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB2NAME)"!="" .IF "$(COM)"=="GCC" - @-$(RM) $(MISC)$/$(SHL2TARGET).exp - dlltool --output-def $(MISC)$/$(SHL2TARGET).exp --export-all-symbols \ - `$(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` - tail --lines +3 $(MISC)$/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile - @-$(RM) $(MISC)$/$(SHL2TARGET).exp + @-$(RM) $(MISC)/$(SHL2TARGET).exp + dlltool --output-def $(MISC)/$(SHL2TARGET).exp --export-all-symbols \ + `$(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g` + tail --lines +3 $(MISC)/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-$(RM) $(MISC)/$(SHL2TARGET).exp .ELSE .IF "$(SHL2USE_EXPORTS)"=="" - @-$(RMHACK2) $(MISC)$/$(SHL2TARGET).exp - @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL2TARGET).exp $(SLB)$/$(DEFLIB2NAME).lib - @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL2TARGET).flt $(MISC)$/$(SHL2TARGET).exp >>$@.tmpfile - $(RMHACK2) $(MISC)$/$(SHL2TARGET).exp + @-$(RMHACK2) $(MISC)/$(SHL2TARGET).exp + @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL2TARGET).exp $(SLB)/$(DEFLIB2NAME).lib + @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL2TARGET).flt $(MISC)/$(SHL2TARGET).exp >>$@.tmpfile + $(RMHACK2) $(MISC)/$(SHL2TARGET).exp .ELSE # "$(SHL2USE_EXPORTS)"=="" - @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB2NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL2TARGET).direct - @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)$/$(SHL2TARGET).direct >>$@.tmpfile + @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL2TARGET).direct + @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)/$(SHL2TARGET).direct >>$@.tmpfile .ENDIF # "$(SHL2USE_EXPORTS)"=="" .ENDIF .ENDIF # "$(DEFLIB2NAME)"!="" @@ -453,8 +453,8 @@ $(DEF2TARGETN) .PHONY : #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) +DEF2FILTER=$(SOLARENV)/inc/dummy.flt +DEF2NAMELIST=$(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) .IF "$(link_always)"=="" $(DEF2TARGETN) : \ @@ -476,7 +476,7 @@ $(DEF2TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB2NAME)"!="" - @+echo $(SLB)$/$(DEFLIB2NAME).lib + @+echo $(SLB)/$(DEFLIB2NAME).lib @+emxexpr $(DEF2NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB2NAME)"!="" @@ -574,19 +574,19 @@ DEFLIB3NAME*=$(DEF3LIBNAME) .ENDIF # "$(DEF3LIBNAME)"!="" .IF "$(DEFLIB3NAME)"!="" -DEF3DEPN+=$(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib) +DEF3DEPN+=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) .ENDIF .IF "$(SHL3VERSIONMAP)"!="" .IF "$(DEF3EXPORTFILE)"=="" .IF "$(GUI)"=="WNT" -DEF3EXPORTFILE=$(MISC)$/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp +DEF3EXPORTFILE=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp .IF "$(COM)"=="GCC" $(DEF3EXPORTFILE) : $(SHL3OBJS) $(SHL3LIBS) .ENDIF # .IF "$(COM)"=="GCC" $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .IF "$(COM)"=="GCC" -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols -$(GREP) "\*\|?" $@ > $@.symbols-regexp @@ -594,7 +594,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL3OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -603,9 +603,9 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -DEF3EXPORTFILE=$(MISC)$/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp +DEF3EXPORTFILE=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET).dxp $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .ENDIF # "$(GUI)"=="OS2" .ENDIF # "$(DEF3EXPORTFILE)"=="" @@ -613,7 +613,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP) .IF "$(GUI)"=="WNT" -DEF3FILTER=$(SOLARENV)$/inc$/dummy.flt +DEF3FILTER=$(SOLARENV)/inc/dummy.flt RMHACK3:=$(RM) @@ -642,20 +642,20 @@ $(DEF3TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB3NAME)"!="" .IF "$(COM)"=="GCC" - @-$(RM) $(MISC)$/$(SHL3TARGET).exp - dlltool --output-def $(MISC)$/$(SHL3TARGET).exp --export-all-symbols \ - `$(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` - tail --lines +3 $(MISC)$/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile - @-$(RM) $(MISC)$/$(SHL3TARGET).exp + @-$(RM) $(MISC)/$(SHL3TARGET).exp + dlltool --output-def $(MISC)/$(SHL3TARGET).exp --export-all-symbols \ + `$(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g` + tail --lines +3 $(MISC)/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-$(RM) $(MISC)/$(SHL3TARGET).exp .ELSE .IF "$(SHL3USE_EXPORTS)"=="" - @-$(RMHACK3) $(MISC)$/$(SHL3TARGET).exp - @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL3TARGET).exp $(SLB)$/$(DEFLIB3NAME).lib - @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL3TARGET).flt $(MISC)$/$(SHL3TARGET).exp >>$@.tmpfile - $(RMHACK3) $(MISC)$/$(SHL3TARGET).exp + @-$(RMHACK3) $(MISC)/$(SHL3TARGET).exp + @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL3TARGET).exp $(SLB)/$(DEFLIB3NAME).lib + @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL3TARGET).flt $(MISC)/$(SHL3TARGET).exp >>$@.tmpfile + $(RMHACK3) $(MISC)/$(SHL3TARGET).exp .ELSE # "$(SHL3USE_EXPORTS)"=="" - @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB3NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL3TARGET).direct - @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)$/$(SHL3TARGET).direct >>$@.tmpfile + @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL3TARGET).direct + @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)/$(SHL3TARGET).direct >>$@.tmpfile .ENDIF # "$(SHL3USE_EXPORTS)"=="" .ENDIF .ENDIF # "$(DEFLIB3NAME)"!="" @@ -736,8 +736,8 @@ $(DEF3TARGETN) .PHONY : #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) +DEF3FILTER=$(SOLARENV)/inc/dummy.flt +DEF3NAMELIST=$(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) .IF "$(link_always)"=="" $(DEF3TARGETN) : \ @@ -759,7 +759,7 @@ $(DEF3TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB3NAME)"!="" - @+echo $(SLB)$/$(DEFLIB3NAME).lib + @+echo $(SLB)/$(DEFLIB3NAME).lib @+emxexpr $(DEF3NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB3NAME)"!="" @@ -857,19 +857,19 @@ DEFLIB4NAME*=$(DEF4LIBNAME) .ENDIF # "$(DEF4LIBNAME)"!="" .IF "$(DEFLIB4NAME)"!="" -DEF4DEPN+=$(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib) +DEF4DEPN+=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) .ENDIF .IF "$(SHL4VERSIONMAP)"!="" .IF "$(DEF4EXPORTFILE)"=="" .IF "$(GUI)"=="WNT" -DEF4EXPORTFILE=$(MISC)$/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp +DEF4EXPORTFILE=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp .IF "$(COM)"=="GCC" $(DEF4EXPORTFILE) : $(SHL4OBJS) $(SHL4LIBS) .ENDIF # .IF "$(COM)"=="GCC" $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .IF "$(COM)"=="GCC" -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols -$(GREP) "\*\|?" $@ > $@.symbols-regexp @@ -877,7 +877,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL4OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -886,9 +886,9 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -DEF4EXPORTFILE=$(MISC)$/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp +DEF4EXPORTFILE=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET).dxp $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .ENDIF # "$(GUI)"=="OS2" .ENDIF # "$(DEF4EXPORTFILE)"=="" @@ -896,7 +896,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP) .IF "$(GUI)"=="WNT" -DEF4FILTER=$(SOLARENV)$/inc$/dummy.flt +DEF4FILTER=$(SOLARENV)/inc/dummy.flt RMHACK4:=$(RM) @@ -925,20 +925,20 @@ $(DEF4TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB4NAME)"!="" .IF "$(COM)"=="GCC" - @-$(RM) $(MISC)$/$(SHL4TARGET).exp - dlltool --output-def $(MISC)$/$(SHL4TARGET).exp --export-all-symbols \ - `$(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` - tail --lines +3 $(MISC)$/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile - @-$(RM) $(MISC)$/$(SHL4TARGET).exp + @-$(RM) $(MISC)/$(SHL4TARGET).exp + dlltool --output-def $(MISC)/$(SHL4TARGET).exp --export-all-symbols \ + `$(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g` + tail --lines +3 $(MISC)/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-$(RM) $(MISC)/$(SHL4TARGET).exp .ELSE .IF "$(SHL4USE_EXPORTS)"=="" - @-$(RMHACK4) $(MISC)$/$(SHL4TARGET).exp - @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL4TARGET).exp $(SLB)$/$(DEFLIB4NAME).lib - @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL4TARGET).flt $(MISC)$/$(SHL4TARGET).exp >>$@.tmpfile - $(RMHACK4) $(MISC)$/$(SHL4TARGET).exp + @-$(RMHACK4) $(MISC)/$(SHL4TARGET).exp + @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL4TARGET).exp $(SLB)/$(DEFLIB4NAME).lib + @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL4TARGET).flt $(MISC)/$(SHL4TARGET).exp >>$@.tmpfile + $(RMHACK4) $(MISC)/$(SHL4TARGET).exp .ELSE # "$(SHL4USE_EXPORTS)"=="" - @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB4NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL4TARGET).direct - @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)$/$(SHL4TARGET).direct >>$@.tmpfile + @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL4TARGET).direct + @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)/$(SHL4TARGET).direct >>$@.tmpfile .ENDIF # "$(SHL4USE_EXPORTS)"=="" .ENDIF .ENDIF # "$(DEFLIB4NAME)"!="" @@ -1019,8 +1019,8 @@ $(DEF4TARGETN) .PHONY : #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) +DEF4FILTER=$(SOLARENV)/inc/dummy.flt +DEF4NAMELIST=$(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) .IF "$(link_always)"=="" $(DEF4TARGETN) : \ @@ -1042,7 +1042,7 @@ $(DEF4TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB4NAME)"!="" - @+echo $(SLB)$/$(DEFLIB4NAME).lib + @+echo $(SLB)/$(DEFLIB4NAME).lib @+emxexpr $(DEF4NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB4NAME)"!="" @@ -1140,19 +1140,19 @@ DEFLIB5NAME*=$(DEF5LIBNAME) .ENDIF # "$(DEF5LIBNAME)"!="" .IF "$(DEFLIB5NAME)"!="" -DEF5DEPN+=$(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib) +DEF5DEPN+=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) .ENDIF .IF "$(SHL5VERSIONMAP)"!="" .IF "$(DEF5EXPORTFILE)"=="" .IF "$(GUI)"=="WNT" -DEF5EXPORTFILE=$(MISC)$/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp +DEF5EXPORTFILE=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp .IF "$(COM)"=="GCC" $(DEF5EXPORTFILE) : $(SHL5OBJS) $(SHL5LIBS) .ENDIF # .IF "$(COM)"=="GCC" $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .IF "$(COM)"=="GCC" -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols -$(GREP) "\*\|?" $@ > $@.symbols-regexp @@ -1160,7 +1160,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL5OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -1169,9 +1169,9 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -DEF5EXPORTFILE=$(MISC)$/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp +DEF5EXPORTFILE=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET).dxp $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .ENDIF # "$(GUI)"=="OS2" .ENDIF # "$(DEF5EXPORTFILE)"=="" @@ -1179,7 +1179,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP) .IF "$(GUI)"=="WNT" -DEF5FILTER=$(SOLARENV)$/inc$/dummy.flt +DEF5FILTER=$(SOLARENV)/inc/dummy.flt RMHACK5:=$(RM) @@ -1208,20 +1208,20 @@ $(DEF5TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB5NAME)"!="" .IF "$(COM)"=="GCC" - @-$(RM) $(MISC)$/$(SHL5TARGET).exp - dlltool --output-def $(MISC)$/$(SHL5TARGET).exp --export-all-symbols \ - `$(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` - tail --lines +3 $(MISC)$/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile - @-$(RM) $(MISC)$/$(SHL5TARGET).exp + @-$(RM) $(MISC)/$(SHL5TARGET).exp + dlltool --output-def $(MISC)/$(SHL5TARGET).exp --export-all-symbols \ + `$(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g` + tail --lines +3 $(MISC)/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-$(RM) $(MISC)/$(SHL5TARGET).exp .ELSE .IF "$(SHL5USE_EXPORTS)"=="" - @-$(RMHACK5) $(MISC)$/$(SHL5TARGET).exp - @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL5TARGET).exp $(SLB)$/$(DEFLIB5NAME).lib - @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL5TARGET).flt $(MISC)$/$(SHL5TARGET).exp >>$@.tmpfile - $(RMHACK5) $(MISC)$/$(SHL5TARGET).exp + @-$(RMHACK5) $(MISC)/$(SHL5TARGET).exp + @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL5TARGET).exp $(SLB)/$(DEFLIB5NAME).lib + @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL5TARGET).flt $(MISC)/$(SHL5TARGET).exp >>$@.tmpfile + $(RMHACK5) $(MISC)/$(SHL5TARGET).exp .ELSE # "$(SHL5USE_EXPORTS)"=="" - @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB5NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL5TARGET).direct - @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)$/$(SHL5TARGET).direct >>$@.tmpfile + @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL5TARGET).direct + @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)/$(SHL5TARGET).direct >>$@.tmpfile .ENDIF # "$(SHL5USE_EXPORTS)"=="" .ENDIF .ENDIF # "$(DEFLIB5NAME)"!="" @@ -1302,8 +1302,8 @@ $(DEF5TARGETN) .PHONY : #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) +DEF5FILTER=$(SOLARENV)/inc/dummy.flt +DEF5NAMELIST=$(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) .IF "$(link_always)"=="" $(DEF5TARGETN) : \ @@ -1325,7 +1325,7 @@ $(DEF5TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB5NAME)"!="" - @+echo $(SLB)$/$(DEFLIB5NAME).lib + @+echo $(SLB)/$(DEFLIB5NAME).lib @+emxexpr $(DEF5NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB5NAME)"!="" @@ -1423,19 +1423,19 @@ DEFLIB6NAME*=$(DEF6LIBNAME) .ENDIF # "$(DEF6LIBNAME)"!="" .IF "$(DEFLIB6NAME)"!="" -DEF6DEPN+=$(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib) +DEF6DEPN+=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) .ENDIF .IF "$(SHL6VERSIONMAP)"!="" .IF "$(DEF6EXPORTFILE)"=="" .IF "$(GUI)"=="WNT" -DEF6EXPORTFILE=$(MISC)$/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp +DEF6EXPORTFILE=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp .IF "$(COM)"=="GCC" $(DEF6EXPORTFILE) : $(SHL6OBJS) $(SHL6LIBS) .ENDIF # .IF "$(COM)"=="GCC" $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .IF "$(COM)"=="GCC" -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols -$(GREP) "\*\|?" $@ > $@.symbols-regexp @@ -1443,7 +1443,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL6OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -1452,9 +1452,9 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -DEF6EXPORTFILE=$(MISC)$/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp +DEF6EXPORTFILE=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET).dxp $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .ENDIF # "$(GUI)"=="OS2" .ENDIF # "$(DEF6EXPORTFILE)"=="" @@ -1462,7 +1462,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP) .IF "$(GUI)"=="WNT" -DEF6FILTER=$(SOLARENV)$/inc$/dummy.flt +DEF6FILTER=$(SOLARENV)/inc/dummy.flt RMHACK6:=$(RM) @@ -1491,20 +1491,20 @@ $(DEF6TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB6NAME)"!="" .IF "$(COM)"=="GCC" - @-$(RM) $(MISC)$/$(SHL6TARGET).exp - dlltool --output-def $(MISC)$/$(SHL6TARGET).exp --export-all-symbols \ - `$(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` - tail --lines +3 $(MISC)$/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile - @-$(RM) $(MISC)$/$(SHL6TARGET).exp + @-$(RM) $(MISC)/$(SHL6TARGET).exp + dlltool --output-def $(MISC)/$(SHL6TARGET).exp --export-all-symbols \ + `$(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g` + tail --lines +3 $(MISC)/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-$(RM) $(MISC)/$(SHL6TARGET).exp .ELSE .IF "$(SHL6USE_EXPORTS)"=="" - @-$(RMHACK6) $(MISC)$/$(SHL6TARGET).exp - @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL6TARGET).exp $(SLB)$/$(DEFLIB6NAME).lib - @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL6TARGET).flt $(MISC)$/$(SHL6TARGET).exp >>$@.tmpfile - $(RMHACK6) $(MISC)$/$(SHL6TARGET).exp + @-$(RMHACK6) $(MISC)/$(SHL6TARGET).exp + @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL6TARGET).exp $(SLB)/$(DEFLIB6NAME).lib + @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL6TARGET).flt $(MISC)/$(SHL6TARGET).exp >>$@.tmpfile + $(RMHACK6) $(MISC)/$(SHL6TARGET).exp .ELSE # "$(SHL6USE_EXPORTS)"=="" - @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB6NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL6TARGET).direct - @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)$/$(SHL6TARGET).direct >>$@.tmpfile + @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL6TARGET).direct + @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)/$(SHL6TARGET).direct >>$@.tmpfile .ENDIF # "$(SHL6USE_EXPORTS)"=="" .ENDIF .ENDIF # "$(DEFLIB6NAME)"!="" @@ -1585,8 +1585,8 @@ $(DEF6TARGETN) .PHONY : #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) +DEF6FILTER=$(SOLARENV)/inc/dummy.flt +DEF6NAMELIST=$(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) .IF "$(link_always)"=="" $(DEF6TARGETN) : \ @@ -1608,7 +1608,7 @@ $(DEF6TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB6NAME)"!="" - @+echo $(SLB)$/$(DEFLIB6NAME).lib + @+echo $(SLB)/$(DEFLIB6NAME).lib @+emxexpr $(DEF6NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB6NAME)"!="" @@ -1706,19 +1706,19 @@ DEFLIB7NAME*=$(DEF7LIBNAME) .ENDIF # "$(DEF7LIBNAME)"!="" .IF "$(DEFLIB7NAME)"!="" -DEF7DEPN+=$(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib) +DEF7DEPN+=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) .ENDIF .IF "$(SHL7VERSIONMAP)"!="" .IF "$(DEF7EXPORTFILE)"=="" .IF "$(GUI)"=="WNT" -DEF7EXPORTFILE=$(MISC)$/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp +DEF7EXPORTFILE=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp .IF "$(COM)"=="GCC" $(DEF7EXPORTFILE) : $(SHL7OBJS) $(SHL7LIBS) .ENDIF # .IF "$(COM)"=="GCC" $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .IF "$(COM)"=="GCC" -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols -$(GREP) "\*\|?" $@ > $@.symbols-regexp @@ -1726,7 +1726,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL7OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -1735,9 +1735,9 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -DEF7EXPORTFILE=$(MISC)$/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp +DEF7EXPORTFILE=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET).dxp $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .ENDIF # "$(GUI)"=="OS2" .ENDIF # "$(DEF7EXPORTFILE)"=="" @@ -1745,7 +1745,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP) .IF "$(GUI)"=="WNT" -DEF7FILTER=$(SOLARENV)$/inc$/dummy.flt +DEF7FILTER=$(SOLARENV)/inc/dummy.flt RMHACK7:=$(RM) @@ -1774,20 +1774,20 @@ $(DEF7TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB7NAME)"!="" .IF "$(COM)"=="GCC" - @-$(RM) $(MISC)$/$(SHL7TARGET).exp - dlltool --output-def $(MISC)$/$(SHL7TARGET).exp --export-all-symbols \ - `$(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` - tail --lines +3 $(MISC)$/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile - @-$(RM) $(MISC)$/$(SHL7TARGET).exp + @-$(RM) $(MISC)/$(SHL7TARGET).exp + dlltool --output-def $(MISC)/$(SHL7TARGET).exp --export-all-symbols \ + `$(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g` + tail --lines +3 $(MISC)/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-$(RM) $(MISC)/$(SHL7TARGET).exp .ELSE .IF "$(SHL7USE_EXPORTS)"=="" - @-$(RMHACK7) $(MISC)$/$(SHL7TARGET).exp - @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL7TARGET).exp $(SLB)$/$(DEFLIB7NAME).lib - @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL7TARGET).flt $(MISC)$/$(SHL7TARGET).exp >>$@.tmpfile - $(RMHACK7) $(MISC)$/$(SHL7TARGET).exp + @-$(RMHACK7) $(MISC)/$(SHL7TARGET).exp + @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL7TARGET).exp $(SLB)/$(DEFLIB7NAME).lib + @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL7TARGET).flt $(MISC)/$(SHL7TARGET).exp >>$@.tmpfile + $(RMHACK7) $(MISC)/$(SHL7TARGET).exp .ELSE # "$(SHL7USE_EXPORTS)"=="" - @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB7NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL7TARGET).direct - @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)$/$(SHL7TARGET).direct >>$@.tmpfile + @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL7TARGET).direct + @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)/$(SHL7TARGET).direct >>$@.tmpfile .ENDIF # "$(SHL7USE_EXPORTS)"=="" .ENDIF .ENDIF # "$(DEFLIB7NAME)"!="" @@ -1868,8 +1868,8 @@ $(DEF7TARGETN) .PHONY : #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) +DEF7FILTER=$(SOLARENV)/inc/dummy.flt +DEF7NAMELIST=$(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) .IF "$(link_always)"=="" $(DEF7TARGETN) : \ @@ -1891,7 +1891,7 @@ $(DEF7TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB7NAME)"!="" - @+echo $(SLB)$/$(DEFLIB7NAME).lib + @+echo $(SLB)/$(DEFLIB7NAME).lib @+emxexpr $(DEF7NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB7NAME)"!="" @@ -1989,19 +1989,19 @@ DEFLIB8NAME*=$(DEF8LIBNAME) .ENDIF # "$(DEF8LIBNAME)"!="" .IF "$(DEFLIB8NAME)"!="" -DEF8DEPN+=$(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib) +DEF8DEPN+=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) .ENDIF .IF "$(SHL8VERSIONMAP)"!="" .IF "$(DEF8EXPORTFILE)"=="" .IF "$(GUI)"=="WNT" -DEF8EXPORTFILE=$(MISC)$/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp +DEF8EXPORTFILE=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp .IF "$(COM)"=="GCC" $(DEF8EXPORTFILE) : $(SHL8OBJS) $(SHL8LIBS) .ENDIF # .IF "$(COM)"=="GCC" $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .IF "$(COM)"=="GCC" -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols -$(GREP) "\*\|?" $@ > $@.symbols-regexp @@ -2009,7 +2009,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL8OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -2018,9 +2018,9 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -DEF8EXPORTFILE=$(MISC)$/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp +DEF8EXPORTFILE=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET).dxp $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .ENDIF # "$(GUI)"=="OS2" .ENDIF # "$(DEF8EXPORTFILE)"=="" @@ -2028,7 +2028,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP) .IF "$(GUI)"=="WNT" -DEF8FILTER=$(SOLARENV)$/inc$/dummy.flt +DEF8FILTER=$(SOLARENV)/inc/dummy.flt RMHACK8:=$(RM) @@ -2057,20 +2057,20 @@ $(DEF8TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB8NAME)"!="" .IF "$(COM)"=="GCC" - @-$(RM) $(MISC)$/$(SHL8TARGET).exp - dlltool --output-def $(MISC)$/$(SHL8TARGET).exp --export-all-symbols \ - `$(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` - tail --lines +3 $(MISC)$/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile - @-$(RM) $(MISC)$/$(SHL8TARGET).exp + @-$(RM) $(MISC)/$(SHL8TARGET).exp + dlltool --output-def $(MISC)/$(SHL8TARGET).exp --export-all-symbols \ + `$(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g` + tail --lines +3 $(MISC)/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-$(RM) $(MISC)/$(SHL8TARGET).exp .ELSE .IF "$(SHL8USE_EXPORTS)"=="" - @-$(RMHACK8) $(MISC)$/$(SHL8TARGET).exp - @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL8TARGET).exp $(SLB)$/$(DEFLIB8NAME).lib - @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL8TARGET).flt $(MISC)$/$(SHL8TARGET).exp >>$@.tmpfile - $(RMHACK8) $(MISC)$/$(SHL8TARGET).exp + @-$(RMHACK8) $(MISC)/$(SHL8TARGET).exp + @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL8TARGET).exp $(SLB)/$(DEFLIB8NAME).lib + @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL8TARGET).flt $(MISC)/$(SHL8TARGET).exp >>$@.tmpfile + $(RMHACK8) $(MISC)/$(SHL8TARGET).exp .ELSE # "$(SHL8USE_EXPORTS)"=="" - @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB8NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL8TARGET).direct - @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)$/$(SHL8TARGET).direct >>$@.tmpfile + @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL8TARGET).direct + @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)/$(SHL8TARGET).direct >>$@.tmpfile .ENDIF # "$(SHL8USE_EXPORTS)"=="" .ENDIF .ENDIF # "$(DEFLIB8NAME)"!="" @@ -2151,8 +2151,8 @@ $(DEF8TARGETN) .PHONY : #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) +DEF8FILTER=$(SOLARENV)/inc/dummy.flt +DEF8NAMELIST=$(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) .IF "$(link_always)"=="" $(DEF8TARGETN) : \ @@ -2174,7 +2174,7 @@ $(DEF8TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB8NAME)"!="" - @+echo $(SLB)$/$(DEFLIB8NAME).lib + @+echo $(SLB)/$(DEFLIB8NAME).lib @+emxexpr $(DEF8NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB8NAME)"!="" @@ -2272,19 +2272,19 @@ DEFLIB9NAME*=$(DEF9LIBNAME) .ENDIF # "$(DEF9LIBNAME)"!="" .IF "$(DEFLIB9NAME)"!="" -DEF9DEPN+=$(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib) +DEF9DEPN+=$(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) .ENDIF .IF "$(SHL9VERSIONMAP)"!="" .IF "$(DEF9EXPORTFILE)"=="" .IF "$(GUI)"=="WNT" -DEF9EXPORTFILE=$(MISC)$/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp +DEF9EXPORTFILE=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp .IF "$(COM)"=="GCC" $(DEF9EXPORTFILE) : $(SHL9OBJS) $(SHL9LIBS) .ENDIF # .IF "$(COM)"=="GCC" $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .IF "$(COM)"=="GCC" -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols -$(GREP) "\*\|?" $@ > $@.symbols-regexp @@ -2292,7 +2292,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL9OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -2301,9 +2301,9 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -DEF9EXPORTFILE=$(MISC)$/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp +DEF9EXPORTFILE=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET).dxp $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .ENDIF # "$(GUI)"=="OS2" .ENDIF # "$(DEF9EXPORTFILE)"=="" @@ -2311,7 +2311,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP) .IF "$(GUI)"=="WNT" -DEF9FILTER=$(SOLARENV)$/inc$/dummy.flt +DEF9FILTER=$(SOLARENV)/inc/dummy.flt RMHACK9:=$(RM) @@ -2340,20 +2340,20 @@ $(DEF9TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB9NAME)"!="" .IF "$(COM)"=="GCC" - @-$(RM) $(MISC)$/$(SHL9TARGET).exp - dlltool --output-def $(MISC)$/$(SHL9TARGET).exp --export-all-symbols \ - `$(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` - tail --lines +3 $(MISC)$/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile - @-$(RM) $(MISC)$/$(SHL9TARGET).exp + @-$(RM) $(MISC)/$(SHL9TARGET).exp + dlltool --output-def $(MISC)/$(SHL9TARGET).exp --export-all-symbols \ + `$(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g` + tail --lines +3 $(MISC)/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-$(RM) $(MISC)/$(SHL9TARGET).exp .ELSE .IF "$(SHL9USE_EXPORTS)"=="" - @-$(RMHACK9) $(MISC)$/$(SHL9TARGET).exp - @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL9TARGET).exp $(SLB)$/$(DEFLIB9NAME).lib - @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL9TARGET).flt $(MISC)$/$(SHL9TARGET).exp >>$@.tmpfile - $(RMHACK9) $(MISC)$/$(SHL9TARGET).exp + @-$(RMHACK9) $(MISC)/$(SHL9TARGET).exp + @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL9TARGET).exp $(SLB)/$(DEFLIB9NAME).lib + @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL9TARGET).flt $(MISC)/$(SHL9TARGET).exp >>$@.tmpfile + $(RMHACK9) $(MISC)/$(SHL9TARGET).exp .ELSE # "$(SHL9USE_EXPORTS)"=="" - @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB9NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL9TARGET).direct - @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)$/$(SHL9TARGET).direct >>$@.tmpfile + @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL9TARGET).direct + @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)/$(SHL9TARGET).direct >>$@.tmpfile .ENDIF # "$(SHL9USE_EXPORTS)"=="" .ENDIF .ENDIF # "$(DEFLIB9NAME)"!="" @@ -2434,8 +2434,8 @@ $(DEF9TARGETN) .PHONY : #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) +DEF9FILTER=$(SOLARENV)/inc/dummy.flt +DEF9NAMELIST=$(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) .IF "$(link_always)"=="" $(DEF9TARGETN) : \ @@ -2457,7 +2457,7 @@ $(DEF9TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB9NAME)"!="" - @+echo $(SLB)$/$(DEFLIB9NAME).lib + @+echo $(SLB)/$(DEFLIB9NAME).lib @+emxexpr $(DEF9NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB9NAME)"!="" @@ -2555,19 +2555,19 @@ DEFLIB10NAME*=$(DEF10LIBNAME) .ENDIF # "$(DEF10LIBNAME)"!="" .IF "$(DEFLIB10NAME)"!="" -DEF10DEPN+=$(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib) +DEF10DEPN+=$(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) .ENDIF .IF "$(SHL10VERSIONMAP)"!="" .IF "$(DEF10EXPORTFILE)"=="" .IF "$(GUI)"=="WNT" -DEF10EXPORTFILE=$(MISC)$/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp +DEF10EXPORTFILE=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp .IF "$(COM)"=="GCC" $(DEF10EXPORTFILE) : $(SHL10OBJS) $(SHL10LIBS) .ENDIF # .IF "$(COM)"=="GCC" $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .IF "$(COM)"=="GCC" -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols -$(GREP) "\*\|?" $@ > $@.symbols-regexp @@ -2575,7 +2575,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL10OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -2584,9 +2584,9 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -DEF10EXPORTFILE=$(MISC)$/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp +DEF10EXPORTFILE=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET).dxp $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .ENDIF # "$(GUI)"=="OS2" .ENDIF # "$(DEF10EXPORTFILE)"=="" @@ -2594,7 +2594,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP) .IF "$(GUI)"=="WNT" -DEF10FILTER=$(SOLARENV)$/inc$/dummy.flt +DEF10FILTER=$(SOLARENV)/inc/dummy.flt RMHACK10:=$(RM) @@ -2623,20 +2623,20 @@ $(DEF10TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB10NAME)"!="" .IF "$(COM)"=="GCC" - @-$(RM) $(MISC)$/$(SHL10TARGET).exp - dlltool --output-def $(MISC)$/$(SHL10TARGET).exp --export-all-symbols \ - `$(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` - tail --lines +3 $(MISC)$/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile - @-$(RM) $(MISC)$/$(SHL10TARGET).exp + @-$(RM) $(MISC)/$(SHL10TARGET).exp + dlltool --output-def $(MISC)/$(SHL10TARGET).exp --export-all-symbols \ + `$(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g` + tail --lines +3 $(MISC)/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-$(RM) $(MISC)/$(SHL10TARGET).exp .ELSE .IF "$(SHL10USE_EXPORTS)"=="" - @-$(RMHACK10) $(MISC)$/$(SHL10TARGET).exp - @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL10TARGET).exp $(SLB)$/$(DEFLIB10NAME).lib - @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL10TARGET).flt $(MISC)$/$(SHL10TARGET).exp >>$@.tmpfile - $(RMHACK10) $(MISC)$/$(SHL10TARGET).exp + @-$(RMHACK10) $(MISC)/$(SHL10TARGET).exp + @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL10TARGET).exp $(SLB)/$(DEFLIB10NAME).lib + @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL10TARGET).flt $(MISC)/$(SHL10TARGET).exp >>$@.tmpfile + $(RMHACK10) $(MISC)/$(SHL10TARGET).exp .ELSE # "$(SHL10USE_EXPORTS)"=="" - @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB10NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL10TARGET).direct - @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)$/$(SHL10TARGET).direct >>$@.tmpfile + @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL10TARGET).direct + @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)/$(SHL10TARGET).direct >>$@.tmpfile .ENDIF # "$(SHL10USE_EXPORTS)"=="" .ENDIF .ENDIF # "$(DEFLIB10NAME)"!="" @@ -2717,8 +2717,8 @@ $(DEF10TARGETN) .PHONY : #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) +DEF10FILTER=$(SOLARENV)/inc/dummy.flt +DEF10NAMELIST=$(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) .IF "$(link_always)"=="" $(DEF10TARGETN) : \ @@ -2740,7 +2740,7 @@ $(DEF10TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB10NAME)"!="" - @+echo $(SLB)$/$(DEFLIB10NAME).lib + @+echo $(SLB)/$(DEFLIB10NAME).lib @+emxexpr $(DEF10NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB10NAME)"!="" diff --git a/solenv/inc/_tg_lib.mk b/solenv/inc/_tg_lib.mk index 2bb3bae3e4c9..72169827b03f 100644 --- a/solenv/inc/_tg_lib.mk +++ b/solenv/inc/_tg_lib.mk @@ -7,29 +7,29 @@ $(LIB1ARCHIV) : $(LIB1TARGET) @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd + @-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" - @-$(RM) $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd - @echo $(LINK) +inst_close -c `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd - @cat $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd - @+source $(MISC)$/$(LIB1ARCHIV:b)_closetempl.cmd + @-$(RM) $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd + @echo $(LINK) +inst_close -c `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd + @cat $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd + @+source $(MISC)/$(LIB1ARCHIV:b)_closetempl.cmd .ENDIF - @echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB1ARCHIV:b).cmd + @echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB1ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" - @echo ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd + @echo ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd .ENDIF .IF "$(OS)" == "MACOSX" - @echo ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd + @echo ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd .ENDIF - @cat $(MISC)$/$(LIB1ARCHIV:b).cmd - @+source $(MISC)$/$(LIB1ARCHIV:b).cmd + @cat $(MISC)/$(LIB1ARCHIV:b).cmd + @+source $(MISC)/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)$(COM)"=="WNTGCC" - @+-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd - @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB1ARCHIV:b).cmd - @+echo ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd - @cat $(MISC)$/$(LIB1ARCHIV:b).cmd - @+source $(MISC)$/$(LIB1ARCHIV:b).cmd + @+-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB1ARCHIV:b).cmd + @+echo ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd + @cat $(MISC)/$(LIB1ARCHIV:b).cmd + @+source $(MISC)/$(LIB1ARCHIV:b).cmd .ELSE @echo just a dummy > $@ .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -46,13 +46,13 @@ $(LIB1TARGET) : $(LIB1FILES) \ @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @echo $(LIB1OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ + @echo $(LIB1OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @cat /dev/null $(LIB1FILES:s/.obj/.o/) | xargs -n 1 >> $@ @$(RM) $(@:d)$(@:b).dump .IF "$(OS)"=="MACOSX" - @-nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ELIF "$(GUI)"=="OS2" @@ -69,7 +69,7 @@ $(LIB1TARGET) : $(LIB1FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(LIB1OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + +$(ECHONL) $(LIB1OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ @+cat /dev/null $(LIB1FILES) | xargs -n1 >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB1FILES) $(LIB1OBJFILES)) @@ -100,29 +100,29 @@ $(LIB2ARCHIV) : $(LIB2TARGET) @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd + @-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" - @-$(RM) $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd - @echo $(LINK) +inst_close -c `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd - @cat $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd - @+source $(MISC)$/$(LIB2ARCHIV:b)_closetempl.cmd + @-$(RM) $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd + @echo $(LINK) +inst_close -c `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd + @cat $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd + @+source $(MISC)/$(LIB2ARCHIV:b)_closetempl.cmd .ENDIF - @echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB2ARCHIV:b).cmd + @echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB2ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" - @echo ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd + @echo ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd .ENDIF .IF "$(OS)" == "MACOSX" - @echo ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd + @echo ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd .ENDIF - @cat $(MISC)$/$(LIB2ARCHIV:b).cmd - @+source $(MISC)$/$(LIB2ARCHIV:b).cmd + @cat $(MISC)/$(LIB2ARCHIV:b).cmd + @+source $(MISC)/$(LIB2ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)$(COM)"=="WNTGCC" - @+-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd - @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB2ARCHIV:b).cmd - @+echo ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd - @cat $(MISC)$/$(LIB2ARCHIV:b).cmd - @+source $(MISC)$/$(LIB2ARCHIV:b).cmd + @+-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB2ARCHIV:b).cmd + @+echo ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd + @cat $(MISC)/$(LIB2ARCHIV:b).cmd + @+source $(MISC)/$(LIB2ARCHIV:b).cmd .ELSE @echo just a dummy > $@ .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -139,13 +139,13 @@ $(LIB2TARGET) : $(LIB2FILES) \ @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @echo $(LIB2OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ + @echo $(LIB2OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @cat /dev/null $(LIB2FILES:s/.obj/.o/) | xargs -n 1 >> $@ @$(RM) $(@:d)$(@:b).dump .IF "$(OS)"=="MACOSX" - @-nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(LIB2TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ELIF "$(GUI)"=="OS2" @@ -162,7 +162,7 @@ $(LIB2TARGET) : $(LIB2FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(LIB2OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + +$(ECHONL) $(LIB2OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ @+cat /dev/null $(LIB2FILES) | xargs -n1 >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB2FILES) $(LIB2OBJFILES)) @@ -193,29 +193,29 @@ $(LIB3ARCHIV) : $(LIB3TARGET) @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd + @-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" - @-$(RM) $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd - @echo $(LINK) +inst_close -c `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd - @cat $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd - @+source $(MISC)$/$(LIB3ARCHIV:b)_closetempl.cmd + @-$(RM) $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd + @echo $(LINK) +inst_close -c `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd + @cat $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd + @+source $(MISC)/$(LIB3ARCHIV:b)_closetempl.cmd .ENDIF - @echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB3ARCHIV:b).cmd + @echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB3ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" - @echo ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd + @echo ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd .ENDIF .IF "$(OS)" == "MACOSX" - @echo ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd + @echo ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd .ENDIF - @cat $(MISC)$/$(LIB3ARCHIV:b).cmd - @+source $(MISC)$/$(LIB3ARCHIV:b).cmd + @cat $(MISC)/$(LIB3ARCHIV:b).cmd + @+source $(MISC)/$(LIB3ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)$(COM)"=="WNTGCC" - @+-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd - @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB3ARCHIV:b).cmd - @+echo ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd - @cat $(MISC)$/$(LIB3ARCHIV:b).cmd - @+source $(MISC)$/$(LIB3ARCHIV:b).cmd + @+-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB3ARCHIV:b).cmd + @+echo ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd + @cat $(MISC)/$(LIB3ARCHIV:b).cmd + @+source $(MISC)/$(LIB3ARCHIV:b).cmd .ELSE @echo just a dummy > $@ .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -232,13 +232,13 @@ $(LIB3TARGET) : $(LIB3FILES) \ @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @echo $(LIB3OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ + @echo $(LIB3OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @cat /dev/null $(LIB3FILES:s/.obj/.o/) | xargs -n 1 >> $@ @$(RM) $(@:d)$(@:b).dump .IF "$(OS)"=="MACOSX" - @-nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(LIB3TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ELIF "$(GUI)"=="OS2" @@ -255,7 +255,7 @@ $(LIB3TARGET) : $(LIB3FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(LIB3OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + +$(ECHONL) $(LIB3OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ @+cat /dev/null $(LIB3FILES) | xargs -n1 >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB3FILES) $(LIB3OBJFILES)) @@ -286,29 +286,29 @@ $(LIB4ARCHIV) : $(LIB4TARGET) @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd + @-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" - @-$(RM) $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd - @echo $(LINK) +inst_close -c `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd - @cat $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd - @+source $(MISC)$/$(LIB4ARCHIV:b)_closetempl.cmd + @-$(RM) $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd + @echo $(LINK) +inst_close -c `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd + @cat $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd + @+source $(MISC)/$(LIB4ARCHIV:b)_closetempl.cmd .ENDIF - @echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB4ARCHIV:b).cmd + @echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB4ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" - @echo ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd + @echo ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd .ENDIF .IF "$(OS)" == "MACOSX" - @echo ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd + @echo ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd .ENDIF - @cat $(MISC)$/$(LIB4ARCHIV:b).cmd - @+source $(MISC)$/$(LIB4ARCHIV:b).cmd + @cat $(MISC)/$(LIB4ARCHIV:b).cmd + @+source $(MISC)/$(LIB4ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)$(COM)"=="WNTGCC" - @+-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd - @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB4ARCHIV:b).cmd - @+echo ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd - @cat $(MISC)$/$(LIB4ARCHIV:b).cmd - @+source $(MISC)$/$(LIB4ARCHIV:b).cmd + @+-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB4ARCHIV:b).cmd + @+echo ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd + @cat $(MISC)/$(LIB4ARCHIV:b).cmd + @+source $(MISC)/$(LIB4ARCHIV:b).cmd .ELSE @echo just a dummy > $@ .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -325,13 +325,13 @@ $(LIB4TARGET) : $(LIB4FILES) \ @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @echo $(LIB4OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ + @echo $(LIB4OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @cat /dev/null $(LIB4FILES:s/.obj/.o/) | xargs -n 1 >> $@ @$(RM) $(@:d)$(@:b).dump .IF "$(OS)"=="MACOSX" - @-nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(LIB4TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ELIF "$(GUI)"=="OS2" @@ -348,7 +348,7 @@ $(LIB4TARGET) : $(LIB4FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(LIB4OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + +$(ECHONL) $(LIB4OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ @+cat /dev/null $(LIB4FILES) | xargs -n1 >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB4FILES) $(LIB4OBJFILES)) @@ -379,29 +379,29 @@ $(LIB5ARCHIV) : $(LIB5TARGET) @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd + @-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" - @-$(RM) $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd - @echo $(LINK) +inst_close -c `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd - @cat $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd - @+source $(MISC)$/$(LIB5ARCHIV:b)_closetempl.cmd + @-$(RM) $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd + @echo $(LINK) +inst_close -c `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd + @cat $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd + @+source $(MISC)/$(LIB5ARCHIV:b)_closetempl.cmd .ENDIF - @echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB5ARCHIV:b).cmd + @echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB5ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" - @echo ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd + @echo ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd .ENDIF .IF "$(OS)" == "MACOSX" - @echo ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd + @echo ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd .ENDIF - @cat $(MISC)$/$(LIB5ARCHIV:b).cmd - @+source $(MISC)$/$(LIB5ARCHIV:b).cmd + @cat $(MISC)/$(LIB5ARCHIV:b).cmd + @+source $(MISC)/$(LIB5ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)$(COM)"=="WNTGCC" - @+-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd - @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB5ARCHIV:b).cmd - @+echo ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd - @cat $(MISC)$/$(LIB5ARCHIV:b).cmd - @+source $(MISC)$/$(LIB5ARCHIV:b).cmd + @+-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB5ARCHIV:b).cmd + @+echo ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd + @cat $(MISC)/$(LIB5ARCHIV:b).cmd + @+source $(MISC)/$(LIB5ARCHIV:b).cmd .ELSE @echo just a dummy > $@ .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -418,13 +418,13 @@ $(LIB5TARGET) : $(LIB5FILES) \ @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @echo $(LIB5OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ + @echo $(LIB5OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @cat /dev/null $(LIB5FILES:s/.obj/.o/) | xargs -n 1 >> $@ @$(RM) $(@:d)$(@:b).dump .IF "$(OS)"=="MACOSX" - @-nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(LIB5TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ELIF "$(GUI)"=="OS2" @@ -441,7 +441,7 @@ $(LIB5TARGET) : $(LIB5FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(LIB5OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + +$(ECHONL) $(LIB5OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ @+cat /dev/null $(LIB5FILES) | xargs -n1 >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB5FILES) $(LIB5OBJFILES)) @@ -472,29 +472,29 @@ $(LIB6ARCHIV) : $(LIB6TARGET) @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd + @-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" - @-$(RM) $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd - @echo $(LINK) +inst_close -c `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd - @cat $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd - @+source $(MISC)$/$(LIB6ARCHIV:b)_closetempl.cmd + @-$(RM) $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd + @echo $(LINK) +inst_close -c `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd + @cat $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd + @+source $(MISC)/$(LIB6ARCHIV:b)_closetempl.cmd .ENDIF - @echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB6ARCHIV:b).cmd + @echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB6ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" - @echo ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd + @echo ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd .ENDIF .IF "$(OS)" == "MACOSX" - @echo ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd + @echo ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd .ENDIF - @cat $(MISC)$/$(LIB6ARCHIV:b).cmd - @+source $(MISC)$/$(LIB6ARCHIV:b).cmd + @cat $(MISC)/$(LIB6ARCHIV:b).cmd + @+source $(MISC)/$(LIB6ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)$(COM)"=="WNTGCC" - @+-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd - @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB6ARCHIV:b).cmd - @+echo ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd - @cat $(MISC)$/$(LIB6ARCHIV:b).cmd - @+source $(MISC)$/$(LIB6ARCHIV:b).cmd + @+-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB6ARCHIV:b).cmd + @+echo ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd + @cat $(MISC)/$(LIB6ARCHIV:b).cmd + @+source $(MISC)/$(LIB6ARCHIV:b).cmd .ELSE @echo just a dummy > $@ .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -511,13 +511,13 @@ $(LIB6TARGET) : $(LIB6FILES) \ @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @echo $(LIB6OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ + @echo $(LIB6OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @cat /dev/null $(LIB6FILES:s/.obj/.o/) | xargs -n 1 >> $@ @$(RM) $(@:d)$(@:b).dump .IF "$(OS)"=="MACOSX" - @-nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(LIB6TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ELIF "$(GUI)"=="OS2" @@ -534,7 +534,7 @@ $(LIB6TARGET) : $(LIB6FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(LIB6OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + +$(ECHONL) $(LIB6OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ @+cat /dev/null $(LIB6FILES) | xargs -n1 >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB6FILES) $(LIB6OBJFILES)) @@ -565,29 +565,29 @@ $(LIB7ARCHIV) : $(LIB7TARGET) @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd + @-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" - @-$(RM) $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd - @echo $(LINK) +inst_close -c `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd - @cat $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd - @+source $(MISC)$/$(LIB7ARCHIV:b)_closetempl.cmd + @-$(RM) $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd + @echo $(LINK) +inst_close -c `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd + @cat $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd + @+source $(MISC)/$(LIB7ARCHIV:b)_closetempl.cmd .ENDIF - @echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB7ARCHIV:b).cmd + @echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB7ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" - @echo ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd + @echo ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd .ENDIF .IF "$(OS)" == "MACOSX" - @echo ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd + @echo ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd .ENDIF - @cat $(MISC)$/$(LIB7ARCHIV:b).cmd - @+source $(MISC)$/$(LIB7ARCHIV:b).cmd + @cat $(MISC)/$(LIB7ARCHIV:b).cmd + @+source $(MISC)/$(LIB7ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)$(COM)"=="WNTGCC" - @+-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd - @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB7ARCHIV:b).cmd - @+echo ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd - @cat $(MISC)$/$(LIB7ARCHIV:b).cmd - @+source $(MISC)$/$(LIB7ARCHIV:b).cmd + @+-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB7ARCHIV:b).cmd + @+echo ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd + @cat $(MISC)/$(LIB7ARCHIV:b).cmd + @+source $(MISC)/$(LIB7ARCHIV:b).cmd .ELSE @echo just a dummy > $@ .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -604,13 +604,13 @@ $(LIB7TARGET) : $(LIB7FILES) \ @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @echo $(LIB7OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ + @echo $(LIB7OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @cat /dev/null $(LIB7FILES:s/.obj/.o/) | xargs -n 1 >> $@ @$(RM) $(@:d)$(@:b).dump .IF "$(OS)"=="MACOSX" - @-nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(LIB7TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ELIF "$(GUI)"=="OS2" @@ -627,7 +627,7 @@ $(LIB7TARGET) : $(LIB7FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(LIB7OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + +$(ECHONL) $(LIB7OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ @+cat /dev/null $(LIB7FILES) | xargs -n1 >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB7FILES) $(LIB7OBJFILES)) @@ -658,29 +658,29 @@ $(LIB8ARCHIV) : $(LIB8TARGET) @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd + @-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" - @-$(RM) $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd - @echo $(LINK) +inst_close -c `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd - @cat $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd - @+source $(MISC)$/$(LIB8ARCHIV:b)_closetempl.cmd + @-$(RM) $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd + @echo $(LINK) +inst_close -c `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd + @cat $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd + @+source $(MISC)/$(LIB8ARCHIV:b)_closetempl.cmd .ENDIF - @echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB8ARCHIV:b).cmd + @echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB8ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" - @echo ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd + @echo ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd .ENDIF .IF "$(OS)" == "MACOSX" - @echo ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd + @echo ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd .ENDIF - @cat $(MISC)$/$(LIB8ARCHIV:b).cmd - @+source $(MISC)$/$(LIB8ARCHIV:b).cmd + @cat $(MISC)/$(LIB8ARCHIV:b).cmd + @+source $(MISC)/$(LIB8ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)$(COM)"=="WNTGCC" - @+-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd - @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB8ARCHIV:b).cmd - @+echo ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd - @cat $(MISC)$/$(LIB8ARCHIV:b).cmd - @+source $(MISC)$/$(LIB8ARCHIV:b).cmd + @+-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB8ARCHIV:b).cmd + @+echo ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd + @cat $(MISC)/$(LIB8ARCHIV:b).cmd + @+source $(MISC)/$(LIB8ARCHIV:b).cmd .ELSE @echo just a dummy > $@ .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -697,13 +697,13 @@ $(LIB8TARGET) : $(LIB8FILES) \ @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @echo $(LIB8OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ + @echo $(LIB8OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @cat /dev/null $(LIB8FILES:s/.obj/.o/) | xargs -n 1 >> $@ @$(RM) $(@:d)$(@:b).dump .IF "$(OS)"=="MACOSX" - @-nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(LIB8TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ELIF "$(GUI)"=="OS2" @@ -720,7 +720,7 @@ $(LIB8TARGET) : $(LIB8FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(LIB8OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + +$(ECHONL) $(LIB8OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ @+cat /dev/null $(LIB8FILES) | xargs -n1 >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB8FILES) $(LIB8OBJFILES)) @@ -751,29 +751,29 @@ $(LIB9ARCHIV) : $(LIB9TARGET) @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd + @-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" - @-$(RM) $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd - @echo $(LINK) +inst_close -c `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd - @cat $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd - @+source $(MISC)$/$(LIB9ARCHIV:b)_closetempl.cmd + @-$(RM) $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd + @echo $(LINK) +inst_close -c `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd + @cat $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd + @+source $(MISC)/$(LIB9ARCHIV:b)_closetempl.cmd .ENDIF - @echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB9ARCHIV:b).cmd + @echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB9ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" - @echo ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd + @echo ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd .ENDIF .IF "$(OS)" == "MACOSX" - @echo ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd + @echo ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd .ENDIF - @cat $(MISC)$/$(LIB9ARCHIV:b).cmd - @+source $(MISC)$/$(LIB9ARCHIV:b).cmd + @cat $(MISC)/$(LIB9ARCHIV:b).cmd + @+source $(MISC)/$(LIB9ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)$(COM)"=="WNTGCC" - @+-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd - @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB9ARCHIV:b).cmd - @+echo ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd - @cat $(MISC)$/$(LIB9ARCHIV:b).cmd - @+source $(MISC)$/$(LIB9ARCHIV:b).cmd + @+-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB9ARCHIV:b).cmd + @+echo ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd + @cat $(MISC)/$(LIB9ARCHIV:b).cmd + @+source $(MISC)/$(LIB9ARCHIV:b).cmd .ELSE @echo just a dummy > $@ .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -790,13 +790,13 @@ $(LIB9TARGET) : $(LIB9FILES) \ @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @echo $(LIB9OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ + @echo $(LIB9OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @cat /dev/null $(LIB9FILES:s/.obj/.o/) | xargs -n 1 >> $@ @$(RM) $(@:d)$(@:b).dump .IF "$(OS)"=="MACOSX" - @-nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(LIB9TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ELIF "$(GUI)"=="OS2" @@ -813,7 +813,7 @@ $(LIB9TARGET) : $(LIB9FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(LIB9OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + +$(ECHONL) $(LIB9OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ @+cat /dev/null $(LIB9FILES) | xargs -n1 >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB9FILES) $(LIB9OBJFILES)) @@ -844,29 +844,29 @@ $(LIB10ARCHIV) : $(LIB10TARGET) @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd + @-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" - @-$(RM) $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd - @echo $(LINK) +inst_close -c `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd - @cat $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd - @+source $(MISC)$/$(LIB10ARCHIV:b)_closetempl.cmd + @-$(RM) $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd + @echo $(LINK) +inst_close -c `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd + @cat $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd + @+source $(MISC)/$(LIB10ARCHIV:b)_closetempl.cmd .ENDIF - @echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB10ARCHIV:b).cmd + @echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB10ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" - @echo ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd + @echo ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd .ENDIF .IF "$(OS)" == "MACOSX" - @echo ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd + @echo ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd .ENDIF - @cat $(MISC)$/$(LIB10ARCHIV:b).cmd - @+source $(MISC)$/$(LIB10ARCHIV:b).cmd + @cat $(MISC)/$(LIB10ARCHIV:b).cmd + @+source $(MISC)/$(LIB10ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)$(COM)"=="WNTGCC" - @+-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd - @+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB10ARCHIV:b).cmd - @+echo ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd - @cat $(MISC)$/$(LIB10ARCHIV:b).cmd - @+source $(MISC)$/$(LIB10ARCHIV:b).cmd + @+-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB10ARCHIV:b).cmd + @+echo ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd + @cat $(MISC)/$(LIB10ARCHIV:b).cmd + @+source $(MISC)/$(LIB10ARCHIV:b).cmd .ELSE @echo just a dummy > $@ .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -883,13 +883,13 @@ $(LIB10TARGET) : $(LIB10FILES) \ @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @echo $(LIB10OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ + @echo $(LIB10OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @cat /dev/null $(LIB10FILES:s/.obj/.o/) | xargs -n 1 >> $@ @$(RM) $(@:d)$(@:b).dump .IF "$(OS)"=="MACOSX" - @-nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(LIB10TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ELIF "$(GUI)"=="OS2" @@ -906,7 +906,7 @@ $(LIB10TARGET) : $(LIB10FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(LIB10OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + +$(ECHONL) $(LIB10OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ @+cat /dev/null $(LIB10FILES) | xargs -n1 >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB10FILES) $(LIB10OBJFILES)) diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk index 4c3cbb5453dc..e6d06390df96 100644 --- a/solenv/inc/_tg_rslb.mk +++ b/solenv/inc/_tg_rslb.mk @@ -3,7 +3,7 @@ .IF "$(RESLIB1TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB1NAME)_res.hid +HIDRES1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB1NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB1HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB1SRSFILES))) @@ -12,7 +12,7 @@ $(HIDRES1PARTICLE): $(RESLIB1HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES1PARTICLE) @@ -29,12 +29,12 @@ $(RSC_MULTI1) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC1HEADER) $(RESLIB1SRSFILES) \ @@ -44,12 +44,12 @@ $(RSC_MULTI1) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB1NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB1NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC1HEADER) $(RESLIB1SRSFILES) \ @@ -81,7 +81,7 @@ $(RESLIB1TARGETN): \ .IF "$(RESLIB2TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB2NAME)_res.hid +HIDRES2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB2NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB2HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB2SRSFILES))) @@ -90,7 +90,7 @@ $(HIDRES2PARTICLE): $(RESLIB2HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES2PARTICLE) @@ -107,12 +107,12 @@ $(RSC_MULTI2) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC2HEADER) $(RESLIB2SRSFILES) \ @@ -122,12 +122,12 @@ $(RSC_MULTI2) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB2NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB2NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC2HEADER) $(RESLIB2SRSFILES) \ @@ -159,7 +159,7 @@ $(RESLIB2TARGETN): \ .IF "$(RESLIB3TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB3NAME)_res.hid +HIDRES3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB3NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB3HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB3SRSFILES))) @@ -168,7 +168,7 @@ $(HIDRES3PARTICLE): $(RESLIB3HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES3PARTICLE) @@ -185,12 +185,12 @@ $(RSC_MULTI3) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC3HEADER) $(RESLIB3SRSFILES) \ @@ -200,12 +200,12 @@ $(RSC_MULTI3) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB3NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB3NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC3HEADER) $(RESLIB3SRSFILES) \ @@ -237,7 +237,7 @@ $(RESLIB3TARGETN): \ .IF "$(RESLIB4TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB4NAME)_res.hid +HIDRES4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB4NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB4HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB4SRSFILES))) @@ -246,7 +246,7 @@ $(HIDRES4PARTICLE): $(RESLIB4HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES4PARTICLE) @@ -263,12 +263,12 @@ $(RSC_MULTI4) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC4HEADER) $(RESLIB4SRSFILES) \ @@ -278,12 +278,12 @@ $(RSC_MULTI4) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB4NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB4NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC4HEADER) $(RESLIB4SRSFILES) \ @@ -315,7 +315,7 @@ $(RESLIB4TARGETN): \ .IF "$(RESLIB5TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB5NAME)_res.hid +HIDRES5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB5NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB5HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB5SRSFILES))) @@ -324,7 +324,7 @@ $(HIDRES5PARTICLE): $(RESLIB5HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES5PARTICLE) @@ -341,12 +341,12 @@ $(RSC_MULTI5) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC5HEADER) $(RESLIB5SRSFILES) \ @@ -356,12 +356,12 @@ $(RSC_MULTI5) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB5NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB5NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC5HEADER) $(RESLIB5SRSFILES) \ @@ -393,7 +393,7 @@ $(RESLIB5TARGETN): \ .IF "$(RESLIB6TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB6NAME)_res.hid +HIDRES6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB6NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB6HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB6SRSFILES))) @@ -402,7 +402,7 @@ $(HIDRES6PARTICLE): $(RESLIB6HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES6PARTICLE) @@ -419,12 +419,12 @@ $(RSC_MULTI6) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC6HEADER) $(RESLIB6SRSFILES) \ @@ -434,12 +434,12 @@ $(RSC_MULTI6) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB6NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB6NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC6HEADER) $(RESLIB6SRSFILES) \ @@ -471,7 +471,7 @@ $(RESLIB6TARGETN): \ .IF "$(RESLIB7TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB7NAME)_res.hid +HIDRES7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB7NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB7HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB7SRSFILES))) @@ -480,7 +480,7 @@ $(HIDRES7PARTICLE): $(RESLIB7HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES7PARTICLE) @@ -497,12 +497,12 @@ $(RSC_MULTI7) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC7HEADER) $(RESLIB7SRSFILES) \ @@ -512,12 +512,12 @@ $(RSC_MULTI7) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB7NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB7NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC7HEADER) $(RESLIB7SRSFILES) \ @@ -549,7 +549,7 @@ $(RESLIB7TARGETN): \ .IF "$(RESLIB8TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB8NAME)_res.hid +HIDRES8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB8NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB8HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB8SRSFILES))) @@ -558,7 +558,7 @@ $(HIDRES8PARTICLE): $(RESLIB8HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES8PARTICLE) @@ -575,12 +575,12 @@ $(RSC_MULTI8) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC8HEADER) $(RESLIB8SRSFILES) \ @@ -590,12 +590,12 @@ $(RSC_MULTI8) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB8NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB8NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC8HEADER) $(RESLIB8SRSFILES) \ @@ -627,7 +627,7 @@ $(RESLIB8TARGETN): \ .IF "$(RESLIB9TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB9NAME)_res.hid +HIDRES9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB9NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB9HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB9SRSFILES))) @@ -636,7 +636,7 @@ $(HIDRES9PARTICLE): $(RESLIB9HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES9PARTICLE) @@ -653,12 +653,12 @@ $(RSC_MULTI9) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC9HEADER) $(RESLIB9SRSFILES) \ @@ -668,12 +668,12 @@ $(RSC_MULTI9) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB9NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB9NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC9HEADER) $(RESLIB9SRSFILES) \ @@ -705,7 +705,7 @@ $(RESLIB9TARGETN): \ .IF "$(RESLIB10TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB10NAME)_res.hid +HIDRES10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB10NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB10HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB10SRSFILES))) @@ -714,7 +714,7 @@ $(HIDRES10PARTICLE): $(RESLIB10HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES10PARTICLE) @@ -731,12 +731,12 @@ $(RSC_MULTI10) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB10NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC10HEADER) $(RESLIB10SRSFILES) \ @@ -746,12 +746,12 @@ $(RSC_MULTI10) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB10NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB10NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC10HEADER) $(RESLIB10SRSFILES) \ diff --git a/solenv/inc/_tg_scp.mk b/solenv/inc/_tg_scp.mk index 6764c5a80f53..ea37f37cccfd 100644 --- a/solenv/inc/_tg_scp.mk +++ b/solenv/inc/_tg_scp.mk @@ -3,17 +3,17 @@ .IF "$(SCP1TARGETN)"!="" # try to get missing parfiles -$(PAR)$/%.par : $(SOLARPARDIR)$/%.par +$(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ -LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP1TARGETN): $(LOCALSCP1FILES) @echo ------------------------------ @echo Making: $@ - @@-$(MKDIRHIER) $(BIN)$/$(SCP1LINK_PRODUCT_TYPE) - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP1FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ + @@-$(MKDIRHIER) $(BIN)/$(SCP1LINK_PRODUCT_TYPE) + $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP1FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@ .ENDIF # Anweisungen fuer das Linken @@ -22,17 +22,17 @@ $(SCP1TARGETN): $(LOCALSCP1FILES) .IF "$(SCP2TARGETN)"!="" # try to get missing parfiles -$(PAR)$/%.par : $(SOLARPARDIR)$/%.par +$(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ -LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP2TARGETN): $(LOCALSCP2FILES) @echo ------------------------------ @echo Making: $@ - @@-$(MKDIRHIER) $(BIN)$/$(SCP2LINK_PRODUCT_TYPE) - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP2FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ + @@-$(MKDIRHIER) $(BIN)/$(SCP2LINK_PRODUCT_TYPE) + $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP2FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@ .ENDIF # Anweisungen fuer das Linken @@ -41,17 +41,17 @@ $(SCP2TARGETN): $(LOCALSCP2FILES) .IF "$(SCP3TARGETN)"!="" # try to get missing parfiles -$(PAR)$/%.par : $(SOLARPARDIR)$/%.par +$(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ -LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP3TARGETN): $(LOCALSCP3FILES) @echo ------------------------------ @echo Making: $@ - @@-$(MKDIRHIER) $(BIN)$/$(SCP3LINK_PRODUCT_TYPE) - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP3FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ + @@-$(MKDIRHIER) $(BIN)/$(SCP3LINK_PRODUCT_TYPE) + $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP3FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@ .ENDIF # Anweisungen fuer das Linken @@ -60,17 +60,17 @@ $(SCP3TARGETN): $(LOCALSCP3FILES) .IF "$(SCP4TARGETN)"!="" # try to get missing parfiles -$(PAR)$/%.par : $(SOLARPARDIR)$/%.par +$(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ -LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP4TARGETN): $(LOCALSCP4FILES) @echo ------------------------------ @echo Making: $@ - @@-$(MKDIRHIER) $(BIN)$/$(SCP4LINK_PRODUCT_TYPE) - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP4FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ + @@-$(MKDIRHIER) $(BIN)/$(SCP4LINK_PRODUCT_TYPE) + $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP4FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@ .ENDIF # Anweisungen fuer das Linken @@ -79,17 +79,17 @@ $(SCP4TARGETN): $(LOCALSCP4FILES) .IF "$(SCP5TARGETN)"!="" # try to get missing parfiles -$(PAR)$/%.par : $(SOLARPARDIR)$/%.par +$(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ -LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP5TARGETN): $(LOCALSCP5FILES) @echo ------------------------------ @echo Making: $@ - @@-$(MKDIRHIER) $(BIN)$/$(SCP5LINK_PRODUCT_TYPE) - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP5FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ + @@-$(MKDIRHIER) $(BIN)/$(SCP5LINK_PRODUCT_TYPE) + $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP5FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@ .ENDIF # Anweisungen fuer das Linken @@ -98,17 +98,17 @@ $(SCP5TARGETN): $(LOCALSCP5FILES) .IF "$(SCP6TARGETN)"!="" # try to get missing parfiles -$(PAR)$/%.par : $(SOLARPARDIR)$/%.par +$(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ -LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP6TARGETN): $(LOCALSCP6FILES) @echo ------------------------------ @echo Making: $@ - @@-$(MKDIRHIER) $(BIN)$/$(SCP6LINK_PRODUCT_TYPE) - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP6FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ + @@-$(MKDIRHIER) $(BIN)/$(SCP6LINK_PRODUCT_TYPE) + $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP6FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@ .ENDIF # Anweisungen fuer das Linken @@ -117,17 +117,17 @@ $(SCP6TARGETN): $(LOCALSCP6FILES) .IF "$(SCP7TARGETN)"!="" # try to get missing parfiles -$(PAR)$/%.par : $(SOLARPARDIR)$/%.par +$(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ -LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP7TARGETN): $(LOCALSCP7FILES) @echo ------------------------------ @echo Making: $@ - @@-$(MKDIRHIER) $(BIN)$/$(SCP7LINK_PRODUCT_TYPE) - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP7FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ + @@-$(MKDIRHIER) $(BIN)/$(SCP7LINK_PRODUCT_TYPE) + $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP7FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@ .ENDIF # Anweisungen fuer das Linken @@ -136,17 +136,17 @@ $(SCP7TARGETN): $(LOCALSCP7FILES) .IF "$(SCP8TARGETN)"!="" # try to get missing parfiles -$(PAR)$/%.par : $(SOLARPARDIR)$/%.par +$(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ -LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP8TARGETN): $(LOCALSCP8FILES) @echo ------------------------------ @echo Making: $@ - @@-$(MKDIRHIER) $(BIN)$/$(SCP8LINK_PRODUCT_TYPE) - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP8FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ + @@-$(MKDIRHIER) $(BIN)/$(SCP8LINK_PRODUCT_TYPE) + $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP8FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@ .ENDIF # Anweisungen fuer das Linken @@ -155,17 +155,17 @@ $(SCP8TARGETN): $(LOCALSCP8FILES) .IF "$(SCP9TARGETN)"!="" # try to get missing parfiles -$(PAR)$/%.par : $(SOLARPARDIR)$/%.par +$(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ -LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP9TARGETN): $(LOCALSCP9FILES) @echo ------------------------------ @echo Making: $@ - @@-$(MKDIRHIER) $(BIN)$/$(SCP9LINK_PRODUCT_TYPE) - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP9FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ + @@-$(MKDIRHIER) $(BIN)/$(SCP9LINK_PRODUCT_TYPE) + $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP9FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@ .ENDIF # Anweisungen fuer das Linken @@ -174,17 +174,17 @@ $(SCP9TARGETN): $(LOCALSCP9FILES) .IF "$(SCP10TARGETN)"!="" # try to get missing parfiles -$(PAR)$/%.par : $(SOLARPARDIR)$/%.par +$(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ -LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP10TARGETN): $(LOCALSCP10FILES) @echo ------------------------------ @echo Making: $@ - @@-$(MKDIRHIER) $(BIN)$/$(SCP10LINK_PRODUCT_TYPE) - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP10FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ + @@-$(MKDIRHIER) $(BIN)/$(SCP10LINK_PRODUCT_TYPE) + $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP10FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@ .ENDIF # Anweisungen fuer das Linken diff --git a/solenv/inc/_tg_sdi.mk b/solenv/inc/_tg_sdi.mk index d2ac613a41ea..c10ad54608cd 100644 --- a/solenv/inc/_tg_sdi.mk +++ b/solenv/inc/_tg_sdi.mk @@ -5,11 +5,7 @@ $(HIDSID1PARTICLE): $(SDI1TARGET) @echo ------------------------------ @echo Making: $@ @-$(RM) $@.$(ROUT).tmp $@ -.IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISC)$/$(SDI1NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp -.ELSE - @$(TYPE) $(MISC)$/$(SDI1NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp -.ENDIF + @$(TYPE) $(MISC)/$(SDI1NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp @-$(RM) $@ @$(RENAME) $@.$(ROUT).tmp $@ .ENDIF # "$(HIDSID1PARTICLE)"!="" @@ -20,12 +16,12 @@ $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi @echo Making: $@ @-$(RM) $@ $(SVIDL) @$(mktmp \ - -fs$(INCCOMX)$/$(SDI1NAME).hxx \ - -fd$(INCCOMX)$/$(SDI1NAME).ilb \ - -fm$(MISC)$/$(SDI1NAME).don \ - -fl$(MISC)$/$(SDI1NAME).lst \ + -fs$(INCCOMX)/$(SDI1NAME).hxx \ + -fd$(INCCOMX)/$(SDI1NAME).ilb \ + -fm$(MISC)/$(SDI1NAME).don \ + -fl$(MISC)/$(SDI1NAME).lst \ -fx$(SDI1EXPORT).sdi \ - -fz$(MISC)$/$(SDI1NAME).sid \ + -fz$(MISC)/$(SDI1NAME).sid \ $(SDI1NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE)) .ENDIF # "$(SDI1TARGET)"!="" @@ -37,11 +33,7 @@ $(HIDSID2PARTICLE): $(SDI2TARGET) @echo ------------------------------ @echo Making: $@ @-$(RM) $@.$(ROUT).tmp $@ -.IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISC)$/$(SDI2NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp -.ELSE - @$(TYPE) $(MISC)$/$(SDI2NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp -.ENDIF + @$(TYPE) $(MISC)/$(SDI2NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp @-$(RM) $@ @$(RENAME) $@.$(ROUT).tmp $@ .ENDIF # "$(HIDSID2PARTICLE)"!="" @@ -52,12 +44,12 @@ $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi @echo Making: $@ @-$(RM) $@ $(SVIDL) @$(mktmp \ - -fs$(INCCOMX)$/$(SDI2NAME).hxx \ - -fd$(INCCOMX)$/$(SDI2NAME).ilb \ - -fm$(MISC)$/$(SDI2NAME).don \ - -fl$(MISC)$/$(SDI2NAME).lst \ + -fs$(INCCOMX)/$(SDI2NAME).hxx \ + -fd$(INCCOMX)/$(SDI2NAME).ilb \ + -fm$(MISC)/$(SDI2NAME).don \ + -fl$(MISC)/$(SDI2NAME).lst \ -fx$(SDI2EXPORT).sdi \ - -fz$(MISC)$/$(SDI2NAME).sid \ + -fz$(MISC)/$(SDI2NAME).sid \ $(SDI2NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE)) .ENDIF # "$(SDI2TARGET)"!="" @@ -69,11 +61,7 @@ $(HIDSID3PARTICLE): $(SDI3TARGET) @echo ------------------------------ @echo Making: $@ @-$(RM) $@.$(ROUT).tmp $@ -.IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISC)$/$(SDI3NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp -.ELSE - @$(TYPE) $(MISC)$/$(SDI3NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp -.ENDIF + @$(TYPE) $(MISC)/$(SDI3NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp @-$(RM) $@ @$(RENAME) $@.$(ROUT).tmp $@ .ENDIF # "$(HIDSID3PARTICLE)"!="" @@ -84,12 +72,12 @@ $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi @echo Making: $@ @-$(RM) $@ $(SVIDL) @$(mktmp \ - -fs$(INCCOMX)$/$(SDI3NAME).hxx \ - -fd$(INCCOMX)$/$(SDI3NAME).ilb \ - -fm$(MISC)$/$(SDI3NAME).don \ - -fl$(MISC)$/$(SDI3NAME).lst \ + -fs$(INCCOMX)/$(SDI3NAME).hxx \ + -fd$(INCCOMX)/$(SDI3NAME).ilb \ + -fm$(MISC)/$(SDI3NAME).don \ + -fl$(MISC)/$(SDI3NAME).lst \ -fx$(SDI3EXPORT).sdi \ - -fz$(MISC)$/$(SDI3NAME).sid \ + -fz$(MISC)/$(SDI3NAME).sid \ $(SDI3NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE)) .ENDIF # "$(SDI3TARGET)"!="" @@ -101,11 +89,7 @@ $(HIDSID4PARTICLE): $(SDI4TARGET) @echo ------------------------------ @echo Making: $@ @-$(RM) $@.$(ROUT).tmp $@ -.IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISC)$/$(SDI4NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp -.ELSE - @$(TYPE) $(MISC)$/$(SDI4NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp -.ENDIF + @$(TYPE) $(MISC)/$(SDI4NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp @-$(RM) $@ @$(RENAME) $@.$(ROUT).tmp $@ .ENDIF # "$(HIDSID4PARTICLE)"!="" @@ -116,12 +100,12 @@ $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi @echo Making: $@ @-$(RM) $@ $(SVIDL) @$(mktmp \ - -fs$(INCCOMX)$/$(SDI4NAME).hxx \ - -fd$(INCCOMX)$/$(SDI4NAME).ilb \ - -fm$(MISC)$/$(SDI4NAME).don \ - -fl$(MISC)$/$(SDI4NAME).lst \ + -fs$(INCCOMX)/$(SDI4NAME).hxx \ + -fd$(INCCOMX)/$(SDI4NAME).ilb \ + -fm$(MISC)/$(SDI4NAME).don \ + -fl$(MISC)/$(SDI4NAME).lst \ -fx$(SDI4EXPORT).sdi \ - -fz$(MISC)$/$(SDI4NAME).sid \ + -fz$(MISC)/$(SDI4NAME).sid \ $(SDI4NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE)) .ENDIF # "$(SDI4TARGET)"!="" @@ -133,11 +117,7 @@ $(HIDSID5PARTICLE): $(SDI5TARGET) @echo ------------------------------ @echo Making: $@ @-$(RM) $@.$(ROUT).tmp $@ -.IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISC)$/$(SDI5NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp -.ELSE - @$(TYPE) $(MISC)$/$(SDI5NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp -.ENDIF + @$(TYPE) $(MISC)/$(SDI5NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp @-$(RM) $@ @$(RENAME) $@.$(ROUT).tmp $@ .ENDIF # "$(HIDSID5PARTICLE)"!="" @@ -148,12 +128,12 @@ $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi @echo Making: $@ @-$(RM) $@ $(SVIDL) @$(mktmp \ - -fs$(INCCOMX)$/$(SDI5NAME).hxx \ - -fd$(INCCOMX)$/$(SDI5NAME).ilb \ - -fm$(MISC)$/$(SDI5NAME).don \ - -fl$(MISC)$/$(SDI5NAME).lst \ + -fs$(INCCOMX)/$(SDI5NAME).hxx \ + -fd$(INCCOMX)/$(SDI5NAME).ilb \ + -fm$(MISC)/$(SDI5NAME).don \ + -fl$(MISC)/$(SDI5NAME).lst \ -fx$(SDI5EXPORT).sdi \ - -fz$(MISC)$/$(SDI5NAME).sid \ + -fz$(MISC)/$(SDI5NAME).sid \ $(SDI5NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE)) .ENDIF # "$(SDI5TARGET)"!="" @@ -165,11 +145,7 @@ $(HIDSID6PARTICLE): $(SDI6TARGET) @echo ------------------------------ @echo Making: $@ @-$(RM) $@.$(ROUT).tmp $@ -.IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISC)$/$(SDI6NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp -.ELSE - @$(TYPE) $(MISC)$/$(SDI6NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp -.ENDIF + @$(TYPE) $(MISC)/$(SDI6NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp @-$(RM) $@ @$(RENAME) $@.$(ROUT).tmp $@ .ENDIF # "$(HIDSID6PARTICLE)"!="" @@ -180,12 +156,12 @@ $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi @echo Making: $@ @-$(RM) $@ $(SVIDL) @$(mktmp \ - -fs$(INCCOMX)$/$(SDI6NAME).hxx \ - -fd$(INCCOMX)$/$(SDI6NAME).ilb \ - -fm$(MISC)$/$(SDI6NAME).don \ - -fl$(MISC)$/$(SDI6NAME).lst \ + -fs$(INCCOMX)/$(SDI6NAME).hxx \ + -fd$(INCCOMX)/$(SDI6NAME).ilb \ + -fm$(MISC)/$(SDI6NAME).don \ + -fl$(MISC)/$(SDI6NAME).lst \ -fx$(SDI6EXPORT).sdi \ - -fz$(MISC)$/$(SDI6NAME).sid \ + -fz$(MISC)/$(SDI6NAME).sid \ $(SDI6NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE)) .ENDIF # "$(SDI6TARGET)"!="" @@ -197,11 +173,7 @@ $(HIDSID7PARTICLE): $(SDI7TARGET) @echo ------------------------------ @echo Making: $@ @-$(RM) $@.$(ROUT).tmp $@ -.IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISC)$/$(SDI7NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp -.ELSE - @$(TYPE) $(MISC)$/$(SDI7NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp -.ENDIF + @$(TYPE) $(MISC)/$(SDI7NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp @-$(RM) $@ @$(RENAME) $@.$(ROUT).tmp $@ .ENDIF # "$(HIDSID7PARTICLE)"!="" @@ -212,12 +184,12 @@ $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi @echo Making: $@ @-$(RM) $@ $(SVIDL) @$(mktmp \ - -fs$(INCCOMX)$/$(SDI7NAME).hxx \ - -fd$(INCCOMX)$/$(SDI7NAME).ilb \ - -fm$(MISC)$/$(SDI7NAME).don \ - -fl$(MISC)$/$(SDI7NAME).lst \ + -fs$(INCCOMX)/$(SDI7NAME).hxx \ + -fd$(INCCOMX)/$(SDI7NAME).ilb \ + -fm$(MISC)/$(SDI7NAME).don \ + -fl$(MISC)/$(SDI7NAME).lst \ -fx$(SDI7EXPORT).sdi \ - -fz$(MISC)$/$(SDI7NAME).sid \ + -fz$(MISC)/$(SDI7NAME).sid \ $(SDI7NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE)) .ENDIF # "$(SDI7TARGET)"!="" @@ -229,11 +201,7 @@ $(HIDSID8PARTICLE): $(SDI8TARGET) @echo ------------------------------ @echo Making: $@ @-$(RM) $@.$(ROUT).tmp $@ -.IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISC)$/$(SDI8NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp -.ELSE - @$(TYPE) $(MISC)$/$(SDI8NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp -.ENDIF + @$(TYPE) $(MISC)/$(SDI8NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp @-$(RM) $@ @$(RENAME) $@.$(ROUT).tmp $@ .ENDIF # "$(HIDSID8PARTICLE)"!="" @@ -244,12 +212,12 @@ $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi @echo Making: $@ @-$(RM) $@ $(SVIDL) @$(mktmp \ - -fs$(INCCOMX)$/$(SDI8NAME).hxx \ - -fd$(INCCOMX)$/$(SDI8NAME).ilb \ - -fm$(MISC)$/$(SDI8NAME).don \ - -fl$(MISC)$/$(SDI8NAME).lst \ + -fs$(INCCOMX)/$(SDI8NAME).hxx \ + -fd$(INCCOMX)/$(SDI8NAME).ilb \ + -fm$(MISC)/$(SDI8NAME).don \ + -fl$(MISC)/$(SDI8NAME).lst \ -fx$(SDI8EXPORT).sdi \ - -fz$(MISC)$/$(SDI8NAME).sid \ + -fz$(MISC)/$(SDI8NAME).sid \ $(SDI8NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE)) .ENDIF # "$(SDI8TARGET)"!="" @@ -261,11 +229,7 @@ $(HIDSID9PARTICLE): $(SDI9TARGET) @echo ------------------------------ @echo Making: $@ @-$(RM) $@.$(ROUT).tmp $@ -.IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISC)$/$(SDI9NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp -.ELSE - @$(TYPE) $(MISC)$/$(SDI9NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp -.ENDIF + @$(TYPE) $(MISC)/$(SDI9NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp @-$(RM) $@ @$(RENAME) $@.$(ROUT).tmp $@ .ENDIF # "$(HIDSID9PARTICLE)"!="" @@ -276,12 +240,12 @@ $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi @echo Making: $@ @-$(RM) $@ $(SVIDL) @$(mktmp \ - -fs$(INCCOMX)$/$(SDI9NAME).hxx \ - -fd$(INCCOMX)$/$(SDI9NAME).ilb \ - -fm$(MISC)$/$(SDI9NAME).don \ - -fl$(MISC)$/$(SDI9NAME).lst \ + -fs$(INCCOMX)/$(SDI9NAME).hxx \ + -fd$(INCCOMX)/$(SDI9NAME).ilb \ + -fm$(MISC)/$(SDI9NAME).don \ + -fl$(MISC)/$(SDI9NAME).lst \ -fx$(SDI9EXPORT).sdi \ - -fz$(MISC)$/$(SDI9NAME).sid \ + -fz$(MISC)/$(SDI9NAME).sid \ $(SDI9NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE)) .ENDIF # "$(SDI9TARGET)"!="" @@ -293,11 +257,7 @@ $(HIDSID10PARTICLE): $(SDI10TARGET) @echo ------------------------------ @echo Making: $@ @-$(RM) $@.$(ROUT).tmp $@ -.IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISC)$/$(SDI10NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp -.ELSE - @$(TYPE) $(MISC)$/$(SDI10NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp -.ENDIF + @$(TYPE) $(MISC)/$(SDI10NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp @-$(RM) $@ @$(RENAME) $@.$(ROUT).tmp $@ .ENDIF # "$(HIDSID10PARTICLE)"!="" @@ -308,12 +268,12 @@ $(SDI10TARGET): $(SVSDI10DEPEND) $(SDI10NAME).sdi @echo Making: $@ @-$(RM) $@ $(SVIDL) @$(mktmp \ - -fs$(INCCOMX)$/$(SDI10NAME).hxx \ - -fd$(INCCOMX)$/$(SDI10NAME).ilb \ - -fm$(MISC)$/$(SDI10NAME).don \ - -fl$(MISC)$/$(SDI10NAME).lst \ + -fs$(INCCOMX)/$(SDI10NAME).hxx \ + -fd$(INCCOMX)/$(SDI10NAME).ilb \ + -fm$(MISC)/$(SDI10NAME).don \ + -fl$(MISC)/$(SDI10NAME).lst \ -fx$(SDI10EXPORT).sdi \ - -fz$(MISC)$/$(SDI10NAME).sid \ + -fz$(MISC)/$(SDI10NAME).sid \ $(SDI10NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE)) .ENDIF # "$(SDI10TARGET)"!="" diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index 213cdbcbe414..d648f1dd2440 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -29,7 +29,7 @@ LINKFLAGSRUNPATH_$(SHL1RPATH)*=/ERROR:/Bad_SHL1RPATH_value SHL1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL1RPATH)) .IF "$(SHL1USE_EXPORTS)"=="" -SHL1DEF*=$(MISC)$/$(SHL1TARGET).def +SHL1DEF*=$(MISC)/$(SHL1TARGET).def .ENDIF # "$(SHL1USE_EXPORTS)"=="" EXTRALIBPATHS1=$(EXTRALIBPATHS) @@ -44,20 +44,22 @@ EXTRALIBPATHS1+=-L$(SOLAR_STLLIBPATH) #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(L10N_framework)"=="" .IF "$(VERSIONOBJ)"!="" SHL1VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL1VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL1VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL1VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@ .INIT : $(SHL1VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" +.ENDIF .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" @@ -65,13 +67,13 @@ $(MISC)$/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL1VE SHL1IMPLIB=i$(TARGET)_t1 .ENDIF # "$(SHL1IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_1IMPLIB=-implib:$(LB)$/$(SHL1IMPLIB).lib +USE_1IMPLIB=-implib:$(LB)/$(SHL1IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL1IMPLIBN=$(LB)$/$(SHL1IMPLIB).lib +SHL1IMPLIBN=$(LB)/$(SHL1IMPLIB).lib ALLTAR : $(SHL1IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_1IMPLIB_DEPS=$(LB)$/$(SHL1IMPLIB).lib +USE_1IMPLIB_DEPS=$(LB)/$(SHL1IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL1DEF=$(SHL1DEF) @@ -81,7 +83,7 @@ SHL1DEPN+:=$(SHL1DEPNU) .IF "$(SHL1VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap +USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap .ENDIF # "$(SHL1VERSIONMAP)"=="" .IF "$(USE_SHL1VERSIONMAP)"!="" @@ -89,7 +91,7 @@ USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap .IF "$(SHL1FILTERFILE)"!="" .IF "$(SHL1VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap +USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap $(USE_SHL1VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -116,10 +118,10 @@ $(USE_SHL1VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL1OBJS)!"="" @$(TYPE) /dev/null $(SHL1LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL1INTERFACE) -f $(SHL1FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL1INTERFACE) -f $(SHL1FILTERFILE) -m $@ .ELSE # "$(SHL1FILTERFILE)"!="" -USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1TARGET).vmap +USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap $(USE_SHL1VERSIONMAP) : @echo ----------------------------- @echo SHL1FILTERFILE not set! @@ -132,7 +134,7 @@ $(USE_SHL1VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL1VERSIONMAP)"!="" -USE_SHL1VERSIONMAP=$(MISC)$/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e) +USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP) .ENDIF @@ -152,7 +154,7 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL1VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -162,15 +164,15 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL1OBJS)"!="" - -echo $(foreach,i,$(SHL1OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL1OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL1LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -194,15 +196,15 @@ SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\" .IF "$(SHL1RES)"!="" SHL1ALLRES+=$(SHL1RES) -SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res -SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o +SHL1LINKRES*=$(MISC)/$(SHL1TARGET).res +SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o .ENDIF # "$(SHL1RES)"!="" .IF "$(SHL1DEFAULTRES)$(use_shl_versions)"!="" -SHL1DEFAULTRES*=$(MISC)$/$(SHL1TARGET)_def.res +SHL1DEFAULTRES*=$(MISC)/$(SHL1TARGET)_def.res SHL1ALLRES+=$(SHL1DEFAULTRES) -SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res -SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o +SHL1LINKRES*=$(MISC)/$(SHL1TARGET).res +SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o .ENDIF # "$(SHL1DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL1TARGETN)"!="" @@ -210,13 +212,13 @@ SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL1LIBS)"!="" -$(MISC)$/$(SHL1TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL1TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL1LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL1TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL1TARGETN:b)_linkinc.ls $(SHL1TARGETN) : $(LINKINCTARGETS) .ELSE @@ -224,17 +226,17 @@ $(SHL1TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL1LIBS)"!="" -SHL1LINKLIST=$(MISC)$/$(SHL1TARGET)_link.lst +SHL1LINKLIST=$(MISC)/$(SHL1TARGET)_link.lst SHL1LINKLISTPARAM=@$(SHL1LINKLIST) $(SHL1LINKLIST) : $(SHL1LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL1LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL1USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -245,7 +247,7 @@ SHL1TARGET8=$(shell @fix_shl $(SHL1TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL1STDLIBS:^"$(LB)$/") +_SHL1IMP_ORD = $(SHL1STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL1STDLIBS:^"$(LB)/") SHL1IMP_ORD = $(foreach,i,$(_SHL1IMP_ORD) $(shell @-ls $i)) .ELSE SHL1IMP_ORD = @@ -266,54 +268,50 @@ $(SHL1TARGETN) : \ @echo Making: $(SHL1TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL1DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL1DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc .IF "$(SHL1ICON)" != "" - @echo 1 ICON $(SHL1ICON) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc + @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 + @echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc .ELSE # "$(SHL1ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL1DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL1DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF # "$(SHL1ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL1TARGET)$(DLLPOST) >> $(MISC)/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)/$(SHL1DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF # "$(SHL1DEFAULTRES)"!="" .IF "$(SHL1ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL1ALLRES:s/res /res+/) $(SHL1LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES) .IF "$(COM)"=="GCC" windres $(SHL1LINKRES) $(SHL1LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL1ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL1DEF) \ --dllname $(SHL1TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_1.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_1.cmd + @noop $(assign ALL1OBJLIST:=$(STDOBJ) $(SHL1OBJS) $(SHL1LINKRESO) $(shell $(TYPE) /dev/null $(SHL1LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB1NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_1.cmd -.ELSE # "$(DEFLIB1NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ - $(STDOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \ - `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_1.cmd + @noop $(assign DEF1OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF1OBJLIST) $(assign ALL1OBJLIST:=$(ALL1OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB1NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL1OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_1.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \ - `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL1STDLIBS) -Wl,--end-group \ - $(SHL1STDSHL) $(STDSHL1) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_1.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_1.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd + $(SHL1STDSHL) $(STDSHL1) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_1.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_1.cmd + @+source $(MISC)/$(TARGET).$(@:b)_1.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL1USE_EXPORTS)"!="name" @@ -323,7 +321,7 @@ $(SHL1TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL1STACK) $(SHL1BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL1DEF) \ $(USE_1IMPLIB) \ $(STDOBJ) \ @@ -337,7 +335,7 @@ $(SHL1TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -348,8 +346,8 @@ $(SHL1TARGETN) : \ $(SHL1LINKER) @$(mktmp $(SHL1LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL1BASEX) \ $(SHL1STACK) -out:$(SHL1TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL1IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL1IMPLIB).exp \ $(STDOBJ) \ $(SHL1OBJS) $(SHL1VERSIONOBJ) \ $(SHL1LIBS) \ @@ -361,7 +359,7 @@ $(SHL1TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -373,7 +371,7 @@ $(SHL1TARGETN) : \ $(SHL1LINKER) @$(mktmp $(SHL1LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL1BASEX) \ $(SHL1STACK) -out:$(SHL1TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_1IMPLIB) \ $(STDOBJ) \ $(SHL1OBJS) $(SHL1VERSIONOBJ)) \ @@ -384,7 +382,7 @@ $(SHL1TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -393,25 +391,25 @@ $(SHL1TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL1USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL1TARGET).lnk - -$(RM) $(MISC)$/$(SHL1TARGET).lst + -$(RM) del $(MISC)/$(SHL1TARGET).lnk + -$(RM) $(MISC)/$(SHL1TARGET).lst $(TYPE) $(mktmp \ $(SHL1LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL1BASEX) \ $(SHL1STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL1IMPLIB).exp \ + $(LB)/$(SHL1IMPLIB).exp \ $(STDOBJ) \ $(SHL1OBJS) \ $(SHL1STDLIBS) \ $(SHL1STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ - ) >> $(MISC)$/$(SHL1TARGET).lnk - $(TYPE) $(MISC)$/$(SHL1TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL1TARGET).lnk - $(SHL1LINKER) @$(MISC)$/$(SHL1TARGET).lnk + ) >> $(MISC)/$(SHL1TARGET).lnk + $(TYPE) $(MISC)/$(SHL1TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL1TARGET).lnk + $(SHL1LINKER) @$(MISC)/$(SHL1TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -423,45 +421,45 @@ $(SHL1TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd @echo $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ $(SHL1VERSIONOBJ) \ - `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_1.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_1.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_1.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_1.cmd + @cat $(MISC)/$(TARGET).$(@:b)_1.cmd + @+source $(MISC)/$(TARGET).$(@:b)_1.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL1RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL1NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN) .ENDIF # "$(SHL1NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd - @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd + @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ $(SHL1VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_1.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd + `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd + @cat $(MISC)/$(TARGET).$(@:b)_1.cmd + @+source $(MISC)/$(TARGET).$(@:b)_1.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL1NOCHECK)"=="" -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) .ENDIF # "$(SHL1NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL1TARGETN:b) + $(RM) $(LB)/$(SHL1TARGETN:b) cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -470,27 +468,23 @@ $(SHL1TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL1DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL1DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL1ICON)" != "" - @-+echo 1 ICON $(SHL1ICON) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc + @-+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 + @-+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 + @-+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) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc .ENDIF # "$(SHL1DEFAULTRES)"!="" .IF "$(SHL1ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL1ALLRES:s/res /res+/) $(SHL1LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL1ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -499,7 +493,7 @@ $(SHL1TARGETN) : \ $(SHL1DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL1OBJS) $(SHL1VERSIONOBJ) \ $(SHL1LIBS) \ $(SHL1STDLIBS:^"-l") \ @@ -514,7 +508,7 @@ $(SHL1TARGETN) : \ $(SHL1DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL1OBJS) $(SHL1VERSIONOBJ) \ $(SHL1LIBS) \ $(SHL1STDLIBS:^"-l") \ @@ -538,7 +532,7 @@ $(SHL1TARGETN) : \ ALLTAR : runtest_$(SHL1TARGET) runtest_$(SHL1TARGET) : $(SHL1TARGETN) - testshl $(SHL1TARGETN) sce$/$(SHL1TARGET).sce -msg -skip + testshl $(SHL1TARGETN) sce/$(SHL1TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL1TARGETN)"!="" @@ -574,7 +568,7 @@ LINKFLAGSRUNPATH_$(SHL2RPATH)*=/ERROR:/Bad_SHL2RPATH_value SHL2LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL2RPATH)) .IF "$(SHL2USE_EXPORTS)"=="" -SHL2DEF*=$(MISC)$/$(SHL2TARGET).def +SHL2DEF*=$(MISC)/$(SHL2TARGET).def .ENDIF # "$(SHL2USE_EXPORTS)"=="" EXTRALIBPATHS2=$(EXTRALIBPATHS) @@ -589,20 +583,22 @@ EXTRALIBPATHS2+=-L$(SOLAR_STLLIBPATH) #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(L10N_framework)"=="" .IF "$(VERSIONOBJ)"!="" SHL2VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL2VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL2VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL2VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@ .INIT : $(SHL2VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" +.ENDIF .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" @@ -610,13 +606,13 @@ $(MISC)$/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL2VE SHL2IMPLIB=i$(TARGET)_t2 .ENDIF # "$(SHL2IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_2IMPLIB=-implib:$(LB)$/$(SHL2IMPLIB).lib +USE_2IMPLIB=-implib:$(LB)/$(SHL2IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL2IMPLIBN=$(LB)$/$(SHL2IMPLIB).lib +SHL2IMPLIBN=$(LB)/$(SHL2IMPLIB).lib ALLTAR : $(SHL2IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_2IMPLIB_DEPS=$(LB)$/$(SHL2IMPLIB).lib +USE_2IMPLIB_DEPS=$(LB)/$(SHL2IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL2DEF=$(SHL2DEF) @@ -626,7 +622,7 @@ SHL2DEPN+:=$(SHL2DEPNU) .IF "$(SHL2VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap +USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap .ENDIF # "$(SHL2VERSIONMAP)"=="" .IF "$(USE_SHL2VERSIONMAP)"!="" @@ -634,7 +630,7 @@ USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap .IF "$(SHL2FILTERFILE)"!="" .IF "$(SHL2VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap +USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap $(USE_SHL2VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -661,10 +657,10 @@ $(USE_SHL2VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL2OBJS)!"="" @$(TYPE) /dev/null $(SHL2LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL2INTERFACE) -f $(SHL2FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL2INTERFACE) -f $(SHL2FILTERFILE) -m $@ .ELSE # "$(SHL2FILTERFILE)"!="" -USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2TARGET).vmap +USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap $(USE_SHL2VERSIONMAP) : @echo ----------------------------- @echo SHL2FILTERFILE not set! @@ -677,7 +673,7 @@ $(USE_SHL2VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL2VERSIONMAP)"!="" -USE_SHL2VERSIONMAP=$(MISC)$/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e) +USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP) .ENDIF @@ -697,7 +693,7 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL2VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -707,15 +703,15 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL2OBJS)"!="" - -echo $(foreach,i,$(SHL2OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL2OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL2LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -739,15 +735,15 @@ SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\" .IF "$(SHL2RES)"!="" SHL2ALLRES+=$(SHL2RES) -SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res -SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o +SHL2LINKRES*=$(MISC)/$(SHL2TARGET).res +SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o .ENDIF # "$(SHL2RES)"!="" .IF "$(SHL2DEFAULTRES)$(use_shl_versions)"!="" -SHL2DEFAULTRES*=$(MISC)$/$(SHL2TARGET)_def.res +SHL2DEFAULTRES*=$(MISC)/$(SHL2TARGET)_def.res SHL2ALLRES+=$(SHL2DEFAULTRES) -SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res -SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o +SHL2LINKRES*=$(MISC)/$(SHL2TARGET).res +SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o .ENDIF # "$(SHL2DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL2TARGETN)"!="" @@ -755,13 +751,13 @@ SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL2LIBS)"!="" -$(MISC)$/$(SHL2TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL2TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL2LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL2TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL2TARGETN:b)_linkinc.ls $(SHL2TARGETN) : $(LINKINCTARGETS) .ELSE @@ -769,17 +765,17 @@ $(SHL2TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL2LIBS)"!="" -SHL2LINKLIST=$(MISC)$/$(SHL2TARGET)_link.lst +SHL2LINKLIST=$(MISC)/$(SHL2TARGET)_link.lst SHL2LINKLISTPARAM=@$(SHL2LINKLIST) $(SHL2LINKLIST) : $(SHL2LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL2LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL2USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -790,7 +786,7 @@ SHL2TARGET8=$(shell @fix_shl $(SHL2TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL2STDLIBS:^"$(LB)$/") +_SHL2IMP_ORD = $(SHL2STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL2STDLIBS:^"$(LB)/") SHL2IMP_ORD = $(foreach,i,$(_SHL2IMP_ORD) $(shell @-ls $i)) .ELSE SHL2IMP_ORD = @@ -811,54 +807,50 @@ $(SHL2TARGETN) : \ @echo Making: $(SHL2TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL2DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL2DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc .IF "$(SHL2ICON)" != "" - @echo 1 ICON $(SHL2ICON) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc + @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 + @echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc .ELSE # "$(SHL2ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL2DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL2DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF # "$(SHL2ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL2TARGET)$(DLLPOST) >> $(MISC)/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)/$(SHL2DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF # "$(SHL2DEFAULTRES)"!="" .IF "$(SHL2ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL2ALLRES:s/res /res+/) $(SHL2LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES) .IF "$(COM)"=="GCC" windres $(SHL2LINKRES) $(SHL2LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL2ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL2DEF) \ --dllname $(SHL2TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_2.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_2.cmd + @noop $(assign ALL2OBJLIST:=$(STDOBJ) $(SHL2OBJS) $(SHL2LINKRESO) $(shell $(TYPE) /dev/null $(SHL2LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB2NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_2.cmd -.ELSE # "$(DEFLIB2NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ - $(STDOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \ - `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_2.cmd + @noop $(assign DEF2OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF2OBJLIST) $(assign ALL2OBJLIST:=$(ALL2OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB2NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL2OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_2.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \ - `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL2STDLIBS) -Wl,--end-group \ - $(SHL2STDSHL) $(STDSHL2) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_2.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_2.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd + $(SHL2STDSHL) $(STDSHL2) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_2.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_2.cmd + @+source $(MISC)/$(TARGET).$(@:b)_2.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL2USE_EXPORTS)"!="name" @@ -868,7 +860,7 @@ $(SHL2TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL2STACK) $(SHL2BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL2DEF) \ $(USE_2IMPLIB) \ $(STDOBJ) \ @@ -882,7 +874,7 @@ $(SHL2TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -893,8 +885,8 @@ $(SHL2TARGETN) : \ $(SHL2LINKER) @$(mktmp $(SHL2LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL2BASEX) \ $(SHL2STACK) -out:$(SHL2TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL2IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL2IMPLIB).exp \ $(STDOBJ) \ $(SHL2OBJS) $(SHL2VERSIONOBJ) \ $(SHL2LIBS) \ @@ -906,7 +898,7 @@ $(SHL2TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -918,7 +910,7 @@ $(SHL2TARGETN) : \ $(SHL2LINKER) @$(mktmp $(SHL2LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL2BASEX) \ $(SHL2STACK) -out:$(SHL2TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_2IMPLIB) \ $(STDOBJ) \ $(SHL2OBJS) $(SHL2VERSIONOBJ)) \ @@ -929,7 +921,7 @@ $(SHL2TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -938,25 +930,25 @@ $(SHL2TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL2USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL2TARGET).lnk - -$(RM) $(MISC)$/$(SHL2TARGET).lst + -$(RM) del $(MISC)/$(SHL2TARGET).lnk + -$(RM) $(MISC)/$(SHL2TARGET).lst $(TYPE) $(mktmp \ $(SHL2LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL2BASEX) \ $(SHL2STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL2IMPLIB).exp \ + $(LB)/$(SHL2IMPLIB).exp \ $(STDOBJ) \ $(SHL2OBJS) \ $(SHL2STDLIBS) \ $(SHL2STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ - ) >> $(MISC)$/$(SHL2TARGET).lnk - $(TYPE) $(MISC)$/$(SHL2TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL2TARGET).lnk - $(SHL2LINKER) @$(MISC)$/$(SHL2TARGET).lnk + ) >> $(MISC)/$(SHL2TARGET).lnk + $(TYPE) $(MISC)/$(SHL2TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL2TARGET).lnk + $(SHL2LINKER) @$(MISC)/$(SHL2TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -968,45 +960,45 @@ $(SHL2TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd @echo $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ $(SHL2VERSIONOBJ) \ - `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_2.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_2.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_2.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_2.cmd + @cat $(MISC)/$(TARGET).$(@:b)_2.cmd + @+source $(MISC)/$(TARGET).$(@:b)_2.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL2RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL2NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN) .ENDIF # "$(SHL2NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd - @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd + @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ $(SHL2VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_2.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd + `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd + @cat $(MISC)/$(TARGET).$(@:b)_2.cmd + @+source $(MISC)/$(TARGET).$(@:b)_2.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL2NOCHECK)"=="" -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) .ENDIF # "$(SHL2NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL2TARGETN:b) + $(RM) $(LB)/$(SHL2TARGETN:b) cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -1015,27 +1007,23 @@ $(SHL2TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL2DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL2DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL2ICON)" != "" - @-+echo 1 ICON $(SHL2ICON) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc + @-+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 + @-+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 + @-+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) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc .ENDIF # "$(SHL2DEFAULTRES)"!="" .IF "$(SHL2ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL2ALLRES:s/res /res+/) $(SHL2LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL2ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -1044,7 +1032,7 @@ $(SHL2TARGETN) : \ $(SHL2DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL2OBJS) $(SHL2VERSIONOBJ) \ $(SHL2LIBS) \ $(SHL2STDLIBS:^"-l") \ @@ -1059,7 +1047,7 @@ $(SHL2TARGETN) : \ $(SHL2DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL2OBJS) $(SHL2VERSIONOBJ) \ $(SHL2LIBS) \ $(SHL2STDLIBS:^"-l") \ @@ -1083,7 +1071,7 @@ $(SHL2TARGETN) : \ ALLTAR : runtest_$(SHL2TARGET) runtest_$(SHL2TARGET) : $(SHL2TARGETN) - testshl $(SHL2TARGETN) sce$/$(SHL2TARGET).sce -msg -skip + testshl $(SHL2TARGETN) sce/$(SHL2TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL2TARGETN)"!="" @@ -1119,7 +1107,7 @@ LINKFLAGSRUNPATH_$(SHL3RPATH)*=/ERROR:/Bad_SHL3RPATH_value SHL3LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL3RPATH)) .IF "$(SHL3USE_EXPORTS)"=="" -SHL3DEF*=$(MISC)$/$(SHL3TARGET).def +SHL3DEF*=$(MISC)/$(SHL3TARGET).def .ENDIF # "$(SHL3USE_EXPORTS)"=="" EXTRALIBPATHS3=$(EXTRALIBPATHS) @@ -1134,20 +1122,22 @@ EXTRALIBPATHS3+=-L$(SOLAR_STLLIBPATH) #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(L10N_framework)"=="" .IF "$(VERSIONOBJ)"!="" SHL3VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL3VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL3VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL3VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL3VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@ .INIT : $(SHL3VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" +.ENDIF .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" @@ -1155,13 +1145,13 @@ $(MISC)$/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL3VE SHL3IMPLIB=i$(TARGET)_t3 .ENDIF # "$(SHL3IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_3IMPLIB=-implib:$(LB)$/$(SHL3IMPLIB).lib +USE_3IMPLIB=-implib:$(LB)/$(SHL3IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL3IMPLIBN=$(LB)$/$(SHL3IMPLIB).lib +SHL3IMPLIBN=$(LB)/$(SHL3IMPLIB).lib ALLTAR : $(SHL3IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_3IMPLIB_DEPS=$(LB)$/$(SHL3IMPLIB).lib +USE_3IMPLIB_DEPS=$(LB)/$(SHL3IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL3DEF=$(SHL3DEF) @@ -1171,7 +1161,7 @@ SHL3DEPN+:=$(SHL3DEPNU) .IF "$(SHL3VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap +USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap .ENDIF # "$(SHL3VERSIONMAP)"=="" .IF "$(USE_SHL3VERSIONMAP)"!="" @@ -1179,7 +1169,7 @@ USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap .IF "$(SHL3FILTERFILE)"!="" .IF "$(SHL3VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap +USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap $(USE_SHL3VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -1206,10 +1196,10 @@ $(USE_SHL3VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL3OBJS)!"="" @$(TYPE) /dev/null $(SHL3LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL3INTERFACE) -f $(SHL3FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL3INTERFACE) -f $(SHL3FILTERFILE) -m $@ .ELSE # "$(SHL3FILTERFILE)"!="" -USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3TARGET).vmap +USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap $(USE_SHL3VERSIONMAP) : @echo ----------------------------- @echo SHL3FILTERFILE not set! @@ -1222,7 +1212,7 @@ $(USE_SHL3VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL3VERSIONMAP)"!="" -USE_SHL3VERSIONMAP=$(MISC)$/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e) +USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP) .ENDIF @@ -1242,7 +1232,7 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL3VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -1252,15 +1242,15 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL3OBJS)"!="" - -echo $(foreach,i,$(SHL3OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL3OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL3LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -1284,15 +1274,15 @@ SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\" .IF "$(SHL3RES)"!="" SHL3ALLRES+=$(SHL3RES) -SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res -SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o +SHL3LINKRES*=$(MISC)/$(SHL3TARGET).res +SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o .ENDIF # "$(SHL3RES)"!="" .IF "$(SHL3DEFAULTRES)$(use_shl_versions)"!="" -SHL3DEFAULTRES*=$(MISC)$/$(SHL3TARGET)_def.res +SHL3DEFAULTRES*=$(MISC)/$(SHL3TARGET)_def.res SHL3ALLRES+=$(SHL3DEFAULTRES) -SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res -SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o +SHL3LINKRES*=$(MISC)/$(SHL3TARGET).res +SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o .ENDIF # "$(SHL3DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL3TARGETN)"!="" @@ -1300,13 +1290,13 @@ SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL3LIBS)"!="" -$(MISC)$/$(SHL3TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL3TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL3LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL3TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL3TARGETN:b)_linkinc.ls $(SHL3TARGETN) : $(LINKINCTARGETS) .ELSE @@ -1314,17 +1304,17 @@ $(SHL3TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL3LIBS)"!="" -SHL3LINKLIST=$(MISC)$/$(SHL3TARGET)_link.lst +SHL3LINKLIST=$(MISC)/$(SHL3TARGET)_link.lst SHL3LINKLISTPARAM=@$(SHL3LINKLIST) $(SHL3LINKLIST) : $(SHL3LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL3LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL3USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -1335,7 +1325,7 @@ SHL3TARGET8=$(shell @fix_shl $(SHL3TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL3STDLIBS:^"$(LB)$/") +_SHL3IMP_ORD = $(SHL3STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL3STDLIBS:^"$(LB)/") SHL3IMP_ORD = $(foreach,i,$(_SHL3IMP_ORD) $(shell @-ls $i)) .ELSE SHL3IMP_ORD = @@ -1356,54 +1346,50 @@ $(SHL3TARGETN) : \ @echo Making: $(SHL3TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL3DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL3DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc .IF "$(SHL3ICON)" != "" - @echo 1 ICON $(SHL3ICON) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc + @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 + @echo $(EMQ)#include $(EMQ)"$(SHL3ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc .ELSE # "$(SHL3ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL3DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL3DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF # "$(SHL3ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL3TARGET)$(DLLPOST) >> $(MISC)/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)/$(SHL3DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF # "$(SHL3DEFAULTRES)"!="" .IF "$(SHL3ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL3ALLRES:s/res /res+/) $(SHL3LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES) .IF "$(COM)"=="GCC" windres $(SHL3LINKRES) $(SHL3LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL3ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL3DEF) \ --dllname $(SHL3TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_3.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_3.cmd + @noop $(assign ALL3OBJLIST:=$(STDOBJ) $(SHL3OBJS) $(SHL3LINKRESO) $(shell $(TYPE) /dev/null $(SHL3LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB3NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_3.cmd -.ELSE # "$(DEFLIB3NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ - $(STDOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \ - `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_3.cmd + @noop $(assign DEF3OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF3OBJLIST) $(assign ALL3OBJLIST:=$(ALL3OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB3NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL3OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_3.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \ - `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL3STDLIBS) -Wl,--end-group \ - $(SHL3STDSHL) $(STDSHL3) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_3.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_3.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd + $(SHL3STDSHL) $(STDSHL3) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_3.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_3.cmd + @+source $(MISC)/$(TARGET).$(@:b)_3.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL3USE_EXPORTS)"!="name" @@ -1413,7 +1399,7 @@ $(SHL3TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL3STACK) $(SHL3BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL3DEF) \ $(USE_3IMPLIB) \ $(STDOBJ) \ @@ -1427,7 +1413,7 @@ $(SHL3TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -1438,8 +1424,8 @@ $(SHL3TARGETN) : \ $(SHL3LINKER) @$(mktmp $(SHL3LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL3BASEX) \ $(SHL3STACK) -out:$(SHL3TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL3IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL3IMPLIB).exp \ $(STDOBJ) \ $(SHL3OBJS) $(SHL3VERSIONOBJ) \ $(SHL3LIBS) \ @@ -1451,7 +1437,7 @@ $(SHL3TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -1463,7 +1449,7 @@ $(SHL3TARGETN) : \ $(SHL3LINKER) @$(mktmp $(SHL3LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL3BASEX) \ $(SHL3STACK) -out:$(SHL3TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_3IMPLIB) \ $(STDOBJ) \ $(SHL3OBJS) $(SHL3VERSIONOBJ)) \ @@ -1474,7 +1460,7 @@ $(SHL3TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -1483,25 +1469,25 @@ $(SHL3TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL3USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL3TARGET).lnk - -$(RM) $(MISC)$/$(SHL3TARGET).lst + -$(RM) del $(MISC)/$(SHL3TARGET).lnk + -$(RM) $(MISC)/$(SHL3TARGET).lst $(TYPE) $(mktmp \ $(SHL3LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL3BASEX) \ $(SHL3STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL3IMPLIB).exp \ + $(LB)/$(SHL3IMPLIB).exp \ $(STDOBJ) \ $(SHL3OBJS) \ $(SHL3STDLIBS) \ $(SHL3STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ - ) >> $(MISC)$/$(SHL3TARGET).lnk - $(TYPE) $(MISC)$/$(SHL3TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL3TARGET).lnk - $(SHL3LINKER) @$(MISC)$/$(SHL3TARGET).lnk + ) >> $(MISC)/$(SHL3TARGET).lnk + $(TYPE) $(MISC)/$(SHL3TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL3TARGET).lnk + $(SHL3LINKER) @$(MISC)/$(SHL3TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -1513,45 +1499,45 @@ $(SHL3TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd @echo $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ $(SHL3VERSIONOBJ) \ - `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_3.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_3.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_3.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_3.cmd + @cat $(MISC)/$(TARGET).$(@:b)_3.cmd + @+source $(MISC)/$(TARGET).$(@:b)_3.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL3RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL3NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN) .ENDIF # "$(SHL3NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd - @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd + @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ $(SHL3VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_3.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd + `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd + @cat $(MISC)/$(TARGET).$(@:b)_3.cmd + @+source $(MISC)/$(TARGET).$(@:b)_3.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL3NOCHECK)"=="" -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) .ENDIF # "$(SHL3NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL3TARGETN:b) + $(RM) $(LB)/$(SHL3TARGETN:b) cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -1560,27 +1546,23 @@ $(SHL3TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL3DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL3DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL3ICON)" != "" - @-+echo 1 ICON $(SHL3ICON) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc + @-+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 + @-+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 + @-+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) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc .ENDIF # "$(SHL3DEFAULTRES)"!="" .IF "$(SHL3ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL3ALLRES:s/res /res+/) $(SHL3LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL3ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -1589,7 +1571,7 @@ $(SHL3TARGETN) : \ $(SHL3DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL3OBJS) $(SHL3VERSIONOBJ) \ $(SHL3LIBS) \ $(SHL3STDLIBS:^"-l") \ @@ -1604,7 +1586,7 @@ $(SHL3TARGETN) : \ $(SHL3DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL3OBJS) $(SHL3VERSIONOBJ) \ $(SHL3LIBS) \ $(SHL3STDLIBS:^"-l") \ @@ -1628,7 +1610,7 @@ $(SHL3TARGETN) : \ ALLTAR : runtest_$(SHL3TARGET) runtest_$(SHL3TARGET) : $(SHL3TARGETN) - testshl $(SHL3TARGETN) sce$/$(SHL3TARGET).sce -msg -skip + testshl $(SHL3TARGETN) sce/$(SHL3TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL3TARGETN)"!="" @@ -1664,7 +1646,7 @@ LINKFLAGSRUNPATH_$(SHL4RPATH)*=/ERROR:/Bad_SHL4RPATH_value SHL4LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL4RPATH)) .IF "$(SHL4USE_EXPORTS)"=="" -SHL4DEF*=$(MISC)$/$(SHL4TARGET).def +SHL4DEF*=$(MISC)/$(SHL4TARGET).def .ENDIF # "$(SHL4USE_EXPORTS)"=="" EXTRALIBPATHS4=$(EXTRALIBPATHS) @@ -1679,20 +1661,22 @@ EXTRALIBPATHS4+=-L$(SOLAR_STLLIBPATH) #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(L10N_framework)"=="" .IF "$(VERSIONOBJ)"!="" SHL4VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL4VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL4VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL4VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL4VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@ .INIT : $(SHL4VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" +.ENDIF .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" @@ -1700,13 +1684,13 @@ $(MISC)$/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL4VE SHL4IMPLIB=i$(TARGET)_t4 .ENDIF # "$(SHL4IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_4IMPLIB=-implib:$(LB)$/$(SHL4IMPLIB).lib +USE_4IMPLIB=-implib:$(LB)/$(SHL4IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL4IMPLIBN=$(LB)$/$(SHL4IMPLIB).lib +SHL4IMPLIBN=$(LB)/$(SHL4IMPLIB).lib ALLTAR : $(SHL4IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_4IMPLIB_DEPS=$(LB)$/$(SHL4IMPLIB).lib +USE_4IMPLIB_DEPS=$(LB)/$(SHL4IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL4DEF=$(SHL4DEF) @@ -1716,7 +1700,7 @@ SHL4DEPN+:=$(SHL4DEPNU) .IF "$(SHL4VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap +USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap .ENDIF # "$(SHL4VERSIONMAP)"=="" .IF "$(USE_SHL4VERSIONMAP)"!="" @@ -1724,7 +1708,7 @@ USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap .IF "$(SHL4FILTERFILE)"!="" .IF "$(SHL4VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap +USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap $(USE_SHL4VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -1751,10 +1735,10 @@ $(USE_SHL4VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL4OBJS)!"="" @$(TYPE) /dev/null $(SHL4LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL4INTERFACE) -f $(SHL4FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL4INTERFACE) -f $(SHL4FILTERFILE) -m $@ .ELSE # "$(SHL4FILTERFILE)"!="" -USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4TARGET).vmap +USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap $(USE_SHL4VERSIONMAP) : @echo ----------------------------- @echo SHL4FILTERFILE not set! @@ -1767,7 +1751,7 @@ $(USE_SHL4VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL4VERSIONMAP)"!="" -USE_SHL4VERSIONMAP=$(MISC)$/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e) +USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP) .ENDIF @@ -1787,7 +1771,7 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL4VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -1797,15 +1781,15 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL4OBJS)"!="" - -echo $(foreach,i,$(SHL4OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL4OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL4LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -1829,15 +1813,15 @@ SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\" .IF "$(SHL4RES)"!="" SHL4ALLRES+=$(SHL4RES) -SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res -SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o +SHL4LINKRES*=$(MISC)/$(SHL4TARGET).res +SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o .ENDIF # "$(SHL4RES)"!="" .IF "$(SHL4DEFAULTRES)$(use_shl_versions)"!="" -SHL4DEFAULTRES*=$(MISC)$/$(SHL4TARGET)_def.res +SHL4DEFAULTRES*=$(MISC)/$(SHL4TARGET)_def.res SHL4ALLRES+=$(SHL4DEFAULTRES) -SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res -SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o +SHL4LINKRES*=$(MISC)/$(SHL4TARGET).res +SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o .ENDIF # "$(SHL4DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL4TARGETN)"!="" @@ -1845,13 +1829,13 @@ SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL4LIBS)"!="" -$(MISC)$/$(SHL4TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL4TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL4LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL4TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL4TARGETN:b)_linkinc.ls $(SHL4TARGETN) : $(LINKINCTARGETS) .ELSE @@ -1859,17 +1843,17 @@ $(SHL4TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL4LIBS)"!="" -SHL4LINKLIST=$(MISC)$/$(SHL4TARGET)_link.lst +SHL4LINKLIST=$(MISC)/$(SHL4TARGET)_link.lst SHL4LINKLISTPARAM=@$(SHL4LINKLIST) $(SHL4LINKLIST) : $(SHL4LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL4LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL4USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -1880,7 +1864,7 @@ SHL4TARGET8=$(shell @fix_shl $(SHL4TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL4STDLIBS:^"$(LB)$/") +_SHL4IMP_ORD = $(SHL4STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL4STDLIBS:^"$(LB)/") SHL4IMP_ORD = $(foreach,i,$(_SHL4IMP_ORD) $(shell @-ls $i)) .ELSE SHL4IMP_ORD = @@ -1901,54 +1885,50 @@ $(SHL4TARGETN) : \ @echo Making: $(SHL4TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL4DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL4DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc .IF "$(SHL4ICON)" != "" - @echo 1 ICON $(SHL4ICON) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc + @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 + @echo $(EMQ)#include $(EMQ)"$(SHL4ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc .ELSE # "$(SHL4ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL4DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL4DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF # "$(SHL4ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL4TARGET)$(DLLPOST) >> $(MISC)/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)/$(SHL4DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF # "$(SHL4DEFAULTRES)"!="" .IF "$(SHL4ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL4ALLRES:s/res /res+/) $(SHL4LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES) .IF "$(COM)"=="GCC" windres $(SHL4LINKRES) $(SHL4LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL4ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL4DEF) \ --dllname $(SHL4TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_4.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_4.cmd + @noop $(assign ALL4OBJLIST:=$(STDOBJ) $(SHL4OBJS) $(SHL4LINKRESO) $(shell $(TYPE) /dev/null $(SHL4LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB4NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_4.cmd -.ELSE # "$(DEFLIB4NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ - $(STDOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \ - `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_4.cmd + @noop $(assign DEF4OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF4OBJLIST) $(assign ALL4OBJLIST:=$(ALL4OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB4NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL4OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_4.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \ - `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL4STDLIBS) -Wl,--end-group \ - $(SHL4STDSHL) $(STDSHL4) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_4.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_4.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd + $(SHL4STDSHL) $(STDSHL4) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_4.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_4.cmd + @+source $(MISC)/$(TARGET).$(@:b)_4.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL4USE_EXPORTS)"!="name" @@ -1958,7 +1938,7 @@ $(SHL4TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL4STACK) $(SHL4BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL4DEF) \ $(USE_4IMPLIB) \ $(STDOBJ) \ @@ -1972,7 +1952,7 @@ $(SHL4TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -1983,8 +1963,8 @@ $(SHL4TARGETN) : \ $(SHL4LINKER) @$(mktmp $(SHL4LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL4BASEX) \ $(SHL4STACK) -out:$(SHL4TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL4IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL4IMPLIB).exp \ $(STDOBJ) \ $(SHL4OBJS) $(SHL4VERSIONOBJ) \ $(SHL4LIBS) \ @@ -1996,7 +1976,7 @@ $(SHL4TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2008,7 +1988,7 @@ $(SHL4TARGETN) : \ $(SHL4LINKER) @$(mktmp $(SHL4LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL4BASEX) \ $(SHL4STACK) -out:$(SHL4TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_4IMPLIB) \ $(STDOBJ) \ $(SHL4OBJS) $(SHL4VERSIONOBJ)) \ @@ -2019,7 +1999,7 @@ $(SHL4TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2028,25 +2008,25 @@ $(SHL4TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL4USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL4TARGET).lnk - -$(RM) $(MISC)$/$(SHL4TARGET).lst + -$(RM) del $(MISC)/$(SHL4TARGET).lnk + -$(RM) $(MISC)/$(SHL4TARGET).lst $(TYPE) $(mktmp \ $(SHL4LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL4BASEX) \ $(SHL4STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL4IMPLIB).exp \ + $(LB)/$(SHL4IMPLIB).exp \ $(STDOBJ) \ $(SHL4OBJS) \ $(SHL4STDLIBS) \ $(SHL4STDSHL) $(STDSHL4) \ $(SHL4LINKRES) \ - ) >> $(MISC)$/$(SHL4TARGET).lnk - $(TYPE) $(MISC)$/$(SHL4TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL4TARGET).lnk - $(SHL4LINKER) @$(MISC)$/$(SHL4TARGET).lnk + ) >> $(MISC)/$(SHL4TARGET).lnk + $(TYPE) $(MISC)/$(SHL4TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL4TARGET).lnk + $(SHL4LINKER) @$(MISC)/$(SHL4TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2058,45 +2038,45 @@ $(SHL4TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd @echo $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ $(SHL4VERSIONOBJ) \ - `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_4.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_4.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_4.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_4.cmd + @cat $(MISC)/$(TARGET).$(@:b)_4.cmd + @+source $(MISC)/$(TARGET).$(@:b)_4.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL4RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL4NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN) .ENDIF # "$(SHL4NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd - @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd + @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ $(SHL4VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_4.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd + `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd + @cat $(MISC)/$(TARGET).$(@:b)_4.cmd + @+source $(MISC)/$(TARGET).$(@:b)_4.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL4NOCHECK)"=="" -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) .ENDIF # "$(SHL4NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL4TARGETN:b) + $(RM) $(LB)/$(SHL4TARGETN:b) cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -2105,27 +2085,23 @@ $(SHL4TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL4DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL4DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL4ICON)" != "" - @-+echo 1 ICON $(SHL4ICON) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc + @-+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 + @-+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 + @-+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) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc .ENDIF # "$(SHL4DEFAULTRES)"!="" .IF "$(SHL4ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL4ALLRES:s/res /res+/) $(SHL4LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL4ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -2134,7 +2110,7 @@ $(SHL4TARGETN) : \ $(SHL4DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL4OBJS) $(SHL4VERSIONOBJ) \ $(SHL4LIBS) \ $(SHL4STDLIBS:^"-l") \ @@ -2149,7 +2125,7 @@ $(SHL4TARGETN) : \ $(SHL4DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL4OBJS) $(SHL4VERSIONOBJ) \ $(SHL4LIBS) \ $(SHL4STDLIBS:^"-l") \ @@ -2173,7 +2149,7 @@ $(SHL4TARGETN) : \ ALLTAR : runtest_$(SHL4TARGET) runtest_$(SHL4TARGET) : $(SHL4TARGETN) - testshl $(SHL4TARGETN) sce$/$(SHL4TARGET).sce -msg -skip + testshl $(SHL4TARGETN) sce/$(SHL4TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL4TARGETN)"!="" @@ -2209,7 +2185,7 @@ LINKFLAGSRUNPATH_$(SHL5RPATH)*=/ERROR:/Bad_SHL5RPATH_value SHL5LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL5RPATH)) .IF "$(SHL5USE_EXPORTS)"=="" -SHL5DEF*=$(MISC)$/$(SHL5TARGET).def +SHL5DEF*=$(MISC)/$(SHL5TARGET).def .ENDIF # "$(SHL5USE_EXPORTS)"=="" EXTRALIBPATHS5=$(EXTRALIBPATHS) @@ -2224,20 +2200,22 @@ EXTRALIBPATHS5+=-L$(SOLAR_STLLIBPATH) #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(L10N_framework)"=="" .IF "$(VERSIONOBJ)"!="" SHL5VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL5VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL5VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL5VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL5VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@ .INIT : $(SHL5VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" +.ENDIF .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" @@ -2245,13 +2223,13 @@ $(MISC)$/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL5VE SHL5IMPLIB=i$(TARGET)_t5 .ENDIF # "$(SHL5IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_5IMPLIB=-implib:$(LB)$/$(SHL5IMPLIB).lib +USE_5IMPLIB=-implib:$(LB)/$(SHL5IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL5IMPLIBN=$(LB)$/$(SHL5IMPLIB).lib +SHL5IMPLIBN=$(LB)/$(SHL5IMPLIB).lib ALLTAR : $(SHL5IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_5IMPLIB_DEPS=$(LB)$/$(SHL5IMPLIB).lib +USE_5IMPLIB_DEPS=$(LB)/$(SHL5IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL5DEF=$(SHL5DEF) @@ -2261,7 +2239,7 @@ SHL5DEPN+:=$(SHL5DEPNU) .IF "$(SHL5VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap +USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap .ENDIF # "$(SHL5VERSIONMAP)"=="" .IF "$(USE_SHL5VERSIONMAP)"!="" @@ -2269,7 +2247,7 @@ USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap .IF "$(SHL5FILTERFILE)"!="" .IF "$(SHL5VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap +USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap $(USE_SHL5VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -2296,10 +2274,10 @@ $(USE_SHL5VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL5OBJS)!"="" @$(TYPE) /dev/null $(SHL5LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL5INTERFACE) -f $(SHL5FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL5INTERFACE) -f $(SHL5FILTERFILE) -m $@ .ELSE # "$(SHL5FILTERFILE)"!="" -USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5TARGET).vmap +USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap $(USE_SHL5VERSIONMAP) : @echo ----------------------------- @echo SHL5FILTERFILE not set! @@ -2312,7 +2290,7 @@ $(USE_SHL5VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL5VERSIONMAP)"!="" -USE_SHL5VERSIONMAP=$(MISC)$/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e) +USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP) .ENDIF @@ -2332,7 +2310,7 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL5VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -2342,15 +2320,15 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL5OBJS)"!="" - -echo $(foreach,i,$(SHL5OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL5OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL5LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -2374,15 +2352,15 @@ SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\" .IF "$(SHL5RES)"!="" SHL5ALLRES+=$(SHL5RES) -SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res -SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o +SHL5LINKRES*=$(MISC)/$(SHL5TARGET).res +SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o .ENDIF # "$(SHL5RES)"!="" .IF "$(SHL5DEFAULTRES)$(use_shl_versions)"!="" -SHL5DEFAULTRES*=$(MISC)$/$(SHL5TARGET)_def.res +SHL5DEFAULTRES*=$(MISC)/$(SHL5TARGET)_def.res SHL5ALLRES+=$(SHL5DEFAULTRES) -SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res -SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o +SHL5LINKRES*=$(MISC)/$(SHL5TARGET).res +SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o .ENDIF # "$(SHL5DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL5TARGETN)"!="" @@ -2390,13 +2368,13 @@ SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL5LIBS)"!="" -$(MISC)$/$(SHL5TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL5TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL5LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL5TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL5TARGETN:b)_linkinc.ls $(SHL5TARGETN) : $(LINKINCTARGETS) .ELSE @@ -2404,17 +2382,17 @@ $(SHL5TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL5LIBS)"!="" -SHL5LINKLIST=$(MISC)$/$(SHL5TARGET)_link.lst +SHL5LINKLIST=$(MISC)/$(SHL5TARGET)_link.lst SHL5LINKLISTPARAM=@$(SHL5LINKLIST) $(SHL5LINKLIST) : $(SHL5LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL5LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL5USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -2425,7 +2403,7 @@ SHL5TARGET8=$(shell @fix_shl $(SHL5TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL5STDLIBS:^"$(LB)$/") +_SHL5IMP_ORD = $(SHL5STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL5STDLIBS:^"$(LB)/") SHL5IMP_ORD = $(foreach,i,$(_SHL5IMP_ORD) $(shell @-ls $i)) .ELSE SHL5IMP_ORD = @@ -2446,54 +2424,50 @@ $(SHL5TARGETN) : \ @echo Making: $(SHL5TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL5DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL5DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc .IF "$(SHL5ICON)" != "" - @echo 1 ICON $(SHL5ICON) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc + @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 + @echo $(EMQ)#include $(EMQ)"$(SHL5ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc .ELSE # "$(SHL5ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL5DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL5DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF # "$(SHL5ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL5TARGET)$(DLLPOST) >> $(MISC)/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)/$(SHL5DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF # "$(SHL5DEFAULTRES)"!="" .IF "$(SHL5ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL5ALLRES:s/res /res+/) $(SHL5LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES) .IF "$(COM)"=="GCC" windres $(SHL5LINKRES) $(SHL5LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL5ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL5DEF) \ --dllname $(SHL5TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_5.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_5.cmd + @noop $(assign ALL5OBJLIST:=$(STDOBJ) $(SHL5OBJS) $(SHL5LINKRESO) $(shell $(TYPE) /dev/null $(SHL5LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB5NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_5.cmd -.ELSE # "$(DEFLIB5NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ - $(STDOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \ - `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_5.cmd + @noop $(assign DEF5OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF5OBJLIST) $(assign ALL5OBJLIST:=$(ALL5OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB5NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL5OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_5.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \ - `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL5STDLIBS) -Wl,--end-group \ - $(SHL5STDSHL) $(STDSHL5) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_5.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_5.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd + $(SHL5STDSHL) $(STDSHL5) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_5.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_5.cmd + @+source $(MISC)/$(TARGET).$(@:b)_5.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL5USE_EXPORTS)"!="name" @@ -2503,7 +2477,7 @@ $(SHL5TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL5STACK) $(SHL5BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL5DEF) \ $(USE_5IMPLIB) \ $(STDOBJ) \ @@ -2517,7 +2491,7 @@ $(SHL5TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2528,8 +2502,8 @@ $(SHL5TARGETN) : \ $(SHL5LINKER) @$(mktmp $(SHL5LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL5BASEX) \ $(SHL5STACK) -out:$(SHL5TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL5IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL5IMPLIB).exp \ $(STDOBJ) \ $(SHL5OBJS) $(SHL5VERSIONOBJ) \ $(SHL5LIBS) \ @@ -2541,7 +2515,7 @@ $(SHL5TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2553,7 +2527,7 @@ $(SHL5TARGETN) : \ $(SHL5LINKER) @$(mktmp $(SHL5LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL5BASEX) \ $(SHL5STACK) -out:$(SHL5TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_5IMPLIB) \ $(STDOBJ) \ $(SHL5OBJS) $(SHL5VERSIONOBJ)) \ @@ -2564,7 +2538,7 @@ $(SHL5TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2573,25 +2547,25 @@ $(SHL5TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL5USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL5TARGET).lnk - -$(RM) $(MISC)$/$(SHL5TARGET).lst + -$(RM) del $(MISC)/$(SHL5TARGET).lnk + -$(RM) $(MISC)/$(SHL5TARGET).lst $(TYPE) $(mktmp \ $(SHL5LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL5BASEX) \ $(SHL5STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL5IMPLIB).exp \ + $(LB)/$(SHL5IMPLIB).exp \ $(STDOBJ) \ $(SHL5OBJS) \ $(SHL5STDLIBS) \ $(SHL5STDSHL) $(STDSHL5) \ $(SHL5LINKRES) \ - ) >> $(MISC)$/$(SHL5TARGET).lnk - $(TYPE) $(MISC)$/$(SHL5TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL5TARGET).lnk - $(SHL5LINKER) @$(MISC)$/$(SHL5TARGET).lnk + ) >> $(MISC)/$(SHL5TARGET).lnk + $(TYPE) $(MISC)/$(SHL5TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL5TARGET).lnk + $(SHL5LINKER) @$(MISC)/$(SHL5TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -2603,45 +2577,45 @@ $(SHL5TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd @echo $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ $(SHL5VERSIONOBJ) \ - `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_5.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_5.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_5.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_5.cmd + @cat $(MISC)/$(TARGET).$(@:b)_5.cmd + @+source $(MISC)/$(TARGET).$(@:b)_5.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL5RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL5NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN) .ENDIF # "$(SHL5NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd - @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd + @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ $(SHL5VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_5.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd + `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd + @cat $(MISC)/$(TARGET).$(@:b)_5.cmd + @+source $(MISC)/$(TARGET).$(@:b)_5.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL5NOCHECK)"=="" -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) .ENDIF # "$(SHL5NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL5TARGETN:b) + $(RM) $(LB)/$(SHL5TARGETN:b) cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -2650,27 +2624,23 @@ $(SHL5TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL5DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL5DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL5ICON)" != "" - @-+echo 1 ICON $(SHL5ICON) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc + @-+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 + @-+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 + @-+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) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc .ENDIF # "$(SHL5DEFAULTRES)"!="" .IF "$(SHL5ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL5ALLRES:s/res /res+/) $(SHL5LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL5ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -2679,7 +2649,7 @@ $(SHL5TARGETN) : \ $(SHL5DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL5OBJS) $(SHL5VERSIONOBJ) \ $(SHL5LIBS) \ $(SHL5STDLIBS:^"-l") \ @@ -2694,7 +2664,7 @@ $(SHL5TARGETN) : \ $(SHL5DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL5OBJS) $(SHL5VERSIONOBJ) \ $(SHL5LIBS) \ $(SHL5STDLIBS:^"-l") \ @@ -2718,7 +2688,7 @@ $(SHL5TARGETN) : \ ALLTAR : runtest_$(SHL5TARGET) runtest_$(SHL5TARGET) : $(SHL5TARGETN) - testshl $(SHL5TARGETN) sce$/$(SHL5TARGET).sce -msg -skip + testshl $(SHL5TARGETN) sce/$(SHL5TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL5TARGETN)"!="" @@ -2754,7 +2724,7 @@ LINKFLAGSRUNPATH_$(SHL6RPATH)*=/ERROR:/Bad_SHL6RPATH_value SHL6LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL6RPATH)) .IF "$(SHL6USE_EXPORTS)"=="" -SHL6DEF*=$(MISC)$/$(SHL6TARGET).def +SHL6DEF*=$(MISC)/$(SHL6TARGET).def .ENDIF # "$(SHL6USE_EXPORTS)"=="" EXTRALIBPATHS6=$(EXTRALIBPATHS) @@ -2769,20 +2739,22 @@ EXTRALIBPATHS6+=-L$(SOLAR_STLLIBPATH) #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(L10N_framework)"=="" .IF "$(VERSIONOBJ)"!="" SHL6VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL6VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL6VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL6VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL6VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@ .INIT : $(SHL6VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" +.ENDIF .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" @@ -2790,13 +2762,13 @@ $(MISC)$/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL6VE SHL6IMPLIB=i$(TARGET)_t6 .ENDIF # "$(SHL6IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_6IMPLIB=-implib:$(LB)$/$(SHL6IMPLIB).lib +USE_6IMPLIB=-implib:$(LB)/$(SHL6IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL6IMPLIBN=$(LB)$/$(SHL6IMPLIB).lib +SHL6IMPLIBN=$(LB)/$(SHL6IMPLIB).lib ALLTAR : $(SHL6IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_6IMPLIB_DEPS=$(LB)$/$(SHL6IMPLIB).lib +USE_6IMPLIB_DEPS=$(LB)/$(SHL6IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL6DEF=$(SHL6DEF) @@ -2806,7 +2778,7 @@ SHL6DEPN+:=$(SHL6DEPNU) .IF "$(SHL6VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap +USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap .ENDIF # "$(SHL6VERSIONMAP)"=="" .IF "$(USE_SHL6VERSIONMAP)"!="" @@ -2814,7 +2786,7 @@ USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap .IF "$(SHL6FILTERFILE)"!="" .IF "$(SHL6VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap +USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap $(USE_SHL6VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -2841,10 +2813,10 @@ $(USE_SHL6VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL6OBJS)!"="" @$(TYPE) /dev/null $(SHL6LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL6INTERFACE) -f $(SHL6FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL6INTERFACE) -f $(SHL6FILTERFILE) -m $@ .ELSE # "$(SHL6FILTERFILE)"!="" -USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6TARGET).vmap +USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap $(USE_SHL6VERSIONMAP) : @echo ----------------------------- @echo SHL6FILTERFILE not set! @@ -2857,7 +2829,7 @@ $(USE_SHL6VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL6VERSIONMAP)"!="" -USE_SHL6VERSIONMAP=$(MISC)$/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e) +USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP) .ENDIF @@ -2877,7 +2849,7 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL6VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -2887,15 +2859,15 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL6OBJS)"!="" - -echo $(foreach,i,$(SHL6OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL6OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL6LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -2919,15 +2891,15 @@ SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\" .IF "$(SHL6RES)"!="" SHL6ALLRES+=$(SHL6RES) -SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res -SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o +SHL6LINKRES*=$(MISC)/$(SHL6TARGET).res +SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o .ENDIF # "$(SHL6RES)"!="" .IF "$(SHL6DEFAULTRES)$(use_shl_versions)"!="" -SHL6DEFAULTRES*=$(MISC)$/$(SHL6TARGET)_def.res +SHL6DEFAULTRES*=$(MISC)/$(SHL6TARGET)_def.res SHL6ALLRES+=$(SHL6DEFAULTRES) -SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res -SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o +SHL6LINKRES*=$(MISC)/$(SHL6TARGET).res +SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o .ENDIF # "$(SHL6DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL6TARGETN)"!="" @@ -2935,13 +2907,13 @@ SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL6LIBS)"!="" -$(MISC)$/$(SHL6TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL6TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL6LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL6TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL6TARGETN:b)_linkinc.ls $(SHL6TARGETN) : $(LINKINCTARGETS) .ELSE @@ -2949,17 +2921,17 @@ $(SHL6TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL6LIBS)"!="" -SHL6LINKLIST=$(MISC)$/$(SHL6TARGET)_link.lst +SHL6LINKLIST=$(MISC)/$(SHL6TARGET)_link.lst SHL6LINKLISTPARAM=@$(SHL6LINKLIST) $(SHL6LINKLIST) : $(SHL6LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL6LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL6USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -2970,7 +2942,7 @@ SHL6TARGET8=$(shell @fix_shl $(SHL6TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL6STDLIBS:^"$(LB)$/") +_SHL6IMP_ORD = $(SHL6STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL6STDLIBS:^"$(LB)/") SHL6IMP_ORD = $(foreach,i,$(_SHL6IMP_ORD) $(shell @-ls $i)) .ELSE SHL6IMP_ORD = @@ -2991,54 +2963,50 @@ $(SHL6TARGETN) : \ @echo Making: $(SHL6TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL6DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL6DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc .IF "$(SHL6ICON)" != "" - @echo 1 ICON $(SHL6ICON) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc + @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 + @echo $(EMQ)#include $(EMQ)"$(SHL6ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc .ELSE # "$(SHL6ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL6DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL6DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF # "$(SHL6ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL6TARGET)$(DLLPOST) >> $(MISC)/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)/$(SHL6DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF # "$(SHL6DEFAULTRES)"!="" .IF "$(SHL6ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL6ALLRES:s/res /res+/) $(SHL6LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES) .IF "$(COM)"=="GCC" windres $(SHL6LINKRES) $(SHL6LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL6ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL6DEF) \ --dllname $(SHL6TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_6.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_6.cmd + @noop $(assign ALL6OBJLIST:=$(STDOBJ) $(SHL6OBJS) $(SHL6LINKRESO) $(shell $(TYPE) /dev/null $(SHL6LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB6NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_6.cmd -.ELSE # "$(DEFLIB6NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ - $(STDOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \ - `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_6.cmd + @noop $(assign DEF6OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF6OBJLIST) $(assign ALL6OBJLIST:=$(ALL6OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB6NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL6OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_6.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \ - `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL6STDLIBS) -Wl,--end-group \ - $(SHL6STDSHL) $(STDSHL6) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_6.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_6.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd + $(SHL6STDSHL) $(STDSHL6) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_6.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_6.cmd + @+source $(MISC)/$(TARGET).$(@:b)_6.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL6USE_EXPORTS)"!="name" @@ -3048,7 +3016,7 @@ $(SHL6TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL6STACK) $(SHL6BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL6DEF) \ $(USE_6IMPLIB) \ $(STDOBJ) \ @@ -3062,7 +3030,7 @@ $(SHL6TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3073,8 +3041,8 @@ $(SHL6TARGETN) : \ $(SHL6LINKER) @$(mktmp $(SHL6LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL6BASEX) \ $(SHL6STACK) -out:$(SHL6TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL6IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL6IMPLIB).exp \ $(STDOBJ) \ $(SHL6OBJS) $(SHL6VERSIONOBJ) \ $(SHL6LIBS) \ @@ -3086,7 +3054,7 @@ $(SHL6TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3098,7 +3066,7 @@ $(SHL6TARGETN) : \ $(SHL6LINKER) @$(mktmp $(SHL6LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL6BASEX) \ $(SHL6STACK) -out:$(SHL6TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_6IMPLIB) \ $(STDOBJ) \ $(SHL6OBJS) $(SHL6VERSIONOBJ)) \ @@ -3109,7 +3077,7 @@ $(SHL6TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3118,25 +3086,25 @@ $(SHL6TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL6USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL6TARGET).lnk - -$(RM) $(MISC)$/$(SHL6TARGET).lst + -$(RM) del $(MISC)/$(SHL6TARGET).lnk + -$(RM) $(MISC)/$(SHL6TARGET).lst $(TYPE) $(mktmp \ $(SHL6LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL6BASEX) \ $(SHL6STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL6IMPLIB).exp \ + $(LB)/$(SHL6IMPLIB).exp \ $(STDOBJ) \ $(SHL6OBJS) \ $(SHL6STDLIBS) \ $(SHL6STDSHL) $(STDSHL6) \ $(SHL6LINKRES) \ - ) >> $(MISC)$/$(SHL6TARGET).lnk - $(TYPE) $(MISC)$/$(SHL6TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL6TARGET).lnk - $(SHL6LINKER) @$(MISC)$/$(SHL6TARGET).lnk + ) >> $(MISC)/$(SHL6TARGET).lnk + $(TYPE) $(MISC)/$(SHL6TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL6TARGET).lnk + $(SHL6LINKER) @$(MISC)/$(SHL6TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3148,45 +3116,45 @@ $(SHL6TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd @echo $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ $(SHL6VERSIONOBJ) \ - `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_6.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_6.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_6.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_6.cmd + @cat $(MISC)/$(TARGET).$(@:b)_6.cmd + @+source $(MISC)/$(TARGET).$(@:b)_6.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL6RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL6NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN) .ENDIF # "$(SHL6NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd - @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd + @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ $(SHL6VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_6.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd + `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd + @cat $(MISC)/$(TARGET).$(@:b)_6.cmd + @+source $(MISC)/$(TARGET).$(@:b)_6.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL6NOCHECK)"=="" -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) .ENDIF # "$(SHL6NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL6TARGETN:b) + $(RM) $(LB)/$(SHL6TARGETN:b) cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -3195,27 +3163,23 @@ $(SHL6TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL6DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL6DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL6ICON)" != "" - @-+echo 1 ICON $(SHL6ICON) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc + @-+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 + @-+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 + @-+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) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc .ENDIF # "$(SHL6DEFAULTRES)"!="" .IF "$(SHL6ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL6ALLRES:s/res /res+/) $(SHL6LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL6ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -3224,7 +3188,7 @@ $(SHL6TARGETN) : \ $(SHL6DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL6OBJS) $(SHL6VERSIONOBJ) \ $(SHL6LIBS) \ $(SHL6STDLIBS:^"-l") \ @@ -3239,7 +3203,7 @@ $(SHL6TARGETN) : \ $(SHL6DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL6OBJS) $(SHL6VERSIONOBJ) \ $(SHL6LIBS) \ $(SHL6STDLIBS:^"-l") \ @@ -3263,7 +3227,7 @@ $(SHL6TARGETN) : \ ALLTAR : runtest_$(SHL6TARGET) runtest_$(SHL6TARGET) : $(SHL6TARGETN) - testshl $(SHL6TARGETN) sce$/$(SHL6TARGET).sce -msg -skip + testshl $(SHL6TARGETN) sce/$(SHL6TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL6TARGETN)"!="" @@ -3299,7 +3263,7 @@ LINKFLAGSRUNPATH_$(SHL7RPATH)*=/ERROR:/Bad_SHL7RPATH_value SHL7LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL7RPATH)) .IF "$(SHL7USE_EXPORTS)"=="" -SHL7DEF*=$(MISC)$/$(SHL7TARGET).def +SHL7DEF*=$(MISC)/$(SHL7TARGET).def .ENDIF # "$(SHL7USE_EXPORTS)"=="" EXTRALIBPATHS7=$(EXTRALIBPATHS) @@ -3314,20 +3278,22 @@ EXTRALIBPATHS7+=-L$(SOLAR_STLLIBPATH) #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(L10N_framework)"=="" .IF "$(VERSIONOBJ)"!="" SHL7VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL7VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL7VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL7VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL7VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@ .INIT : $(SHL7VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" +.ENDIF .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" @@ -3335,13 +3301,13 @@ $(MISC)$/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL7VE SHL7IMPLIB=i$(TARGET)_t7 .ENDIF # "$(SHL7IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_7IMPLIB=-implib:$(LB)$/$(SHL7IMPLIB).lib +USE_7IMPLIB=-implib:$(LB)/$(SHL7IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL7IMPLIBN=$(LB)$/$(SHL7IMPLIB).lib +SHL7IMPLIBN=$(LB)/$(SHL7IMPLIB).lib ALLTAR : $(SHL7IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_7IMPLIB_DEPS=$(LB)$/$(SHL7IMPLIB).lib +USE_7IMPLIB_DEPS=$(LB)/$(SHL7IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL7DEF=$(SHL7DEF) @@ -3351,7 +3317,7 @@ SHL7DEPN+:=$(SHL7DEPNU) .IF "$(SHL7VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap +USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap .ENDIF # "$(SHL7VERSIONMAP)"=="" .IF "$(USE_SHL7VERSIONMAP)"!="" @@ -3359,7 +3325,7 @@ USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap .IF "$(SHL7FILTERFILE)"!="" .IF "$(SHL7VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap +USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap $(USE_SHL7VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -3386,10 +3352,10 @@ $(USE_SHL7VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL7OBJS)!"="" @$(TYPE) /dev/null $(SHL7LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL7INTERFACE) -f $(SHL7FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL7INTERFACE) -f $(SHL7FILTERFILE) -m $@ .ELSE # "$(SHL7FILTERFILE)"!="" -USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7TARGET).vmap +USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap $(USE_SHL7VERSIONMAP) : @echo ----------------------------- @echo SHL7FILTERFILE not set! @@ -3402,7 +3368,7 @@ $(USE_SHL7VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL7VERSIONMAP)"!="" -USE_SHL7VERSIONMAP=$(MISC)$/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e) +USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP) .ENDIF @@ -3422,7 +3388,7 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL7VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -3432,15 +3398,15 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL7OBJS)"!="" - -echo $(foreach,i,$(SHL7OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL7OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL7LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -3464,15 +3430,15 @@ SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\" .IF "$(SHL7RES)"!="" SHL7ALLRES+=$(SHL7RES) -SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res -SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o +SHL7LINKRES*=$(MISC)/$(SHL7TARGET).res +SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o .ENDIF # "$(SHL7RES)"!="" .IF "$(SHL7DEFAULTRES)$(use_shl_versions)"!="" -SHL7DEFAULTRES*=$(MISC)$/$(SHL7TARGET)_def.res +SHL7DEFAULTRES*=$(MISC)/$(SHL7TARGET)_def.res SHL7ALLRES+=$(SHL7DEFAULTRES) -SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res -SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o +SHL7LINKRES*=$(MISC)/$(SHL7TARGET).res +SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o .ENDIF # "$(SHL7DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL7TARGETN)"!="" @@ -3480,13 +3446,13 @@ SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL7LIBS)"!="" -$(MISC)$/$(SHL7TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL7TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL7LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL7TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL7TARGETN:b)_linkinc.ls $(SHL7TARGETN) : $(LINKINCTARGETS) .ELSE @@ -3494,17 +3460,17 @@ $(SHL7TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL7LIBS)"!="" -SHL7LINKLIST=$(MISC)$/$(SHL7TARGET)_link.lst +SHL7LINKLIST=$(MISC)/$(SHL7TARGET)_link.lst SHL7LINKLISTPARAM=@$(SHL7LINKLIST) $(SHL7LINKLIST) : $(SHL7LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL7LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL7USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -3515,7 +3481,7 @@ SHL7TARGET8=$(shell @fix_shl $(SHL7TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL7STDLIBS:^"$(LB)$/") +_SHL7IMP_ORD = $(SHL7STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL7STDLIBS:^"$(LB)/") SHL7IMP_ORD = $(foreach,i,$(_SHL7IMP_ORD) $(shell @-ls $i)) .ELSE SHL7IMP_ORD = @@ -3536,54 +3502,50 @@ $(SHL7TARGETN) : \ @echo Making: $(SHL7TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL7DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL7DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc .IF "$(SHL7ICON)" != "" - @echo 1 ICON $(SHL7ICON) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc + @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 + @echo $(EMQ)#include $(EMQ)"$(SHL7ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc .ELSE # "$(SHL7ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL7DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL7DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF # "$(SHL7ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL7TARGET)$(DLLPOST) >> $(MISC)/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)/$(SHL7DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF # "$(SHL7DEFAULTRES)"!="" .IF "$(SHL7ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL7ALLRES:s/res /res+/) $(SHL7LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES) .IF "$(COM)"=="GCC" windres $(SHL7LINKRES) $(SHL7LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL7ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL7DEF) \ --dllname $(SHL7TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_7.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_7.cmd + @noop $(assign ALL7OBJLIST:=$(STDOBJ) $(SHL7OBJS) $(SHL7LINKRESO) $(shell $(TYPE) /dev/null $(SHL7LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB7NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_7.cmd -.ELSE # "$(DEFLIB7NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ - $(STDOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \ - `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_7.cmd + @noop $(assign DEF7OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF7OBJLIST) $(assign ALL7OBJLIST:=$(ALL7OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB7NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL7OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_7.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \ - `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL7STDLIBS) -Wl,--end-group \ - $(SHL7STDSHL) $(STDSHL7) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_7.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_7.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd + $(SHL7STDSHL) $(STDSHL7) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_7.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_7.cmd + @+source $(MISC)/$(TARGET).$(@:b)_7.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL7USE_EXPORTS)"!="name" @@ -3593,7 +3555,7 @@ $(SHL7TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL7STACK) $(SHL7BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL7DEF) \ $(USE_7IMPLIB) \ $(STDOBJ) \ @@ -3607,7 +3569,7 @@ $(SHL7TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3618,8 +3580,8 @@ $(SHL7TARGETN) : \ $(SHL7LINKER) @$(mktmp $(SHL7LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL7BASEX) \ $(SHL7STACK) -out:$(SHL7TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL7IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL7IMPLIB).exp \ $(STDOBJ) \ $(SHL7OBJS) $(SHL7VERSIONOBJ) \ $(SHL7LIBS) \ @@ -3631,7 +3593,7 @@ $(SHL7TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3643,7 +3605,7 @@ $(SHL7TARGETN) : \ $(SHL7LINKER) @$(mktmp $(SHL7LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL7BASEX) \ $(SHL7STACK) -out:$(SHL7TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_7IMPLIB) \ $(STDOBJ) \ $(SHL7OBJS) $(SHL7VERSIONOBJ)) \ @@ -3654,7 +3616,7 @@ $(SHL7TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3663,25 +3625,25 @@ $(SHL7TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL7USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL7TARGET).lnk - -$(RM) $(MISC)$/$(SHL7TARGET).lst + -$(RM) del $(MISC)/$(SHL7TARGET).lnk + -$(RM) $(MISC)/$(SHL7TARGET).lst $(TYPE) $(mktmp \ $(SHL7LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL7BASEX) \ $(SHL7STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL7IMPLIB).exp \ + $(LB)/$(SHL7IMPLIB).exp \ $(STDOBJ) \ $(SHL7OBJS) \ $(SHL7STDLIBS) \ $(SHL7STDSHL) $(STDSHL7) \ $(SHL7LINKRES) \ - ) >> $(MISC)$/$(SHL7TARGET).lnk - $(TYPE) $(MISC)$/$(SHL7TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL7TARGET).lnk - $(SHL7LINKER) @$(MISC)$/$(SHL7TARGET).lnk + ) >> $(MISC)/$(SHL7TARGET).lnk + $(TYPE) $(MISC)/$(SHL7TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL7TARGET).lnk + $(SHL7LINKER) @$(MISC)/$(SHL7TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -3693,45 +3655,45 @@ $(SHL7TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd @echo $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ $(SHL7VERSIONOBJ) \ - `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_7.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_7.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_7.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_7.cmd + @cat $(MISC)/$(TARGET).$(@:b)_7.cmd + @+source $(MISC)/$(TARGET).$(@:b)_7.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL7RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL7NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN) .ENDIF # "$(SHL7NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd - @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd + @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ $(SHL7VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_7.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd + `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd + @cat $(MISC)/$(TARGET).$(@:b)_7.cmd + @+source $(MISC)/$(TARGET).$(@:b)_7.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL7NOCHECK)"=="" -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) .ENDIF # "$(SHL7NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL7TARGETN:b) + $(RM) $(LB)/$(SHL7TARGETN:b) cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -3740,27 +3702,23 @@ $(SHL7TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL7DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL7DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL7ICON)" != "" - @-+echo 1 ICON $(SHL7ICON) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc + @-+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 + @-+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 + @-+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) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc .ENDIF # "$(SHL7DEFAULTRES)"!="" .IF "$(SHL7ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL7ALLRES:s/res /res+/) $(SHL7LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL7ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -3769,7 +3727,7 @@ $(SHL7TARGETN) : \ $(SHL7DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL7OBJS) $(SHL7VERSIONOBJ) \ $(SHL7LIBS) \ $(SHL7STDLIBS:^"-l") \ @@ -3784,7 +3742,7 @@ $(SHL7TARGETN) : \ $(SHL7DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL7OBJS) $(SHL7VERSIONOBJ) \ $(SHL7LIBS) \ $(SHL7STDLIBS:^"-l") \ @@ -3808,7 +3766,7 @@ $(SHL7TARGETN) : \ ALLTAR : runtest_$(SHL7TARGET) runtest_$(SHL7TARGET) : $(SHL7TARGETN) - testshl $(SHL7TARGETN) sce$/$(SHL7TARGET).sce -msg -skip + testshl $(SHL7TARGETN) sce/$(SHL7TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL7TARGETN)"!="" @@ -3844,7 +3802,7 @@ LINKFLAGSRUNPATH_$(SHL8RPATH)*=/ERROR:/Bad_SHL8RPATH_value SHL8LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL8RPATH)) .IF "$(SHL8USE_EXPORTS)"=="" -SHL8DEF*=$(MISC)$/$(SHL8TARGET).def +SHL8DEF*=$(MISC)/$(SHL8TARGET).def .ENDIF # "$(SHL8USE_EXPORTS)"=="" EXTRALIBPATHS8=$(EXTRALIBPATHS) @@ -3859,20 +3817,22 @@ EXTRALIBPATHS8+=-L$(SOLAR_STLLIBPATH) #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(L10N_framework)"=="" .IF "$(VERSIONOBJ)"!="" SHL8VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL8VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL8VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL8VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL8VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@ .INIT : $(SHL8VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" +.ENDIF .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" @@ -3880,13 +3840,13 @@ $(MISC)$/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL8VE SHL8IMPLIB=i$(TARGET)_t8 .ENDIF # "$(SHL8IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_8IMPLIB=-implib:$(LB)$/$(SHL8IMPLIB).lib +USE_8IMPLIB=-implib:$(LB)/$(SHL8IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL8IMPLIBN=$(LB)$/$(SHL8IMPLIB).lib +SHL8IMPLIBN=$(LB)/$(SHL8IMPLIB).lib ALLTAR : $(SHL8IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_8IMPLIB_DEPS=$(LB)$/$(SHL8IMPLIB).lib +USE_8IMPLIB_DEPS=$(LB)/$(SHL8IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL8DEF=$(SHL8DEF) @@ -3896,7 +3856,7 @@ SHL8DEPN+:=$(SHL8DEPNU) .IF "$(SHL8VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap +USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap .ENDIF # "$(SHL8VERSIONMAP)"=="" .IF "$(USE_SHL8VERSIONMAP)"!="" @@ -3904,7 +3864,7 @@ USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap .IF "$(SHL8FILTERFILE)"!="" .IF "$(SHL8VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap +USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap $(USE_SHL8VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -3931,10 +3891,10 @@ $(USE_SHL8VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL8OBJS)!"="" @$(TYPE) /dev/null $(SHL8LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL8INTERFACE) -f $(SHL8FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL8INTERFACE) -f $(SHL8FILTERFILE) -m $@ .ELSE # "$(SHL8FILTERFILE)"!="" -USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8TARGET).vmap +USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap $(USE_SHL8VERSIONMAP) : @echo ----------------------------- @echo SHL8FILTERFILE not set! @@ -3947,7 +3907,7 @@ $(USE_SHL8VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL8VERSIONMAP)"!="" -USE_SHL8VERSIONMAP=$(MISC)$/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e) +USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP) .ENDIF @@ -3967,7 +3927,7 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL8VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -3977,15 +3937,15 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL8OBJS)"!="" - -echo $(foreach,i,$(SHL8OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL8OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL8LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -4009,15 +3969,15 @@ SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\" .IF "$(SHL8RES)"!="" SHL8ALLRES+=$(SHL8RES) -SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res -SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o +SHL8LINKRES*=$(MISC)/$(SHL8TARGET).res +SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o .ENDIF # "$(SHL8RES)"!="" .IF "$(SHL8DEFAULTRES)$(use_shl_versions)"!="" -SHL8DEFAULTRES*=$(MISC)$/$(SHL8TARGET)_def.res +SHL8DEFAULTRES*=$(MISC)/$(SHL8TARGET)_def.res SHL8ALLRES+=$(SHL8DEFAULTRES) -SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res -SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o +SHL8LINKRES*=$(MISC)/$(SHL8TARGET).res +SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o .ENDIF # "$(SHL8DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL8TARGETN)"!="" @@ -4025,13 +3985,13 @@ SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL8LIBS)"!="" -$(MISC)$/$(SHL8TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL8TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL8LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL8TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL8TARGETN:b)_linkinc.ls $(SHL8TARGETN) : $(LINKINCTARGETS) .ELSE @@ -4039,17 +3999,17 @@ $(SHL8TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL8LIBS)"!="" -SHL8LINKLIST=$(MISC)$/$(SHL8TARGET)_link.lst +SHL8LINKLIST=$(MISC)/$(SHL8TARGET)_link.lst SHL8LINKLISTPARAM=@$(SHL8LINKLIST) $(SHL8LINKLIST) : $(SHL8LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL8LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL8USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -4060,7 +4020,7 @@ SHL8TARGET8=$(shell @fix_shl $(SHL8TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL8STDLIBS:^"$(LB)$/") +_SHL8IMP_ORD = $(SHL8STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL8STDLIBS:^"$(LB)/") SHL8IMP_ORD = $(foreach,i,$(_SHL8IMP_ORD) $(shell @-ls $i)) .ELSE SHL8IMP_ORD = @@ -4081,54 +4041,50 @@ $(SHL8TARGETN) : \ @echo Making: $(SHL8TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL8DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL8DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc .IF "$(SHL8ICON)" != "" - @echo 1 ICON $(SHL8ICON) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc + @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 + @echo $(EMQ)#include $(EMQ)"$(SHL8ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc .ELSE # "$(SHL8ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL8DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL8DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF # "$(SHL8ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL8TARGET)$(DLLPOST) >> $(MISC)/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)/$(SHL8DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF # "$(SHL8DEFAULTRES)"!="" .IF "$(SHL8ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL8ALLRES:s/res /res+/) $(SHL8LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES) .IF "$(COM)"=="GCC" windres $(SHL8LINKRES) $(SHL8LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL8ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL8DEF) \ --dllname $(SHL8TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_8.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_8.cmd + @noop $(assign ALL8OBJLIST:=$(STDOBJ) $(SHL8OBJS) $(SHL8LINKRESO) $(shell $(TYPE) /dev/null $(SHL8LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB8NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_8.cmd -.ELSE # "$(DEFLIB8NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ - $(STDOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \ - `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_8.cmd + @noop $(assign DEF8OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF8OBJLIST) $(assign ALL8OBJLIST:=$(ALL8OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB8NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL8OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_8.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \ - `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL8STDLIBS) -Wl,--end-group \ - $(SHL8STDSHL) $(STDSHL8) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_8.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_8.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd + $(SHL8STDSHL) $(STDSHL8) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_8.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_8.cmd + @+source $(MISC)/$(TARGET).$(@:b)_8.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL8USE_EXPORTS)"!="name" @@ -4138,7 +4094,7 @@ $(SHL8TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL8STACK) $(SHL8BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL8DEF) \ $(USE_8IMPLIB) \ $(STDOBJ) \ @@ -4152,7 +4108,7 @@ $(SHL8TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4163,8 +4119,8 @@ $(SHL8TARGETN) : \ $(SHL8LINKER) @$(mktmp $(SHL8LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL8BASEX) \ $(SHL8STACK) -out:$(SHL8TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL8IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL8IMPLIB).exp \ $(STDOBJ) \ $(SHL8OBJS) $(SHL8VERSIONOBJ) \ $(SHL8LIBS) \ @@ -4176,7 +4132,7 @@ $(SHL8TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4188,7 +4144,7 @@ $(SHL8TARGETN) : \ $(SHL8LINKER) @$(mktmp $(SHL8LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL8BASEX) \ $(SHL8STACK) -out:$(SHL8TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_8IMPLIB) \ $(STDOBJ) \ $(SHL8OBJS) $(SHL8VERSIONOBJ)) \ @@ -4199,7 +4155,7 @@ $(SHL8TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4208,25 +4164,25 @@ $(SHL8TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL8USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL8TARGET).lnk - -$(RM) $(MISC)$/$(SHL8TARGET).lst + -$(RM) del $(MISC)/$(SHL8TARGET).lnk + -$(RM) $(MISC)/$(SHL8TARGET).lst $(TYPE) $(mktmp \ $(SHL8LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL8BASEX) \ $(SHL8STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL8IMPLIB).exp \ + $(LB)/$(SHL8IMPLIB).exp \ $(STDOBJ) \ $(SHL8OBJS) \ $(SHL8STDLIBS) \ $(SHL8STDSHL) $(STDSHL8) \ $(SHL8LINKRES) \ - ) >> $(MISC)$/$(SHL8TARGET).lnk - $(TYPE) $(MISC)$/$(SHL8TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL8TARGET).lnk - $(SHL8LINKER) @$(MISC)$/$(SHL8TARGET).lnk + ) >> $(MISC)/$(SHL8TARGET).lnk + $(TYPE) $(MISC)/$(SHL8TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL8TARGET).lnk + $(SHL8LINKER) @$(MISC)/$(SHL8TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4238,45 +4194,45 @@ $(SHL8TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd @echo $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ $(SHL8VERSIONOBJ) \ - `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_8.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_8.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_8.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_8.cmd + @cat $(MISC)/$(TARGET).$(@:b)_8.cmd + @+source $(MISC)/$(TARGET).$(@:b)_8.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL8RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL8NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN) .ENDIF # "$(SHL8NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd - @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd + @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ $(SHL8VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_8.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd + `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd + @cat $(MISC)/$(TARGET).$(@:b)_8.cmd + @+source $(MISC)/$(TARGET).$(@:b)_8.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL8NOCHECK)"=="" -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) .ENDIF # "$(SHL8NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL8TARGETN:b) + $(RM) $(LB)/$(SHL8TARGETN:b) cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -4285,27 +4241,23 @@ $(SHL8TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL8DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL8DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL8ICON)" != "" - @-+echo 1 ICON $(SHL8ICON) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc + @-+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 + @-+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 + @-+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) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc .ENDIF # "$(SHL8DEFAULTRES)"!="" .IF "$(SHL8ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL8ALLRES:s/res /res+/) $(SHL8LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL8ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -4314,7 +4266,7 @@ $(SHL8TARGETN) : \ $(SHL8DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL8OBJS) $(SHL8VERSIONOBJ) \ $(SHL8LIBS) \ $(SHL8STDLIBS:^"-l") \ @@ -4329,7 +4281,7 @@ $(SHL8TARGETN) : \ $(SHL8DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL8OBJS) $(SHL8VERSIONOBJ) \ $(SHL8LIBS) \ $(SHL8STDLIBS:^"-l") \ @@ -4353,7 +4305,7 @@ $(SHL8TARGETN) : \ ALLTAR : runtest_$(SHL8TARGET) runtest_$(SHL8TARGET) : $(SHL8TARGETN) - testshl $(SHL8TARGETN) sce$/$(SHL8TARGET).sce -msg -skip + testshl $(SHL8TARGETN) sce/$(SHL8TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL8TARGETN)"!="" @@ -4389,7 +4341,7 @@ LINKFLAGSRUNPATH_$(SHL9RPATH)*=/ERROR:/Bad_SHL9RPATH_value SHL9LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL9RPATH)) .IF "$(SHL9USE_EXPORTS)"=="" -SHL9DEF*=$(MISC)$/$(SHL9TARGET).def +SHL9DEF*=$(MISC)/$(SHL9TARGET).def .ENDIF # "$(SHL9USE_EXPORTS)"=="" EXTRALIBPATHS9=$(EXTRALIBPATHS) @@ -4404,20 +4356,22 @@ EXTRALIBPATHS9+=-L$(SOLAR_STLLIBPATH) #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(L10N_framework)"=="" .IF "$(VERSIONOBJ)"!="" SHL9VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL9VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL9VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL9VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL9VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@ .INIT : $(SHL9VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" +.ENDIF .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" @@ -4425,13 +4379,13 @@ $(MISC)$/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL9VE SHL9IMPLIB=i$(TARGET)_t9 .ENDIF # "$(SHL9IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_9IMPLIB=-implib:$(LB)$/$(SHL9IMPLIB).lib +USE_9IMPLIB=-implib:$(LB)/$(SHL9IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL9IMPLIBN=$(LB)$/$(SHL9IMPLIB).lib +SHL9IMPLIBN=$(LB)/$(SHL9IMPLIB).lib ALLTAR : $(SHL9IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_9IMPLIB_DEPS=$(LB)$/$(SHL9IMPLIB).lib +USE_9IMPLIB_DEPS=$(LB)/$(SHL9IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL9DEF=$(SHL9DEF) @@ -4441,7 +4395,7 @@ SHL9DEPN+:=$(SHL9DEPNU) .IF "$(SHL9VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap +USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap .ENDIF # "$(SHL9VERSIONMAP)"=="" .IF "$(USE_SHL9VERSIONMAP)"!="" @@ -4449,7 +4403,7 @@ USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap .IF "$(SHL9FILTERFILE)"!="" .IF "$(SHL9VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap +USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap $(USE_SHL9VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -4476,10 +4430,10 @@ $(USE_SHL9VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL9OBJS)!"="" @$(TYPE) /dev/null $(SHL9LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL9INTERFACE) -f $(SHL9FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL9INTERFACE) -f $(SHL9FILTERFILE) -m $@ .ELSE # "$(SHL9FILTERFILE)"!="" -USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9TARGET).vmap +USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap $(USE_SHL9VERSIONMAP) : @echo ----------------------------- @echo SHL9FILTERFILE not set! @@ -4492,7 +4446,7 @@ $(USE_SHL9VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL9VERSIONMAP)"!="" -USE_SHL9VERSIONMAP=$(MISC)$/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e) +USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP) .ENDIF @@ -4512,7 +4466,7 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL9VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -4522,15 +4476,15 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL9OBJS)"!="" - -echo $(foreach,i,$(SHL9OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL9OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL9LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -4554,15 +4508,15 @@ SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\" .IF "$(SHL9RES)"!="" SHL9ALLRES+=$(SHL9RES) -SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res -SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o +SHL9LINKRES*=$(MISC)/$(SHL9TARGET).res +SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o .ENDIF # "$(SHL9RES)"!="" .IF "$(SHL9DEFAULTRES)$(use_shl_versions)"!="" -SHL9DEFAULTRES*=$(MISC)$/$(SHL9TARGET)_def.res +SHL9DEFAULTRES*=$(MISC)/$(SHL9TARGET)_def.res SHL9ALLRES+=$(SHL9DEFAULTRES) -SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res -SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o +SHL9LINKRES*=$(MISC)/$(SHL9TARGET).res +SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o .ENDIF # "$(SHL9DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL9TARGETN)"!="" @@ -4570,13 +4524,13 @@ SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL9LIBS)"!="" -$(MISC)$/$(SHL9TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL9TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL9LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL9TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL9TARGETN:b)_linkinc.ls $(SHL9TARGETN) : $(LINKINCTARGETS) .ELSE @@ -4584,17 +4538,17 @@ $(SHL9TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL9LIBS)"!="" -SHL9LINKLIST=$(MISC)$/$(SHL9TARGET)_link.lst +SHL9LINKLIST=$(MISC)/$(SHL9TARGET)_link.lst SHL9LINKLISTPARAM=@$(SHL9LINKLIST) $(SHL9LINKLIST) : $(SHL9LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL9LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL9USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -4605,7 +4559,7 @@ SHL9TARGET8=$(shell @fix_shl $(SHL9TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL9STDLIBS:^"$(LB)$/") +_SHL9IMP_ORD = $(SHL9STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL9STDLIBS:^"$(LB)/") SHL9IMP_ORD = $(foreach,i,$(_SHL9IMP_ORD) $(shell @-ls $i)) .ELSE SHL9IMP_ORD = @@ -4626,54 +4580,50 @@ $(SHL9TARGETN) : \ @echo Making: $(SHL9TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL9DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL9DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc .IF "$(SHL9ICON)" != "" - @echo 1 ICON $(SHL9ICON) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc + @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 + @echo $(EMQ)#include $(EMQ)"$(SHL9ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc .ELSE # "$(SHL9ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL9DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL9DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF # "$(SHL9ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL9TARGET)$(DLLPOST) >> $(MISC)/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)/$(SHL9DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF # "$(SHL9DEFAULTRES)"!="" .IF "$(SHL9ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL9ALLRES:s/res /res+/) $(SHL9LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES) .IF "$(COM)"=="GCC" windres $(SHL9LINKRES) $(SHL9LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL9ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL9DEF) \ --dllname $(SHL9TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_9.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_9.cmd + @noop $(assign ALL9OBJLIST:=$(STDOBJ) $(SHL9OBJS) $(SHL9LINKRESO) $(shell $(TYPE) /dev/null $(SHL9LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB9NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_9.cmd -.ELSE # "$(DEFLIB9NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ - $(STDOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \ - `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_9.cmd + @noop $(assign DEF9OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF9OBJLIST) $(assign ALL9OBJLIST:=$(ALL9OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB9NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL9OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_9.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \ - `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL9STDLIBS) -Wl,--end-group \ - $(SHL9STDSHL) $(STDSHL9) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_9.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_9.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd + $(SHL9STDSHL) $(STDSHL9) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_9.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_9.cmd + @+source $(MISC)/$(TARGET).$(@:b)_9.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL9USE_EXPORTS)"!="name" @@ -4683,7 +4633,7 @@ $(SHL9TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL9STACK) $(SHL9BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL9DEF) \ $(USE_9IMPLIB) \ $(STDOBJ) \ @@ -4697,7 +4647,7 @@ $(SHL9TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4708,8 +4658,8 @@ $(SHL9TARGETN) : \ $(SHL9LINKER) @$(mktmp $(SHL9LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL9BASEX) \ $(SHL9STACK) -out:$(SHL9TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL9IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL9IMPLIB).exp \ $(STDOBJ) \ $(SHL9OBJS) $(SHL9VERSIONOBJ) \ $(SHL9LIBS) \ @@ -4721,7 +4671,7 @@ $(SHL9TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4733,7 +4683,7 @@ $(SHL9TARGETN) : \ $(SHL9LINKER) @$(mktmp $(SHL9LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL9BASEX) \ $(SHL9STACK) -out:$(SHL9TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_9IMPLIB) \ $(STDOBJ) \ $(SHL9OBJS) $(SHL9VERSIONOBJ)) \ @@ -4744,7 +4694,7 @@ $(SHL9TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4753,25 +4703,25 @@ $(SHL9TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL9USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL9TARGET).lnk - -$(RM) $(MISC)$/$(SHL9TARGET).lst + -$(RM) del $(MISC)/$(SHL9TARGET).lnk + -$(RM) $(MISC)/$(SHL9TARGET).lst $(TYPE) $(mktmp \ $(SHL9LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL9BASEX) \ $(SHL9STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL9IMPLIB).exp \ + $(LB)/$(SHL9IMPLIB).exp \ $(STDOBJ) \ $(SHL9OBJS) \ $(SHL9STDLIBS) \ $(SHL9STDSHL) $(STDSHL9) \ $(SHL9LINKRES) \ - ) >> $(MISC)$/$(SHL9TARGET).lnk - $(TYPE) $(MISC)$/$(SHL9TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL9TARGET).lnk - $(SHL9LINKER) @$(MISC)$/$(SHL9TARGET).lnk + ) >> $(MISC)/$(SHL9TARGET).lnk + $(TYPE) $(MISC)/$(SHL9TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL9TARGET).lnk + $(SHL9LINKER) @$(MISC)/$(SHL9TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -4783,45 +4733,45 @@ $(SHL9TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd @echo $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ $(SHL9VERSIONOBJ) \ - `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_9.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_9.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_9.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_9.cmd + @cat $(MISC)/$(TARGET).$(@:b)_9.cmd + @+source $(MISC)/$(TARGET).$(@:b)_9.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL9RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL9NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN) .ENDIF # "$(SHL9NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd - @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd + @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ $(SHL9VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_9.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd + `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd + @cat $(MISC)/$(TARGET).$(@:b)_9.cmd + @+source $(MISC)/$(TARGET).$(@:b)_9.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL9NOCHECK)"=="" -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) .ENDIF # "$(SHL9NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL9TARGETN:b) + $(RM) $(LB)/$(SHL9TARGETN:b) cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -4830,27 +4780,23 @@ $(SHL9TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL9DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL9DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL9ICON)" != "" - @-+echo 1 ICON $(SHL9ICON) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc + @-+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 + @-+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 + @-+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) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc .ENDIF # "$(SHL9DEFAULTRES)"!="" .IF "$(SHL9ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL9ALLRES:s/res /res+/) $(SHL9LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL9ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -4859,7 +4805,7 @@ $(SHL9TARGETN) : \ $(SHL9DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL9OBJS) $(SHL9VERSIONOBJ) \ $(SHL9LIBS) \ $(SHL9STDLIBS:^"-l") \ @@ -4874,7 +4820,7 @@ $(SHL9TARGETN) : \ $(SHL9DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL9OBJS) $(SHL9VERSIONOBJ) \ $(SHL9LIBS) \ $(SHL9STDLIBS:^"-l") \ @@ -4898,7 +4844,7 @@ $(SHL9TARGETN) : \ ALLTAR : runtest_$(SHL9TARGET) runtest_$(SHL9TARGET) : $(SHL9TARGETN) - testshl $(SHL9TARGETN) sce$/$(SHL9TARGET).sce -msg -skip + testshl $(SHL9TARGETN) sce/$(SHL9TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL9TARGETN)"!="" @@ -4934,7 +4880,7 @@ LINKFLAGSRUNPATH_$(SHL10RPATH)*=/ERROR:/Bad_SHL10RPATH_value SHL10LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL10RPATH)) .IF "$(SHL10USE_EXPORTS)"=="" -SHL10DEF*=$(MISC)$/$(SHL10TARGET).def +SHL10DEF*=$(MISC)/$(SHL10TARGET).def .ENDIF # "$(SHL10USE_EXPORTS)"=="" EXTRALIBPATHS10=$(EXTRALIBPATHS) @@ -4949,20 +4895,22 @@ EXTRALIBPATHS10+=-L$(SOLAR_STLLIBPATH) #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(L10N_framework)"=="" .IF "$(VERSIONOBJ)"!="" SHL10VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL10VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL10VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL10VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL10VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@ .INIT : $(SHL10VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" +.ENDIF .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" @@ -4970,13 +4918,13 @@ $(MISC)$/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL10 SHL10IMPLIB=i$(TARGET)_t10 .ENDIF # "$(SHL10IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_10IMPLIB=-implib:$(LB)$/$(SHL10IMPLIB).lib +USE_10IMPLIB=-implib:$(LB)/$(SHL10IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL10IMPLIBN=$(LB)$/$(SHL10IMPLIB).lib +SHL10IMPLIBN=$(LB)/$(SHL10IMPLIB).lib ALLTAR : $(SHL10IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_10IMPLIB_DEPS=$(LB)$/$(SHL10IMPLIB).lib +USE_10IMPLIB_DEPS=$(LB)/$(SHL10IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL10DEF=$(SHL10DEF) @@ -4986,7 +4934,7 @@ SHL10DEPN+:=$(SHL10DEPNU) .IF "$(SHL10VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap +USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap .ENDIF # "$(SHL10VERSIONMAP)"=="" .IF "$(USE_SHL10VERSIONMAP)"!="" @@ -4994,7 +4942,7 @@ USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap .IF "$(SHL10FILTERFILE)"!="" .IF "$(SHL10VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap +USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap $(USE_SHL10VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -5021,10 +4969,10 @@ $(USE_SHL10VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL10OBJS)!"="" @$(TYPE) /dev/null $(SHL10LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL10INTERFACE) -f $(SHL10FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL10INTERFACE) -f $(SHL10FILTERFILE) -m $@ .ELSE # "$(SHL10FILTERFILE)"!="" -USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10TARGET).vmap +USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap $(USE_SHL10VERSIONMAP) : @echo ----------------------------- @echo SHL10FILTERFILE not set! @@ -5037,7 +4985,7 @@ $(USE_SHL10VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL10VERSIONMAP)"!="" -USE_SHL10VERSIONMAP=$(MISC)$/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e) +USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP) .ENDIF @@ -5057,7 +5005,7 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL10VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -5067,15 +5015,15 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL10OBJS)"!="" - -echo $(foreach,i,$(SHL10OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL10OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL10LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -5099,15 +5047,15 @@ SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\" .IF "$(SHL10RES)"!="" SHL10ALLRES+=$(SHL10RES) -SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res -SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o +SHL10LINKRES*=$(MISC)/$(SHL10TARGET).res +SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o .ENDIF # "$(SHL10RES)"!="" .IF "$(SHL10DEFAULTRES)$(use_shl_versions)"!="" -SHL10DEFAULTRES*=$(MISC)$/$(SHL10TARGET)_def.res +SHL10DEFAULTRES*=$(MISC)/$(SHL10TARGET)_def.res SHL10ALLRES+=$(SHL10DEFAULTRES) -SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res -SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o +SHL10LINKRES*=$(MISC)/$(SHL10TARGET).res +SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o .ENDIF # "$(SHL10DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL10TARGETN)"!="" @@ -5115,13 +5063,13 @@ SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL10LIBS)"!="" -$(MISC)$/$(SHL10TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL10TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL10LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL10TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL10TARGETN:b)_linkinc.ls $(SHL10TARGETN) : $(LINKINCTARGETS) .ELSE @@ -5129,17 +5077,17 @@ $(SHL10TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL10LIBS)"!="" -SHL10LINKLIST=$(MISC)$/$(SHL10TARGET)_link.lst +SHL10LINKLIST=$(MISC)/$(SHL10TARGET)_link.lst SHL10LINKLISTPARAM=@$(SHL10LINKLIST) $(SHL10LINKLIST) : $(SHL10LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL10LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL10USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -5150,7 +5098,7 @@ SHL10TARGET8=$(shell @fix_shl $(SHL10TARGET)) .ENDIF .IF "$(GUI)" == "OS2" -_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)$/$(INPATH)$/lib$/") $(SHL10STDLIBS:^"$(LB)$/") +_SHL10IMP_ORD = $(SHL10STDLIBS:^"$(SOLARVERSION)/$(INPATH)/lib/") $(SHL10STDLIBS:^"$(LB)/") SHL10IMP_ORD = $(foreach,i,$(_SHL10IMP_ORD) $(shell @-ls $i)) .ELSE SHL10IMP_ORD = @@ -5171,54 +5119,50 @@ $(SHL10TARGETN) : \ @echo Making: $(SHL10TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL10DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL10DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc .IF "$(SHL10ICON)" != "" - @echo 1 ICON $(SHL10ICON) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc + @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 + @echo $(EMQ)#include $(EMQ)"$(SHL10ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc .ELSE # "$(SHL10ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL10DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL10DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF # "$(SHL10ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL10TARGET)$(DLLPOST) >> $(MISC)/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)/$(SHL10DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF # "$(SHL10DEFAULTRES)"!="" .IF "$(SHL10ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL10ALLRES:s/res /res+/) $(SHL10LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES) .IF "$(COM)"=="GCC" windres $(SHL10LINKRES) $(SHL10LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL10ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL10DEF) \ --dllname $(SHL10TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_10.cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_10.cmd + @noop $(assign ALL10OBJLIST:=$(STDOBJ) $(SHL10OBJS) $(SHL10LINKRESO) $(shell $(TYPE) /dev/null $(SHL10LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB10NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_10.cmd -.ELSE # "$(DEFLIB10NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ - $(STDOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \ - `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_10.cmd + @noop $(assign DEF10OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF10OBJLIST) $(assign ALL10OBJLIST:=$(ALL10OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB10NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL10OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_10.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \ - `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL10STDLIBS) -Wl,--end-group \ - $(SHL10STDSHL) $(STDSHL10) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_10.cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_10.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd + $(SHL10STDSHL) $(STDSHL10) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_10.cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_10.cmd + @+source $(MISC)/$(TARGET).$(@:b)_10.cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL10USE_EXPORTS)"!="name" @@ -5228,7 +5172,7 @@ $(SHL10TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL10STACK) $(SHL10BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL10DEF) \ $(USE_10IMPLIB) \ $(STDOBJ) \ @@ -5242,7 +5186,7 @@ $(SHL10TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -5253,8 +5197,8 @@ $(SHL10TARGETN) : \ $(SHL10LINKER) @$(mktmp $(SHL10LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL10BASEX) \ $(SHL10STACK) -out:$(SHL10TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL10IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL10IMPLIB).exp \ $(STDOBJ) \ $(SHL10OBJS) $(SHL10VERSIONOBJ) \ $(SHL10LIBS) \ @@ -5266,7 +5210,7 @@ $(SHL10TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -5278,7 +5222,7 @@ $(SHL10TARGETN) : \ $(SHL10LINKER) @$(mktmp $(SHL10LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL10BASEX) \ $(SHL10STACK) -out:$(SHL10TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_10IMPLIB) \ $(STDOBJ) \ $(SHL10OBJS) $(SHL10VERSIONOBJ)) \ @@ -5289,7 +5233,7 @@ $(SHL10TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -5298,25 +5242,25 @@ $(SHL10TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL10USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL10TARGET).lnk - -$(RM) $(MISC)$/$(SHL10TARGET).lst + -$(RM) del $(MISC)/$(SHL10TARGET).lnk + -$(RM) $(MISC)/$(SHL10TARGET).lst $(TYPE) $(mktmp \ $(SHL10LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL10BASEX) \ $(SHL10STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL10IMPLIB).exp \ + $(LB)/$(SHL10IMPLIB).exp \ $(STDOBJ) \ $(SHL10OBJS) \ $(SHL10STDLIBS) \ $(SHL10STDSHL) $(STDSHL10) \ $(SHL10LINKRES) \ - ) >> $(MISC)$/$(SHL10TARGET).lnk - $(TYPE) $(MISC)$/$(SHL10TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL10TARGET).lnk - $(SHL10LINKER) @$(MISC)$/$(SHL10TARGET).lnk + ) >> $(MISC)/$(SHL10TARGET).lnk + $(TYPE) $(MISC)/$(SHL10TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL10TARGET).lnk + $(SHL10LINKER) @$(MISC)/$(SHL10TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -5328,45 +5272,45 @@ $(SHL10TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd @echo $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ $(SHL10VERSIONOBJ) \ - `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_10.cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_10.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_10.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_10.cmd + @cat $(MISC)/$(TARGET).$(@:b)_10.cmd + @+source $(MISC)/$(TARGET).$(@:b)_10.cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL10RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL10NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN) .ENDIF # "$(SHL10NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd - @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd + @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ $(SHL10VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_10.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd + `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd + @cat $(MISC)/$(TARGET).$(@:b)_10.cmd + @+source $(MISC)/$(TARGET).$(@:b)_10.cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL10NOCHECK)"=="" -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) .ENDIF # "$(SHL10NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL10TARGETN:b) + $(RM) $(LB)/$(SHL10TARGETN:b) cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -5375,27 +5319,23 @@ $(SHL10TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL10DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL10DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL10ICON)" != "" - @-+echo 1 ICON $(SHL10ICON) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc + @-+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 + @-+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 + @-+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) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc .ENDIF # "$(SHL10DEFAULTRES)"!="" .IF "$(SHL10ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL10ALLRES:s/res /res+/) $(SHL10LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL10ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -5404,7 +5344,7 @@ $(SHL10TARGETN) : \ $(SHL10DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL10OBJS) $(SHL10VERSIONOBJ) \ $(SHL10LIBS) \ $(SHL10STDLIBS:^"-l") \ @@ -5419,7 +5359,7 @@ $(SHL10TARGETN) : \ $(SHL10DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL10OBJS) $(SHL10VERSIONOBJ) \ $(SHL10LIBS) \ $(SHL10STDLIBS:^"-l") \ @@ -5443,7 +5383,7 @@ $(SHL10TARGETN) : \ ALLTAR : runtest_$(SHL10TARGET) runtest_$(SHL10TARGET) : $(SHL10TARGETN) - testshl $(SHL10TARGETN) sce$/$(SHL10TARGET).sce -msg -skip + testshl $(SHL10TARGETN) sce/$(SHL10TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL10TARGETN)"!="" diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk index 070a07a90fb0..305bb7f77943 100644 --- a/solenv/inc/_tg_srs.mk +++ b/solenv/inc/_tg_srs.mk @@ -2,30 +2,30 @@ .IF "$(SRS1NAME)"!="" .IF "$(BUILDHIDS)"!="" -HID1FILES=$(foreach,i,$(SRC1FILES:f) $(SRS)$/$(i:s/.src/.hid/)) -HIDSRS1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS1NAME)_srs.hid +HID1FILES=$(foreach,i,$(SRC1FILES:f) $(SRS)/$(i:s/.src/.hid/)) +HIDSRS1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS1NAME)_srs.hid $(HIDSRS1PARTICLE) : $(HID1FILES) @echo ------------------------------ @echo Making: $@ @-$(RM) $@ - $(TYPE) $(mktmp $(subst,$/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(subst,/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDSRS1PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST) +$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) +$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) @echo ------------------------------ @echo Making: $@ - @@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr - $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES) + @@-$(RM) $(MISC)/$(TARGET).$(SRS1NAME).dprr + $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES) .IF "$(WITH_LANG)"!="" -$(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(SRC1FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) @@ -33,11 +33,11 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS1NAME).srs: $(LOCALIZE_ME_DEST) +$(SRS)/$(SRS1NAME).srs: $(LOCALIZE_ME_DEST) -$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)/$(TARGET)/$i) .ELSE # "$(WITH_LANG)"!="" -$(SRS)$/$(SRS1NAME).srs: $(SRC1FILES) +$(SRS)/$(SRS1NAME).srs: $(SRC1FILES) .ENDIF # "$(WITH_LANG)"!="" @echo ------------------------------ @echo Making: $@ @@ -57,30 +57,30 @@ $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES) .IF "$(SRS2NAME)"!="" .IF "$(BUILDHIDS)"!="" -HID2FILES=$(foreach,i,$(SRC2FILES:f) $(SRS)$/$(i:s/.src/.hid/)) -HIDSRS2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS2NAME)_srs.hid +HID2FILES=$(foreach,i,$(SRC2FILES:f) $(SRS)/$(i:s/.src/.hid/)) +HIDSRS2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS2NAME)_srs.hid $(HIDSRS2PARTICLE) : $(HID2FILES) @echo ------------------------------ @echo Making: $@ @-$(RM) $@ - $(TYPE) $(mktmp $(subst,$/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(subst,/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDSRS2PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST) +$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) +$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) @echo ------------------------------ @echo Making: $@ - @@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr - $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES) + @@-$(RM) $(MISC)/$(TARGET).$(SRS2NAME).dprr + $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES) .IF "$(WITH_LANG)"!="" -$(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(SRC2FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) @@ -88,11 +88,11 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST) +$(SRS)/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST) -$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)/$(TARGET)/$i) .ELSE # "$(WITH_LANG)"!="" -$(SRS)$/$(SRS2NAME).srs: $(SRC2FILES) +$(SRS)/$(SRS2NAME).srs: $(SRC2FILES) .ENDIF # "$(WITH_LANG)"!="" @echo ------------------------------ @echo Making: $@ @@ -112,30 +112,30 @@ $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES) .IF "$(SRS3NAME)"!="" .IF "$(BUILDHIDS)"!="" -HID3FILES=$(foreach,i,$(SRC3FILES:f) $(SRS)$/$(i:s/.src/.hid/)) -HIDSRS3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS3NAME)_srs.hid +HID3FILES=$(foreach,i,$(SRC3FILES:f) $(SRS)/$(i:s/.src/.hid/)) +HIDSRS3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS3NAME)_srs.hid $(HIDSRS3PARTICLE) : $(HID3FILES) @echo ------------------------------ @echo Making: $@ @-$(RM) $@ - $(TYPE) $(mktmp $(subst,$/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(subst,/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDSRS3PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST) +$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) +$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) @echo ------------------------------ @echo Making: $@ - @@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr - $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES) + @@-$(RM) $(MISC)/$(TARGET).$(SRS3NAME).dprr + $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES) .IF "$(WITH_LANG)"!="" -$(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(SRC3FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) @@ -143,11 +143,11 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST) +$(SRS)/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST) -$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)/$(TARGET)/$i) .ELSE # "$(WITH_LANG)"!="" -$(SRS)$/$(SRS3NAME).srs: $(SRC3FILES) +$(SRS)/$(SRS3NAME).srs: $(SRC3FILES) .ENDIF # "$(WITH_LANG)"!="" @echo ------------------------------ @echo Making: $@ @@ -167,30 +167,30 @@ $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES) .IF "$(SRS4NAME)"!="" .IF "$(BUILDHIDS)"!="" -HID4FILES=$(foreach,i,$(SRC4FILES:f) $(SRS)$/$(i:s/.src/.hid/)) -HIDSRS4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS4NAME)_srs.hid +HID4FILES=$(foreach,i,$(SRC4FILES:f) $(SRS)/$(i:s/.src/.hid/)) +HIDSRS4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS4NAME)_srs.hid $(HIDSRS4PARTICLE) : $(HID4FILES) @echo ------------------------------ @echo Making: $@ @-$(RM) $@ - $(TYPE) $(mktmp $(subst,$/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(subst,/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDSRS4PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST) +$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) +$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) @echo ------------------------------ @echo Making: $@ - @@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr - $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES) + @@-$(RM) $(MISC)/$(TARGET).$(SRS4NAME).dprr + $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES) .IF "$(WITH_LANG)"!="" -$(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(SRC4FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) @@ -198,11 +198,11 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST) +$(SRS)/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST) -$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)/$(TARGET)/$i) .ELSE # "$(WITH_LANG)"!="" -$(SRS)$/$(SRS4NAME).srs: $(SRC4FILES) +$(SRS)/$(SRS4NAME).srs: $(SRC4FILES) .ENDIF # "$(WITH_LANG)"!="" @echo ------------------------------ @echo Making: $@ @@ -222,30 +222,30 @@ $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES) .IF "$(SRS5NAME)"!="" .IF "$(BUILDHIDS)"!="" -HID5FILES=$(foreach,i,$(SRC5FILES:f) $(SRS)$/$(i:s/.src/.hid/)) -HIDSRS5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS5NAME)_srs.hid +HID5FILES=$(foreach,i,$(SRC5FILES:f) $(SRS)/$(i:s/.src/.hid/)) +HIDSRS5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS5NAME)_srs.hid $(HIDSRS5PARTICLE) : $(HID5FILES) @echo ------------------------------ @echo Making: $@ @-$(RM) $@ - $(TYPE) $(mktmp $(subst,$/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(subst,/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDSRS5PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST) +$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) +$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) @echo ------------------------------ @echo Making: $@ - @@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr - $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES) + @@-$(RM) $(MISC)/$(TARGET).$(SRS5NAME).dprr + $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES) .IF "$(WITH_LANG)"!="" -$(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(SRC5FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) @@ -253,11 +253,11 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST) +$(SRS)/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST) -$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)/$(TARGET)/$i) .ELSE # "$(WITH_LANG)"!="" -$(SRS)$/$(SRS5NAME).srs: $(SRC5FILES) +$(SRS)/$(SRS5NAME).srs: $(SRC5FILES) .ENDIF # "$(WITH_LANG)"!="" @echo ------------------------------ @echo Making: $@ @@ -277,30 +277,30 @@ $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES) .IF "$(SRS6NAME)"!="" .IF "$(BUILDHIDS)"!="" -HID6FILES=$(foreach,i,$(SRC6FILES:f) $(SRS)$/$(i:s/.src/.hid/)) -HIDSRS6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS6NAME)_srs.hid +HID6FILES=$(foreach,i,$(SRC6FILES:f) $(SRS)/$(i:s/.src/.hid/)) +HIDSRS6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS6NAME)_srs.hid $(HIDSRS6PARTICLE) : $(HID6FILES) @echo ------------------------------ @echo Making: $@ @-$(RM) $@ - $(TYPE) $(mktmp $(subst,$/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(subst,/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDSRS6PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST) +$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) +$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) @echo ------------------------------ @echo Making: $@ - @@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr - $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES) + @@-$(RM) $(MISC)/$(TARGET).$(SRS6NAME).dprr + $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES) .IF "$(WITH_LANG)"!="" -$(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(SRC6FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) @@ -308,11 +308,11 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST) +$(SRS)/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST) -$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)/$(TARGET)/$i) .ELSE # "$(WITH_LANG)"!="" -$(SRS)$/$(SRS6NAME).srs: $(SRC6FILES) +$(SRS)/$(SRS6NAME).srs: $(SRC6FILES) .ENDIF # "$(WITH_LANG)"!="" @echo ------------------------------ @echo Making: $@ @@ -332,30 +332,30 @@ $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES) .IF "$(SRS7NAME)"!="" .IF "$(BUILDHIDS)"!="" -HID7FILES=$(foreach,i,$(SRC7FILES:f) $(SRS)$/$(i:s/.src/.hid/)) -HIDSRS7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS7NAME)_srs.hid +HID7FILES=$(foreach,i,$(SRC7FILES:f) $(SRS)/$(i:s/.src/.hid/)) +HIDSRS7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS7NAME)_srs.hid $(HIDSRS7PARTICLE) : $(HID7FILES) @echo ------------------------------ @echo Making: $@ @-$(RM) $@ - $(TYPE) $(mktmp $(subst,$/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(subst,/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDSRS7PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST) +$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) +$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) @echo ------------------------------ @echo Making: $@ - @@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr - $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES) + @@-$(RM) $(MISC)/$(TARGET).$(SRS7NAME).dprr + $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES) .IF "$(WITH_LANG)"!="" -$(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(SRC7FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) @@ -363,11 +363,11 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST) +$(SRS)/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST) -$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)/$(TARGET)/$i) .ELSE # "$(WITH_LANG)"!="" -$(SRS)$/$(SRS7NAME).srs: $(SRC7FILES) +$(SRS)/$(SRS7NAME).srs: $(SRC7FILES) .ENDIF # "$(WITH_LANG)"!="" @echo ------------------------------ @echo Making: $@ @@ -387,30 +387,30 @@ $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES) .IF "$(SRS8NAME)"!="" .IF "$(BUILDHIDS)"!="" -HID8FILES=$(foreach,i,$(SRC8FILES:f) $(SRS)$/$(i:s/.src/.hid/)) -HIDSRS8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS8NAME)_srs.hid +HID8FILES=$(foreach,i,$(SRC8FILES:f) $(SRS)/$(i:s/.src/.hid/)) +HIDSRS8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS8NAME)_srs.hid $(HIDSRS8PARTICLE) : $(HID8FILES) @echo ------------------------------ @echo Making: $@ @-$(RM) $@ - $(TYPE) $(mktmp $(subst,$/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(subst,/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDSRS8PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST) +$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) +$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) @echo ------------------------------ @echo Making: $@ - @@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr - $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES) + @@-$(RM) $(MISC)/$(TARGET).$(SRS8NAME).dprr + $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES) .IF "$(WITH_LANG)"!="" -$(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(SRC8FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) @@ -418,11 +418,11 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST) +$(SRS)/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST) -$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)/$(TARGET)/$i) .ELSE # "$(WITH_LANG)"!="" -$(SRS)$/$(SRS8NAME).srs: $(SRC8FILES) +$(SRS)/$(SRS8NAME).srs: $(SRC8FILES) .ENDIF # "$(WITH_LANG)"!="" @echo ------------------------------ @echo Making: $@ @@ -442,30 +442,30 @@ $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES) .IF "$(SRS9NAME)"!="" .IF "$(BUILDHIDS)"!="" -HID9FILES=$(foreach,i,$(SRC9FILES:f) $(SRS)$/$(i:s/.src/.hid/)) -HIDSRS9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS9NAME)_srs.hid +HID9FILES=$(foreach,i,$(SRC9FILES:f) $(SRS)/$(i:s/.src/.hid/)) +HIDSRS9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS9NAME)_srs.hid $(HIDSRS9PARTICLE) : $(HID9FILES) @echo ------------------------------ @echo Making: $@ @-$(RM) $@ - $(TYPE) $(mktmp $(subst,$/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(subst,/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDSRS9PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST) +$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) +$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) @echo ------------------------------ @echo Making: $@ - @@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr - $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES) + @@-$(RM) $(MISC)/$(TARGET).$(SRS9NAME).dprr + $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES) .IF "$(WITH_LANG)"!="" -$(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(SRC9FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) @@ -473,11 +473,11 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST) +$(SRS)/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST) -$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)/$(TARGET)/$i) .ELSE # "$(WITH_LANG)"!="" -$(SRS)$/$(SRS9NAME).srs: $(SRC9FILES) +$(SRS)/$(SRS9NAME).srs: $(SRC9FILES) .ENDIF # "$(WITH_LANG)"!="" @echo ------------------------------ @echo Making: $@ @@ -497,30 +497,30 @@ $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES) .IF "$(SRS10NAME)"!="" .IF "$(BUILDHIDS)"!="" -HID10FILES=$(foreach,i,$(SRC10FILES:f) $(SRS)$/$(i:s/.src/.hid/)) -HIDSRS10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS10NAME)_srs.hid +HID10FILES=$(foreach,i,$(SRC10FILES:f) $(SRS)/$(i:s/.src/.hid/)) +HIDSRS10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS10NAME)_srs.hid $(HIDSRS10PARTICLE) : $(HID10FILES) @echo ------------------------------ @echo Making: $@ @-$(RM) $@ - $(TYPE) $(mktmp $(subst,$/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(subst,/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDSRS10PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST) +$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) +$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) @echo ------------------------------ @echo Making: $@ - @@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr - $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES) + @@-$(RM) $(MISC)/$(TARGET).$(SRS10NAME).dprr + $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES) .IF "$(WITH_LANG)"!="" -$(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(SRC10FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) @@ -528,11 +528,11 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST) +$(SRS)/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST) -$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)/$(TARGET)/$i) .ELSE # "$(WITH_LANG)"!="" -$(SRS)$/$(SRS10NAME).srs: $(SRC10FILES) +$(SRS)/$(SRS10NAME).srs: $(SRC10FILES) .ENDIF # "$(WITH_LANG)"!="" @echo ------------------------------ @echo Making: $@ diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk index b1974ad10259..79ced982dbdc 100644 --- a/solenv/inc/_tg_zip.mk +++ b/solenv/inc/_tg_zip.mk @@ -17,18 +17,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" ZIP1EXT*=.zip .IF "$(common_build_zip)"!="" .IF "$(ZIP1LIST:s/LANGDIR//)" == "$(ZIP1LIST)" -ZIP1TARGETN=$(COMMONBIN)$/$(ZIP1TARGET)$(ZIP1EXT) +ZIP1TARGETN=$(COMMONBIN)/$(ZIP1TARGET)$(ZIP1EXT) .ELSE -ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(COMMONBIN)$/$(ZIP1TARGET)_$i$(ZIP1EXT) ) +ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(COMMONBIN)/$(ZIP1TARGET)_$i$(ZIP1EXT) ) .ENDIF .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP1LIST:s/LANGDIR//)" == "$(ZIP1LIST)" -ZIP1TARGETN=$(BIN)$/$(ZIP1TARGET)$(ZIP1EXT) +ZIP1TARGETN=$(BIN)/$(ZIP1TARGET)$(ZIP1EXT) .ELSE -ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(BIN)$/$(ZIP1TARGET)_$i$(ZIP1EXT) ) +ZIP1TARGETN=$(foreach,i,$(zip1alllangiso) $(BIN)/$(ZIP1TARGET)_$i$(ZIP1EXT) ) .ENDIF .ENDIF # "$(common_build_zip)"!="" -ZIP1DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP1TARGETN:s/$(ZIP1EXT)/.dpzz/))) +ZIP1DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP1TARGETN:s/$(ZIP1EXT)/.dpzz/))) ZIPDEPFILES+=$(ZIP1DEPFILE) ZIP1DIR*=$(ZIPDIR) @@ -36,11 +36,7 @@ ZIP1FLAGS*=$(ZIPFLAGS) .IF "$(zip1generatedlangs)"!="" zip1langdirs*=$(alllangiso) .ELSE # "$(zip1generatedlangs)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip1langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" -zip1langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP1DIR))} /ba:d ))) -.ENDIF # "$(GUI)"=="UNX" +zip1langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ENDIF # "$(zip1generatedlangs)"!="" .IF "$(ZIP1FORCEALLLANG)"!="" zip1alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip1langdirs) $(eq,$i,$j $i $(NULL)))) @@ -53,36 +49,36 @@ zip1alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip1langdirs) $(eq,$i,$ ZIP1TMP:=$(mktmp iii) -$(MISC)$/$(TARGET).$(PWD:f).$(ZIP1TARGET).dpzz : $(ZIP1TARGETN) +$(MISC)/$(TARGET).$(PWD:f).$(ZIP1TARGET).dpzz : $(ZIP1TARGETN) .IF "$(common_build_zip)"!="" -ZIP1HELPVAR=$(COMMONBIN)$/$(ZIP1TARGET) +ZIP1HELPVAR=$(COMMONBIN)/$(ZIP1TARGET) .ELSE # "$(common_build_zip)"!="" -ZIP1HELPVAR=$(BIN)$/$(ZIP1TARGET) +ZIP1HELPVAR=$(BIN)/$(ZIP1TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP1DEPFILE) : - echo # > $(MISC)$/$(@:f) + echo # > $(MISC)/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP1DIR)" != "" @echo type 1 -$(MKDIRHIER) $(ZIP1DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP1DIR)" != "" @echo type 2 - -$(ZIPDEP) $(ZIP1FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP1FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP1DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP1DIR)" != "" @echo type 3 -$(MKDIRHIER) $(ZIP1DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP1DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP1TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP1DIR)" != "" @echo type 4 - -$(ZIPDEP) $(ZIP1FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP1TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP1DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f) $(ZIP1TARGETN) : delzip $(ZIP1DEPS) @@ -94,22 +90,18 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS) .IF "$(common_build_zip)"!="" .IF "$(ZIP1DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away$/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $@.$(INPATH) $(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) .ELSE # "$(ZIP1DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP1FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) .ENDIF # "$(ZIP1DIR)" != "" @@ -119,21 +111,17 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS) .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP1DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away$/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $@ $(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) .ELSE # "$(ZIP1DIR)" != "" - zip $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP1TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + zip $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(ZIP1DIR)" != "" .ENDIF # "$(common_build_zip)"!="" .ENDIF @@ -157,18 +145,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" ZIP2EXT*=.zip .IF "$(common_build_zip)"!="" .IF "$(ZIP2LIST:s/LANGDIR//)" == "$(ZIP2LIST)" -ZIP2TARGETN=$(COMMONBIN)$/$(ZIP2TARGET)$(ZIP2EXT) +ZIP2TARGETN=$(COMMONBIN)/$(ZIP2TARGET)$(ZIP2EXT) .ELSE -ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(COMMONBIN)$/$(ZIP2TARGET)_$i$(ZIP2EXT) ) +ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(COMMONBIN)/$(ZIP2TARGET)_$i$(ZIP2EXT) ) .ENDIF .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP2LIST:s/LANGDIR//)" == "$(ZIP2LIST)" -ZIP2TARGETN=$(BIN)$/$(ZIP2TARGET)$(ZIP2EXT) +ZIP2TARGETN=$(BIN)/$(ZIP2TARGET)$(ZIP2EXT) .ELSE -ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(BIN)$/$(ZIP2TARGET)_$i$(ZIP2EXT) ) +ZIP2TARGETN=$(foreach,i,$(zip2alllangiso) $(BIN)/$(ZIP2TARGET)_$i$(ZIP2EXT) ) .ENDIF .ENDIF # "$(common_build_zip)"!="" -ZIP2DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP2TARGETN:s/$(ZIP2EXT)/.dpzz/))) +ZIP2DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP2TARGETN:s/$(ZIP2EXT)/.dpzz/))) ZIPDEPFILES+=$(ZIP2DEPFILE) ZIP2DIR*=$(ZIPDIR) @@ -176,11 +164,7 @@ ZIP2FLAGS*=$(ZIPFLAGS) .IF "$(zip2generatedlangs)"!="" zip2langdirs*=$(alllangiso) .ELSE # "$(zip2generatedlangs)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip2langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" -zip2langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP2DIR))} /ba:d ))) -.ENDIF # "$(GUI)"=="UNX" +zip2langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ENDIF # "$(zip2generatedlangs)"!="" .IF "$(ZIP2FORCEALLLANG)"!="" zip2alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip2langdirs) $(eq,$i,$j $i $(NULL)))) @@ -193,36 +177,36 @@ zip2alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip2langdirs) $(eq,$i,$ ZIP2TMP:=$(mktmp iii) -$(MISC)$/$(TARGET).$(PWD:f).$(ZIP2TARGET).dpzz : $(ZIP2TARGETN) +$(MISC)/$(TARGET).$(PWD:f).$(ZIP2TARGET).dpzz : $(ZIP2TARGETN) .IF "$(common_build_zip)"!="" -ZIP2HELPVAR=$(COMMONBIN)$/$(ZIP2TARGET) +ZIP2HELPVAR=$(COMMONBIN)/$(ZIP2TARGET) .ELSE # "$(common_build_zip)"!="" -ZIP2HELPVAR=$(BIN)$/$(ZIP2TARGET) +ZIP2HELPVAR=$(BIN)/$(ZIP2TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP2DEPFILE) : - echo # > $(MISC)$/$(@:f) + echo # > $(MISC)/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP2DIR)" != "" @echo type 1 -$(MKDIRHIER) $(ZIP2DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP2DIR)" != "" @echo type 2 - -$(ZIPDEP) $(ZIP2FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP2FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP2DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP2DIR)" != "" @echo type 3 -$(MKDIRHIER) $(ZIP2DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP2DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP2TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP2DIR)" != "" @echo type 4 - -$(ZIPDEP) $(ZIP2FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP2TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP2FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP2DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f) $(ZIP2TARGETN) : delzip $(ZIP2DEPS) @@ -234,22 +218,18 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS) .IF "$(common_build_zip)"!="" .IF "$(ZIP2DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away$/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $@.$(INPATH) $(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) .ELSE # "$(ZIP2DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP2FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) .ENDIF # "$(ZIP2DIR)" != "" @@ -259,21 +239,17 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS) .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP2DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away$/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $@ $(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) .ELSE # "$(ZIP2DIR)" != "" - zip $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP2TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + zip $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(ZIP2DIR)" != "" .ENDIF # "$(common_build_zip)"!="" .ENDIF @@ -297,18 +273,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" ZIP3EXT*=.zip .IF "$(common_build_zip)"!="" .IF "$(ZIP3LIST:s/LANGDIR//)" == "$(ZIP3LIST)" -ZIP3TARGETN=$(COMMONBIN)$/$(ZIP3TARGET)$(ZIP3EXT) +ZIP3TARGETN=$(COMMONBIN)/$(ZIP3TARGET)$(ZIP3EXT) .ELSE -ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(COMMONBIN)$/$(ZIP3TARGET)_$i$(ZIP3EXT) ) +ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(COMMONBIN)/$(ZIP3TARGET)_$i$(ZIP3EXT) ) .ENDIF .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP3LIST:s/LANGDIR//)" == "$(ZIP3LIST)" -ZIP3TARGETN=$(BIN)$/$(ZIP3TARGET)$(ZIP3EXT) +ZIP3TARGETN=$(BIN)/$(ZIP3TARGET)$(ZIP3EXT) .ELSE -ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(BIN)$/$(ZIP3TARGET)_$i$(ZIP3EXT) ) +ZIP3TARGETN=$(foreach,i,$(zip3alllangiso) $(BIN)/$(ZIP3TARGET)_$i$(ZIP3EXT) ) .ENDIF .ENDIF # "$(common_build_zip)"!="" -ZIP3DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP3TARGETN:s/$(ZIP3EXT)/.dpzz/))) +ZIP3DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP3TARGETN:s/$(ZIP3EXT)/.dpzz/))) ZIPDEPFILES+=$(ZIP3DEPFILE) ZIP3DIR*=$(ZIPDIR) @@ -316,11 +292,7 @@ ZIP3FLAGS*=$(ZIPFLAGS) .IF "$(zip3generatedlangs)"!="" zip3langdirs*=$(alllangiso) .ELSE # "$(zip3generatedlangs)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip3langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" -zip3langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP3DIR))} /ba:d ))) -.ENDIF # "$(GUI)"=="UNX" +zip3langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ENDIF # "$(zip3generatedlangs)"!="" .IF "$(ZIP3FORCEALLLANG)"!="" zip3alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip3langdirs) $(eq,$i,$j $i $(NULL)))) @@ -333,36 +305,36 @@ zip3alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip3langdirs) $(eq,$i,$ ZIP3TMP:=$(mktmp iii) -$(MISC)$/$(TARGET).$(PWD:f).$(ZIP3TARGET).dpzz : $(ZIP3TARGETN) +$(MISC)/$(TARGET).$(PWD:f).$(ZIP3TARGET).dpzz : $(ZIP3TARGETN) .IF "$(common_build_zip)"!="" -ZIP3HELPVAR=$(COMMONBIN)$/$(ZIP3TARGET) +ZIP3HELPVAR=$(COMMONBIN)/$(ZIP3TARGET) .ELSE # "$(common_build_zip)"!="" -ZIP3HELPVAR=$(BIN)$/$(ZIP3TARGET) +ZIP3HELPVAR=$(BIN)/$(ZIP3TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP3DEPFILE) : - echo # > $(MISC)$/$(@:f) + echo # > $(MISC)/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP3DIR)" != "" @echo type 1 -$(MKDIRHIER) $(ZIP3DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP3DIR)" != "" @echo type 2 - -$(ZIPDEP) $(ZIP3FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP3FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP3DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP3DIR)" != "" @echo type 3 -$(MKDIRHIER) $(ZIP3DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP3DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP3TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP3DIR)" != "" @echo type 4 - -$(ZIPDEP) $(ZIP3FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP3TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP3FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP3DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f) $(ZIP3TARGETN) : delzip $(ZIP3DEPS) @@ -374,22 +346,18 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS) .IF "$(common_build_zip)"!="" .IF "$(ZIP3DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away$/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $@.$(INPATH) $(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) .ELSE # "$(ZIP3DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP3FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) .ENDIF # "$(ZIP3DIR)" != "" @@ -399,21 +367,17 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS) .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP3DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away$/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $@ $(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) .ELSE # "$(ZIP3DIR)" != "" - zip $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP3TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + zip $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(ZIP3DIR)" != "" .ENDIF # "$(common_build_zip)"!="" .ENDIF @@ -437,18 +401,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" ZIP4EXT*=.zip .IF "$(common_build_zip)"!="" .IF "$(ZIP4LIST:s/LANGDIR//)" == "$(ZIP4LIST)" -ZIP4TARGETN=$(COMMONBIN)$/$(ZIP4TARGET)$(ZIP4EXT) +ZIP4TARGETN=$(COMMONBIN)/$(ZIP4TARGET)$(ZIP4EXT) .ELSE -ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(COMMONBIN)$/$(ZIP4TARGET)_$i$(ZIP4EXT) ) +ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(COMMONBIN)/$(ZIP4TARGET)_$i$(ZIP4EXT) ) .ENDIF .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP4LIST:s/LANGDIR//)" == "$(ZIP4LIST)" -ZIP4TARGETN=$(BIN)$/$(ZIP4TARGET)$(ZIP4EXT) +ZIP4TARGETN=$(BIN)/$(ZIP4TARGET)$(ZIP4EXT) .ELSE -ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(BIN)$/$(ZIP4TARGET)_$i$(ZIP4EXT) ) +ZIP4TARGETN=$(foreach,i,$(zip4alllangiso) $(BIN)/$(ZIP4TARGET)_$i$(ZIP4EXT) ) .ENDIF .ENDIF # "$(common_build_zip)"!="" -ZIP4DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP4TARGETN:s/$(ZIP4EXT)/.dpzz/))) +ZIP4DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP4TARGETN:s/$(ZIP4EXT)/.dpzz/))) ZIPDEPFILES+=$(ZIP4DEPFILE) ZIP4DIR*=$(ZIPDIR) @@ -456,11 +420,7 @@ ZIP4FLAGS*=$(ZIPFLAGS) .IF "$(zip4generatedlangs)"!="" zip4langdirs*=$(alllangiso) .ELSE # "$(zip4generatedlangs)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip4langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" -zip4langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP4DIR))} /ba:d ))) -.ENDIF # "$(GUI)"=="UNX" +zip4langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ENDIF # "$(zip4generatedlangs)"!="" .IF "$(ZIP4FORCEALLLANG)"!="" zip4alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip4langdirs) $(eq,$i,$j $i $(NULL)))) @@ -473,36 +433,36 @@ zip4alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip4langdirs) $(eq,$i,$ ZIP4TMP:=$(mktmp iii) -$(MISC)$/$(TARGET).$(PWD:f).$(ZIP4TARGET).dpzz : $(ZIP4TARGETN) +$(MISC)/$(TARGET).$(PWD:f).$(ZIP4TARGET).dpzz : $(ZIP4TARGETN) .IF "$(common_build_zip)"!="" -ZIP4HELPVAR=$(COMMONBIN)$/$(ZIP4TARGET) +ZIP4HELPVAR=$(COMMONBIN)/$(ZIP4TARGET) .ELSE # "$(common_build_zip)"!="" -ZIP4HELPVAR=$(BIN)$/$(ZIP4TARGET) +ZIP4HELPVAR=$(BIN)/$(ZIP4TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP4DEPFILE) : - echo # > $(MISC)$/$(@:f) + echo # > $(MISC)/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP4DIR)" != "" @echo type 1 -$(MKDIRHIER) $(ZIP4DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP4DIR)" != "" @echo type 2 - -$(ZIPDEP) $(ZIP4FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP4FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP4DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP4DIR)" != "" @echo type 3 -$(MKDIRHIER) $(ZIP4DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP4DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP4TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP4DIR)" != "" @echo type 4 - -$(ZIPDEP) $(ZIP4FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP4TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP4FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP4DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f) $(ZIP4TARGETN) : delzip $(ZIP4DEPS) @@ -514,22 +474,18 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS) .IF "$(common_build_zip)"!="" .IF "$(ZIP4DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away$/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $@.$(INPATH) $(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) .ELSE # "$(ZIP4DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP4FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) .ENDIF # "$(ZIP4DIR)" != "" @@ -539,21 +495,17 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS) .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP4DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away$/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $@ $(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) .ELSE # "$(ZIP4DIR)" != "" - zip $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP4TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + zip $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(ZIP4DIR)" != "" .ENDIF # "$(common_build_zip)"!="" .ENDIF @@ -577,18 +529,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" ZIP5EXT*=.zip .IF "$(common_build_zip)"!="" .IF "$(ZIP5LIST:s/LANGDIR//)" == "$(ZIP5LIST)" -ZIP5TARGETN=$(COMMONBIN)$/$(ZIP5TARGET)$(ZIP5EXT) +ZIP5TARGETN=$(COMMONBIN)/$(ZIP5TARGET)$(ZIP5EXT) .ELSE -ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(COMMONBIN)$/$(ZIP5TARGET)_$i$(ZIP5EXT) ) +ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(COMMONBIN)/$(ZIP5TARGET)_$i$(ZIP5EXT) ) .ENDIF .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP5LIST:s/LANGDIR//)" == "$(ZIP5LIST)" -ZIP5TARGETN=$(BIN)$/$(ZIP5TARGET)$(ZIP5EXT) +ZIP5TARGETN=$(BIN)/$(ZIP5TARGET)$(ZIP5EXT) .ELSE -ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(BIN)$/$(ZIP5TARGET)_$i$(ZIP5EXT) ) +ZIP5TARGETN=$(foreach,i,$(zip5alllangiso) $(BIN)/$(ZIP5TARGET)_$i$(ZIP5EXT) ) .ENDIF .ENDIF # "$(common_build_zip)"!="" -ZIP5DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP5TARGETN:s/$(ZIP5EXT)/.dpzz/))) +ZIP5DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP5TARGETN:s/$(ZIP5EXT)/.dpzz/))) ZIPDEPFILES+=$(ZIP5DEPFILE) ZIP5DIR*=$(ZIPDIR) @@ -596,11 +548,7 @@ ZIP5FLAGS*=$(ZIPFLAGS) .IF "$(zip5generatedlangs)"!="" zip5langdirs*=$(alllangiso) .ELSE # "$(zip5generatedlangs)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip5langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" -zip5langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP5DIR))} /ba:d ))) -.ENDIF # "$(GUI)"=="UNX" +zip5langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ENDIF # "$(zip5generatedlangs)"!="" .IF "$(ZIP5FORCEALLLANG)"!="" zip5alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip5langdirs) $(eq,$i,$j $i $(NULL)))) @@ -613,36 +561,36 @@ zip5alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip5langdirs) $(eq,$i,$ ZIP5TMP:=$(mktmp iii) -$(MISC)$/$(TARGET).$(PWD:f).$(ZIP5TARGET).dpzz : $(ZIP5TARGETN) +$(MISC)/$(TARGET).$(PWD:f).$(ZIP5TARGET).dpzz : $(ZIP5TARGETN) .IF "$(common_build_zip)"!="" -ZIP5HELPVAR=$(COMMONBIN)$/$(ZIP5TARGET) +ZIP5HELPVAR=$(COMMONBIN)/$(ZIP5TARGET) .ELSE # "$(common_build_zip)"!="" -ZIP5HELPVAR=$(BIN)$/$(ZIP5TARGET) +ZIP5HELPVAR=$(BIN)/$(ZIP5TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP5DEPFILE) : - echo # > $(MISC)$/$(@:f) + echo # > $(MISC)/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP5DIR)" != "" @echo type 1 -$(MKDIRHIER) $(ZIP5DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP5DIR)" != "" @echo type 2 - -$(ZIPDEP) $(ZIP5FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP5FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP5DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP5DIR)" != "" @echo type 3 -$(MKDIRHIER) $(ZIP5DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP5DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP5TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP5DIR)" != "" @echo type 4 - -$(ZIPDEP) $(ZIP5FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP5TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP5FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP5DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f) $(ZIP5TARGETN) : delzip $(ZIP5DEPS) @@ -654,22 +602,18 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS) .IF "$(common_build_zip)"!="" .IF "$(ZIP5DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away$/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $@.$(INPATH) $(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) .ELSE # "$(ZIP5DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP5FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) .ENDIF # "$(ZIP5DIR)" != "" @@ -679,21 +623,17 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS) .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP5DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away$/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $@ $(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) .ELSE # "$(ZIP5DIR)" != "" - zip $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP5TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + zip $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(ZIP5DIR)" != "" .ENDIF # "$(common_build_zip)"!="" .ENDIF @@ -717,18 +657,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" ZIP6EXT*=.zip .IF "$(common_build_zip)"!="" .IF "$(ZIP6LIST:s/LANGDIR//)" == "$(ZIP6LIST)" -ZIP6TARGETN=$(COMMONBIN)$/$(ZIP6TARGET)$(ZIP6EXT) +ZIP6TARGETN=$(COMMONBIN)/$(ZIP6TARGET)$(ZIP6EXT) .ELSE -ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(COMMONBIN)$/$(ZIP6TARGET)_$i$(ZIP6EXT) ) +ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(COMMONBIN)/$(ZIP6TARGET)_$i$(ZIP6EXT) ) .ENDIF .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP6LIST:s/LANGDIR//)" == "$(ZIP6LIST)" -ZIP6TARGETN=$(BIN)$/$(ZIP6TARGET)$(ZIP6EXT) +ZIP6TARGETN=$(BIN)/$(ZIP6TARGET)$(ZIP6EXT) .ELSE -ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(BIN)$/$(ZIP6TARGET)_$i$(ZIP6EXT) ) +ZIP6TARGETN=$(foreach,i,$(zip6alllangiso) $(BIN)/$(ZIP6TARGET)_$i$(ZIP6EXT) ) .ENDIF .ENDIF # "$(common_build_zip)"!="" -ZIP6DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP6TARGETN:s/$(ZIP6EXT)/.dpzz/))) +ZIP6DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP6TARGETN:s/$(ZIP6EXT)/.dpzz/))) ZIPDEPFILES+=$(ZIP6DEPFILE) ZIP6DIR*=$(ZIPDIR) @@ -736,11 +676,7 @@ ZIP6FLAGS*=$(ZIPFLAGS) .IF "$(zip6generatedlangs)"!="" zip6langdirs*=$(alllangiso) .ELSE # "$(zip6generatedlangs)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip6langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" -zip6langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP6DIR))} /ba:d ))) -.ENDIF # "$(GUI)"=="UNX" +zip6langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ENDIF # "$(zip6generatedlangs)"!="" .IF "$(ZIP6FORCEALLLANG)"!="" zip6alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip6langdirs) $(eq,$i,$j $i $(NULL)))) @@ -753,36 +689,36 @@ zip6alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip6langdirs) $(eq,$i,$ ZIP6TMP:=$(mktmp iii) -$(MISC)$/$(TARGET).$(PWD:f).$(ZIP6TARGET).dpzz : $(ZIP6TARGETN) +$(MISC)/$(TARGET).$(PWD:f).$(ZIP6TARGET).dpzz : $(ZIP6TARGETN) .IF "$(common_build_zip)"!="" -ZIP6HELPVAR=$(COMMONBIN)$/$(ZIP6TARGET) +ZIP6HELPVAR=$(COMMONBIN)/$(ZIP6TARGET) .ELSE # "$(common_build_zip)"!="" -ZIP6HELPVAR=$(BIN)$/$(ZIP6TARGET) +ZIP6HELPVAR=$(BIN)/$(ZIP6TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP6DEPFILE) : - echo # > $(MISC)$/$(@:f) + echo # > $(MISC)/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP6DIR)" != "" @echo type 1 -$(MKDIRHIER) $(ZIP6DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP6DIR)" != "" @echo type 2 - -$(ZIPDEP) $(ZIP6FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP6FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP6DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP6DIR)" != "" @echo type 3 -$(MKDIRHIER) $(ZIP6DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP6DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP6TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP6DIR)" != "" @echo type 4 - -$(ZIPDEP) $(ZIP6FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP6TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP6FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP6DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f) $(ZIP6TARGETN) : delzip $(ZIP6DEPS) @@ -794,22 +730,18 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS) .IF "$(common_build_zip)"!="" .IF "$(ZIP6DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away$/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $@.$(INPATH) $(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) .ELSE # "$(ZIP6DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP6FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) .ENDIF # "$(ZIP6DIR)" != "" @@ -819,21 +751,17 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS) .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP6DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away$/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $@ $(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) .ELSE # "$(ZIP6DIR)" != "" - zip $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP6TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + zip $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(ZIP6DIR)" != "" .ENDIF # "$(common_build_zip)"!="" .ENDIF @@ -857,18 +785,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" ZIP7EXT*=.zip .IF "$(common_build_zip)"!="" .IF "$(ZIP7LIST:s/LANGDIR//)" == "$(ZIP7LIST)" -ZIP7TARGETN=$(COMMONBIN)$/$(ZIP7TARGET)$(ZIP7EXT) +ZIP7TARGETN=$(COMMONBIN)/$(ZIP7TARGET)$(ZIP7EXT) .ELSE -ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(COMMONBIN)$/$(ZIP7TARGET)_$i$(ZIP7EXT) ) +ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(COMMONBIN)/$(ZIP7TARGET)_$i$(ZIP7EXT) ) .ENDIF .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP7LIST:s/LANGDIR//)" == "$(ZIP7LIST)" -ZIP7TARGETN=$(BIN)$/$(ZIP7TARGET)$(ZIP7EXT) +ZIP7TARGETN=$(BIN)/$(ZIP7TARGET)$(ZIP7EXT) .ELSE -ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(BIN)$/$(ZIP7TARGET)_$i$(ZIP7EXT) ) +ZIP7TARGETN=$(foreach,i,$(zip7alllangiso) $(BIN)/$(ZIP7TARGET)_$i$(ZIP7EXT) ) .ENDIF .ENDIF # "$(common_build_zip)"!="" -ZIP7DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP7TARGETN:s/$(ZIP7EXT)/.dpzz/))) +ZIP7DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP7TARGETN:s/$(ZIP7EXT)/.dpzz/))) ZIPDEPFILES+=$(ZIP7DEPFILE) ZIP7DIR*=$(ZIPDIR) @@ -876,11 +804,7 @@ ZIP7FLAGS*=$(ZIPFLAGS) .IF "$(zip7generatedlangs)"!="" zip7langdirs*=$(alllangiso) .ELSE # "$(zip7generatedlangs)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip7langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" -zip7langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP7DIR))} /ba:d ))) -.ENDIF # "$(GUI)"=="UNX" +zip7langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ENDIF # "$(zip7generatedlangs)"!="" .IF "$(ZIP7FORCEALLLANG)"!="" zip7alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip7langdirs) $(eq,$i,$j $i $(NULL)))) @@ -893,36 +817,36 @@ zip7alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip7langdirs) $(eq,$i,$ ZIP7TMP:=$(mktmp iii) -$(MISC)$/$(TARGET).$(PWD:f).$(ZIP7TARGET).dpzz : $(ZIP7TARGETN) +$(MISC)/$(TARGET).$(PWD:f).$(ZIP7TARGET).dpzz : $(ZIP7TARGETN) .IF "$(common_build_zip)"!="" -ZIP7HELPVAR=$(COMMONBIN)$/$(ZIP7TARGET) +ZIP7HELPVAR=$(COMMONBIN)/$(ZIP7TARGET) .ELSE # "$(common_build_zip)"!="" -ZIP7HELPVAR=$(BIN)$/$(ZIP7TARGET) +ZIP7HELPVAR=$(BIN)/$(ZIP7TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP7DEPFILE) : - echo # > $(MISC)$/$(@:f) + echo # > $(MISC)/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP7DIR)" != "" @echo type 1 -$(MKDIRHIER) $(ZIP7DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP7DIR)" != "" @echo type 2 - -$(ZIPDEP) $(ZIP7FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP7FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP7DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP7DIR)" != "" @echo type 3 -$(MKDIRHIER) $(ZIP7DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP7DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP7TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP7DIR)" != "" @echo type 4 - -$(ZIPDEP) $(ZIP7FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP7TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP7FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP7DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f) $(ZIP7TARGETN) : delzip $(ZIP7DEPS) @@ -934,22 +858,18 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS) .IF "$(common_build_zip)"!="" .IF "$(ZIP7DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away$/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $@.$(INPATH) $(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) .ELSE # "$(ZIP7DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP7FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) .ENDIF # "$(ZIP7DIR)" != "" @@ -959,21 +879,17 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS) .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP7DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away$/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $@ $(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) .ELSE # "$(ZIP7DIR)" != "" - zip $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP7TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + zip $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(ZIP7DIR)" != "" .ENDIF # "$(common_build_zip)"!="" .ENDIF @@ -997,18 +913,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" ZIP8EXT*=.zip .IF "$(common_build_zip)"!="" .IF "$(ZIP8LIST:s/LANGDIR//)" == "$(ZIP8LIST)" -ZIP8TARGETN=$(COMMONBIN)$/$(ZIP8TARGET)$(ZIP8EXT) +ZIP8TARGETN=$(COMMONBIN)/$(ZIP8TARGET)$(ZIP8EXT) .ELSE -ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(COMMONBIN)$/$(ZIP8TARGET)_$i$(ZIP8EXT) ) +ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(COMMONBIN)/$(ZIP8TARGET)_$i$(ZIP8EXT) ) .ENDIF .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP8LIST:s/LANGDIR//)" == "$(ZIP8LIST)" -ZIP8TARGETN=$(BIN)$/$(ZIP8TARGET)$(ZIP8EXT) +ZIP8TARGETN=$(BIN)/$(ZIP8TARGET)$(ZIP8EXT) .ELSE -ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(BIN)$/$(ZIP8TARGET)_$i$(ZIP8EXT) ) +ZIP8TARGETN=$(foreach,i,$(zip8alllangiso) $(BIN)/$(ZIP8TARGET)_$i$(ZIP8EXT) ) .ENDIF .ENDIF # "$(common_build_zip)"!="" -ZIP8DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP8TARGETN:s/$(ZIP8EXT)/.dpzz/))) +ZIP8DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP8TARGETN:s/$(ZIP8EXT)/.dpzz/))) ZIPDEPFILES+=$(ZIP8DEPFILE) ZIP8DIR*=$(ZIPDIR) @@ -1016,11 +932,7 @@ ZIP8FLAGS*=$(ZIPFLAGS) .IF "$(zip8generatedlangs)"!="" zip8langdirs*=$(alllangiso) .ELSE # "$(zip8generatedlangs)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip8langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" -zip8langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP8DIR))} /ba:d ))) -.ENDIF # "$(GUI)"=="UNX" +zip8langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ENDIF # "$(zip8generatedlangs)"!="" .IF "$(ZIP8FORCEALLLANG)"!="" zip8alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip8langdirs) $(eq,$i,$j $i $(NULL)))) @@ -1033,36 +945,36 @@ zip8alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip8langdirs) $(eq,$i,$ ZIP8TMP:=$(mktmp iii) -$(MISC)$/$(TARGET).$(PWD:f).$(ZIP8TARGET).dpzz : $(ZIP8TARGETN) +$(MISC)/$(TARGET).$(PWD:f).$(ZIP8TARGET).dpzz : $(ZIP8TARGETN) .IF "$(common_build_zip)"!="" -ZIP8HELPVAR=$(COMMONBIN)$/$(ZIP8TARGET) +ZIP8HELPVAR=$(COMMONBIN)/$(ZIP8TARGET) .ELSE # "$(common_build_zip)"!="" -ZIP8HELPVAR=$(BIN)$/$(ZIP8TARGET) +ZIP8HELPVAR=$(BIN)/$(ZIP8TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP8DEPFILE) : - echo # > $(MISC)$/$(@:f) + echo # > $(MISC)/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP8DIR)" != "" @echo type 1 -$(MKDIRHIER) $(ZIP8DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP8DIR)" != "" @echo type 2 - -$(ZIPDEP) $(ZIP8FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP8FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP8DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP8DIR)" != "" @echo type 3 -$(MKDIRHIER) $(ZIP8DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP8DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP8TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP8DIR)" != "" @echo type 4 - -$(ZIPDEP) $(ZIP8FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP8TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP8FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP8DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f) $(ZIP8TARGETN) : delzip $(ZIP8DEPS) @@ -1074,22 +986,18 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS) .IF "$(common_build_zip)"!="" .IF "$(ZIP8DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away$/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $@.$(INPATH) $(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) .ELSE # "$(ZIP8DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP8FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) .ENDIF # "$(ZIP8DIR)" != "" @@ -1099,21 +1007,17 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS) .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP8DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away$/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $@ $(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) .ELSE # "$(ZIP8DIR)" != "" - zip $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP8TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + zip $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(ZIP8DIR)" != "" .ENDIF # "$(common_build_zip)"!="" .ENDIF @@ -1137,18 +1041,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" ZIP9EXT*=.zip .IF "$(common_build_zip)"!="" .IF "$(ZIP9LIST:s/LANGDIR//)" == "$(ZIP9LIST)" -ZIP9TARGETN=$(COMMONBIN)$/$(ZIP9TARGET)$(ZIP9EXT) +ZIP9TARGETN=$(COMMONBIN)/$(ZIP9TARGET)$(ZIP9EXT) .ELSE -ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(COMMONBIN)$/$(ZIP9TARGET)_$i$(ZIP9EXT) ) +ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(COMMONBIN)/$(ZIP9TARGET)_$i$(ZIP9EXT) ) .ENDIF .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP9LIST:s/LANGDIR//)" == "$(ZIP9LIST)" -ZIP9TARGETN=$(BIN)$/$(ZIP9TARGET)$(ZIP9EXT) +ZIP9TARGETN=$(BIN)/$(ZIP9TARGET)$(ZIP9EXT) .ELSE -ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(BIN)$/$(ZIP9TARGET)_$i$(ZIP9EXT) ) +ZIP9TARGETN=$(foreach,i,$(zip9alllangiso) $(BIN)/$(ZIP9TARGET)_$i$(ZIP9EXT) ) .ENDIF .ENDIF # "$(common_build_zip)"!="" -ZIP9DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP9TARGETN:s/$(ZIP9EXT)/.dpzz/))) +ZIP9DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP9TARGETN:s/$(ZIP9EXT)/.dpzz/))) ZIPDEPFILES+=$(ZIP9DEPFILE) ZIP9DIR*=$(ZIPDIR) @@ -1156,11 +1060,7 @@ ZIP9FLAGS*=$(ZIPFLAGS) .IF "$(zip9generatedlangs)"!="" zip9langdirs*=$(alllangiso) .ELSE # "$(zip9generatedlangs)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip9langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" -zip9langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP9DIR))} /ba:d ))) -.ENDIF # "$(GUI)"=="UNX" +zip9langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ENDIF # "$(zip9generatedlangs)"!="" .IF "$(ZIP9FORCEALLLANG)"!="" zip9alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip9langdirs) $(eq,$i,$j $i $(NULL)))) @@ -1173,36 +1073,36 @@ zip9alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip9langdirs) $(eq,$i,$ ZIP9TMP:=$(mktmp iii) -$(MISC)$/$(TARGET).$(PWD:f).$(ZIP9TARGET).dpzz : $(ZIP9TARGETN) +$(MISC)/$(TARGET).$(PWD:f).$(ZIP9TARGET).dpzz : $(ZIP9TARGETN) .IF "$(common_build_zip)"!="" -ZIP9HELPVAR=$(COMMONBIN)$/$(ZIP9TARGET) +ZIP9HELPVAR=$(COMMONBIN)/$(ZIP9TARGET) .ELSE # "$(common_build_zip)"!="" -ZIP9HELPVAR=$(BIN)$/$(ZIP9TARGET) +ZIP9HELPVAR=$(BIN)/$(ZIP9TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP9DEPFILE) : - echo # > $(MISC)$/$(@:f) + echo # > $(MISC)/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP9DIR)" != "" @echo type 1 -$(MKDIRHIER) $(ZIP9DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP9DIR)" != "" @echo type 2 - -$(ZIPDEP) $(ZIP9FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP9FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP9DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP9DIR)" != "" @echo type 3 -$(MKDIRHIER) $(ZIP9DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP9DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP9TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP9DIR)" != "" @echo type 4 - -$(ZIPDEP) $(ZIP9FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP9TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP9FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP9DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f) $(ZIP9TARGETN) : delzip $(ZIP9DEPS) @@ -1214,22 +1114,18 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS) .IF "$(common_build_zip)"!="" .IF "$(ZIP9DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away$/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $@.$(INPATH) $(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) .ELSE # "$(ZIP9DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP9FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) .ENDIF # "$(ZIP9DIR)" != "" @@ -1239,21 +1135,17 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS) .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP9DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away$/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $@ $(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) .ELSE # "$(ZIP9DIR)" != "" - zip $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP9TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + zip $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(ZIP9DIR)" != "" .ENDIF # "$(common_build_zip)"!="" .ENDIF @@ -1277,18 +1169,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" ZIP10EXT*=.zip .IF "$(common_build_zip)"!="" .IF "$(ZIP10LIST:s/LANGDIR//)" == "$(ZIP10LIST)" -ZIP10TARGETN=$(COMMONBIN)$/$(ZIP10TARGET)$(ZIP10EXT) +ZIP10TARGETN=$(COMMONBIN)/$(ZIP10TARGET)$(ZIP10EXT) .ELSE -ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(COMMONBIN)$/$(ZIP10TARGET)_$i$(ZIP10EXT) ) +ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(COMMONBIN)/$(ZIP10TARGET)_$i$(ZIP10EXT) ) .ENDIF .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP10LIST:s/LANGDIR//)" == "$(ZIP10LIST)" -ZIP10TARGETN=$(BIN)$/$(ZIP10TARGET)$(ZIP10EXT) +ZIP10TARGETN=$(BIN)/$(ZIP10TARGET)$(ZIP10EXT) .ELSE -ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(BIN)$/$(ZIP10TARGET)_$i$(ZIP10EXT) ) +ZIP10TARGETN=$(foreach,i,$(zip10alllangiso) $(BIN)/$(ZIP10TARGET)_$i$(ZIP10EXT) ) .ENDIF .ENDIF # "$(common_build_zip)"!="" -ZIP10DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP10TARGETN:s/$(ZIP10EXT)/.dpzz/))) +ZIP10DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP10TARGETN:s/$(ZIP10EXT)/.dpzz/))) ZIPDEPFILES+=$(ZIP10DEPFILE) ZIP10DIR*=$(ZIPDIR) @@ -1296,11 +1188,7 @@ ZIP10FLAGS*=$(ZIPFLAGS) .IF "$(zip10generatedlangs)"!="" zip10langdirs*=$(alllangiso) .ELSE # "$(zip10generatedlangs)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip10langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" -zip10langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP10DIR))} /ba:d ))) -.ENDIF # "$(GUI)"=="UNX" +zip10langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ENDIF # "$(zip10generatedlangs)"!="" .IF "$(ZIP10FORCEALLLANG)"!="" zip10alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip10langdirs) $(eq,$i,$j $i $(NULL)))) @@ -1313,36 +1201,36 @@ zip10alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip10langdirs) $(eq,$i ZIP10TMP:=$(mktmp iii) -$(MISC)$/$(TARGET).$(PWD:f).$(ZIP10TARGET).dpzz : $(ZIP10TARGETN) +$(MISC)/$(TARGET).$(PWD:f).$(ZIP10TARGET).dpzz : $(ZIP10TARGETN) .IF "$(common_build_zip)"!="" -ZIP10HELPVAR=$(COMMONBIN)$/$(ZIP10TARGET) +ZIP10HELPVAR=$(COMMONBIN)/$(ZIP10TARGET) .ELSE # "$(common_build_zip)"!="" -ZIP10HELPVAR=$(BIN)$/$(ZIP10TARGET) +ZIP10HELPVAR=$(BIN)/$(ZIP10TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP10DEPFILE) : - echo # > $(MISC)$/$(@:f) + echo # > $(MISC)/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP10DIR)" != "" @echo type 1 -$(MKDIRHIER) $(ZIP10DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP10DIR)" != "" @echo type 2 - -$(ZIPDEP) $(ZIP10FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP10FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP10DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP10DIR)" != "" @echo type 3 -$(MKDIRHIER) $(ZIP10DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP10DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP10TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP10DIR)" != "" @echo type 4 - -$(ZIPDEP) $(ZIP10FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP10TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP10FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP10DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f) $(ZIP10TARGETN) : delzip $(ZIP10DEPS) @@ -1354,22 +1242,18 @@ $(ZIP10TARGETN) : delzip $(ZIP10DEPS) .IF "$(common_build_zip)"!="" .IF "$(ZIP10DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away$/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $@.$(INPATH) $(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) .ELSE # "$(ZIP10DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP10FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) .ENDIF # "$(ZIP10DIR)" != "" @@ -1379,21 +1263,17 @@ $(ZIP10TARGETN) : delzip $(ZIP10DEPS) .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP10DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away$/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $@ $(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) .ELSE # "$(ZIP10DIR)" != "" - zip $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP10TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + zip $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(ZIP10DIR)" != "" .ENDIF # "$(common_build_zip)"!="" .ENDIF diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk index 155e6e53761c..6c7d9b269db1 100644 --- a/solenv/inc/ant.mk +++ b/solenv/inc/ant.mk @@ -35,8 +35,8 @@ JDK_VERSION=140 JAVA_HOME=$(JDK14PATH) -PATH!:=$(JDK14PATH)$/bin$(PATH_SEPERATOR)$(PATH) -XCLASSPATH:=$(JDK14PATH)$/jre/lib/rt.jar +PATH!:=$(JDK14PATH)/bin$(PATH_SEPERATOR)$(PATH) +XCLASSPATH:=$(JDK14PATH)/jre/lib/rt.jar CLASSPATH:=$(XCLASSPATH) .ENDIF @@ -51,13 +51,13 @@ CLASSPATH:=$(XCLASSPATH) .INCLUDE : target.mk -CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA_HOME)$/lib$/tools.jar +CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA_HOME)/lib/tools.jar .EXPORT : CLASSPATH .EXPORT : PATH # --- TARGETS ----------------------------------------------------- -$(CLASSDIR)$/solar.properties : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg $(SOLARENV)$/inc/ant.properties +$(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg $(SOLARENV)/inc/ant.properties @echo Making: $@ @echo solar.build=$(BUILD) > $@ @echo solar.rscversion=$(USQ)$(RSCVERSION)$(USQ) >> $@ @@ -66,7 +66,7 @@ $(CLASSDIR)$/solar.properties : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/m @echo solar.sourceversion=$(SOURCEVERSION) >> $@ @echo solar.udkstamp=$(UDKSTAMP) >> $@ @echo solar.extstamp=$(EXTSTAMP) >> $@ - @cat $(DMAKEROOT)$/../ant.properties >> $@ + @cat $(DMAKEROOT)/../ant.properties >> $@ ANTBUILD .PHONY: $(ANT) $(ANT_FLAGS) diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk index aa240afe08fb..26ccfa6fe3bc 100644 --- a/solenv/inc/antsettings.mk +++ b/solenv/inc/antsettings.mk @@ -33,23 +33,19 @@ .IF "$(SOLAR_JAVA)"!="" .IF "$(ANT_HOME)" == "" -ANT_HOME*:=$(COMMON_BUILD_TOOLS)$/apache-ant-1.7.0 +ANT_HOME*:=$(COMMON_BUILD_TOOLS)/apache-ant-1.7.0 .EXPORT : ANT_HOME .ENDIF -ANT_LIB*:=$(ANT_HOME)$/lib +ANT_LIB*:=$(ANT_HOME)/lib -ANT_CLASSPATH:=$(ANT_LIB)$/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)$/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)$/ant.jar +ANT_CLASSPATH:=$(ANT_LIB)/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar # PATH_SEPERATOR won't work here as it is defined # as ; for wondows (all shells) -#PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR)$(PATH) -.IF "$(USE_SHELL)"=="4nt" -PATH!:=$(ANT_HOME)$/bin;$(PATH) -.ELSE # "$(USE_SHELL)"=="4nt" -PATH!:=$(ANT_HOME)$/bin:$(PATH) -.ENDIF # "$(USE_SHELL)"=="4nt" +#PATH!:=$(ANT_HOME)/bin$(PATH_SEPERATOR)$(PATH) +PATH!:=$(ANT_HOME)/bin:$(PATH) -ANT*:=$(ANT_HOME)$/bin$/ant +ANT*:=$(ANT_HOME)/bin/ant ANT_BUILDFILE*=build.xml .IF "$(ANT_DEBUG)"=="" diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk index 356746321aa7..6571d60d3ab0 100644 --- a/solenv/inc/cppunit.mk +++ b/solenv/inc/cppunit.mk @@ -45,7 +45,7 @@ # cat cppunit.mk | mkunroll >_cppunit.mk # all between begin and end will repeat n times (at the moment n=10) to create such iterations # $(TNR) is the number -# $(SHL$(TNR)TARGETN) is the same like $(OUT)$/bin$/$(SHL1TARGET) for every number, within unix, "bin" is replaced by "lib" +# $(SHL$(TNR)TARGETN) is the same like $(OUT)/bin/$(SHL1TARGET) for every number, within unix, "bin" is replaced by "lib" #.IF "$(TESTOPT)"=="" # TESTOPT="-onlyerrors" diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk index dc4771420a7c..25dfa76a4b4d 100644 --- a/solenv/inc/extension_post.mk +++ b/solenv/inc/extension_post.mk @@ -29,90 +29,90 @@ # #************************************************************************* -.SOURCE.xcu : $(MISC)$/$(EXTNAME)$/merge $(MISC)$/$(EXTNAME)$/registry$/data $(MISC)$/$(COMPONENT_SHARED_CONFIG)_in$/merge $(MISC)$/$(COMPONENT_SHARED_CONFIG)_in$/registry$/data $(COMPONENT_CONFIGDIR) . -.SOURCE.xcs : $(MISC)$/$(EXTNAME)$/registry $(MISC)$/$(EXTNAME)$/registry$/schema . +.SOURCE.xcu : $(MISC)/$(EXTNAME)/merge $(MISC)/$(EXTNAME)/registry/data $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/merge $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/registry/data $(COMPONENT_CONFIGDIR) . +.SOURCE.xcs : $(MISC)/$(EXTNAME)/registry $(MISC)/$(EXTNAME)/registry/schema . -fixme=$(MISC)$/$(EXTNAME)$/merge$/$(MISC) +fixme=$(MISC)/$(EXTNAME)/merge/$(MISC) fixme2=$(fixme:n) -fixme3=$(MISC)$/$(EXTNAME)$/$(MISC) +fixme3=$(MISC)/$(EXTNAME)/$(MISC) fixme4=$(fixme:n) -$(EXTENSIONDIR)$/$(COMPONENT_CONFIGDEST)$/%.xcu : %.xcu +$(EXTENSIONDIR)/$(COMPONENT_CONFIGDEST)/%.xcu : %.xcu # ugly hacking to workaround prepended first source path @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d)) $(GNUCOPY) $< $(subst,$(fixme2),$(MISC) $@) -$(EXTENSIONDIR)$/$(COMPONENT_CONFIGDESTSCHEMA)$/%.xcs : %.xcs +$(EXTENSIONDIR)/$(COMPONENT_CONFIGDESTSCHEMA)/%.xcs : %.xcs @@-$(MKDIRHIER) $(subst,$(fixme4),$(MISC) $(@:d)) $(GNUCOPY) $< $(subst,$(fixme4),$(MISC) $@) -$(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar +$(EXTENSIONDIR)/%.jar : $(SOLARBINDIR)/%.jar @@-$(MKDIRHIER) $(@:d) $(GNUCOPY) $< $@ .IF "$(COMPONENT_FILES)"!="" -COMPONENT_FILES_SRC*=.$/ +COMPONENT_FILES_SRC*=./ # ugly hacking to workaround prepended first source path - also hits # here in case of "just copied" .xcu files -$(COMPONENT_FILES) : $$(@:s|$(fixme2)|$(MISC)|:s|$(EXTENSIONDIR)$/|$(COMPONENT_FILES_SRC)|) +$(COMPONENT_FILES) : $$(@:s|$(fixme2)|$(MISC)|:s|$(EXTENSIONDIR)/|$(COMPONENT_FILES_SRC)|) @@-$(MKDIRHIER) $(@:s|$(fixme2)|$(MISC)|:d) $(COPY) $< $(@:s|$(fixme2)|$(MISC)|) .ENDIF # "$(COMPONENT_FILES)"!="" .IF "$(COMPONENT_JARFILES)"!="" -$(COMPONENT_JARFILES) : $(CLASSDIR)$/$$(@:f) +$(COMPONENT_JARFILES) : $(CLASSDIR)/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ .ENDIF # "$(COMPONENT_JARFILES)"!="" .IF "$(COMPONENT_LIBRARIES)"!="" # TODO(Q3): strip the binary? -$(COMPONENT_LIBRARIES) : $(DLLDEST)$/$$(@:f) +$(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ .IF "$(OS)$(CPU)"=="WNTI" .IF "$(COM)"=="GCC" - $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/mingwm10.dll $(EXTENSIONDIR) .IF "$(MINGW_GCCDLL)"!="" - $(GNUCOPY) $(SOLARBINDIR)$/$(MINGW_GCCDLL) $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/$(MINGW_GCCDLL) $(EXTENSIONDIR) .ENDIF .IF "$(MINGW_GXXDLL)"!="" - $(GNUCOPY) $(SOLARBINDIR)$/$(MINGW_GXXDLL) $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/$(MINGW_GXXDLL) $(EXTENSIONDIR) .ENDIF .ELSE .IF "$(PACKMS)"!="" .IF "$(CCNUMVER)" <= "001399999999" - $(GNUCOPY) $(PACKMS)$/msvcr71.dll $(EXTENSIONDIR) - $(GNUCOPY) $(PACKMS)$/msvcp71.dll $(EXTENSIONDIR) + $(GNUCOPY) $(PACKMS)/msvcr71.dll $(EXTENSIONDIR) + $(GNUCOPY) $(PACKMS)/msvcp71.dll $(EXTENSIONDIR) .ELSE # "$(CCNUMVER)" <= "001399999999" .IF "$(CCNUMVER)" <= "001499999999" - $(GNUCOPY) $(PACKMS)$/msvcr80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(PACKMS)$/msvcp80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(PACKMS)$/msvcm80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(PACKMS)$/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR) + $(GNUCOPY) $(PACKMS)/msvcr80.dll $(EXTENSIONDIR) + $(GNUCOPY) $(PACKMS)/msvcp80.dll $(EXTENSIONDIR) + $(GNUCOPY) $(PACKMS)/msvcm80.dll $(EXTENSIONDIR) + $(GNUCOPY) $(PACKMS)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR) .ELSE # "$(CCNUMVER)" <= "001499999999" - $(GNUCOPY) $(PACKMS)$/msvcr90.dll $(EXTENSIONDIR) - $(GNUCOPY) $(PACKMS)$/msvcp90.dll $(EXTENSIONDIR) - $(GNUCOPY) $(PACKMS)$/msvcm90.dll $(EXTENSIONDIR) - $(GNUCOPY) $(PACKMS)$/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR) + $(GNUCOPY) $(PACKMS)/msvcr90.dll $(EXTENSIONDIR) + $(GNUCOPY) $(PACKMS)/msvcp90.dll $(EXTENSIONDIR) + $(GNUCOPY) $(PACKMS)/msvcm90.dll $(EXTENSIONDIR) + $(GNUCOPY) $(PACKMS)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR) .ENDIF # "$(CCNUMVER)" <= "001499999999" .ENDIF # "$(CCNUMVER)" <= "001399999999" .ELSE # "$(PACKMS)"!="" .IF "$(CCNUMVER)" <= "001399999999" - $(GNUCOPY) $(SOLARBINDIR)$/msvcr71.dll $(EXTENSIONDIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcp71.dll $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/msvcr71.dll $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/msvcp71.dll $(EXTENSIONDIR) .ELSE # "$(CCNUMVER)" <= "001399999999" .IF "$(CCNUMVER)" <= "001499999999" - $(GNUCOPY) $(SOLARBINDIR)$/msvcr80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcp80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcm80.dll $(EXTENSIONDIR) - $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/msvcr80.dll $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/msvcp80.dll $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/msvcm80.dll $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR) .ELSE # "$(CCNUMVER)" <= "001499999999" - $(GNUCOPY) $(SOLARBINDIR)$/msvcr90.dll $(EXTENSIONDIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcp90.dll $(EXTENSIONDIR) - $(GNUCOPY) $(SOLARBINDIR)$/msvcm90.dll $(EXTENSIONDIR) - $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/msvcr90.dll $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/msvcp90.dll $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/msvcm90.dll $(EXTENSIONDIR) + $(GNUCOPY) $(SOLARBINDIR)/Microsoft.VC90.CRT.manifest $(EXTENSIONDIR) .ENDIF # "$(CCNUMVER)" <= "001499999999" .ENDIF # "$(CCNUMVER)" <= "001399999999" .ENDIF # "$(PACKMS)"!="" @@ -122,28 +122,28 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)$/$$(@:f) IMPLEMENTATION_IDENTIFIER*="com.sun.star.$(EXTENSIONNAME)-$(PLATFORMID)" -.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk +.INCLUDE .IGNORE : $(MISC)/$(TARGET)_lang_track.mk .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)" PHONYDESC=.PHONY .ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)" .IF "$(DESCRIPTION)"!="" $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC) @@-$(MKDIRHIER) $(@:d) - $(PERL) $(SOLARENV)$/bin$/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME) - @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk - $(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(MISC)$/desc.tmp.$(EXTNAME) + $(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME) + @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk + $(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(MISC)/desc.tmp.$(EXTNAME) @@-$(RM) $@.$(EXTNAME) - $(TYPE) $(MISC)$/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@ - @@-$(RM) $(MISC)$/desc.tmp.$(EXTNAME) + $(TYPE) $(MISC)/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@ + @@-$(RM) $(MISC)/desc.tmp.$(EXTNAME) .ENDIF # "$(DESCRIPTION)"!="" # default OOo license text!!! # may not fit... .IF "$(CUSTOM_LICENSE)"=="" .IF "$(GUI)" == "WNT" -PACKLICDEPS=$(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e) +PACKLICDEPS=$(SOLARBINDIR)/osl/license$$(@:b:s/_/./:e:s/./_/)$$(@:e) .ELSE # "$(GUI)" == "WNT" -PACKLICDEPS=$(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e) +PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e) .ENDIF # "$(GUI)" == "WNT" .ELSE # "$(CUSTOM_LICENSE)" == "" PACKLICDEPS=$(CUSTOM_LICENSE) @@ -161,7 +161,7 @@ $(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS) .IF "$(COMPONENT_MANIFEST_GENERIC)" == "" $(TYPE) $(MANIFEST_SRC) | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" | $(SED) "s/EXEC_EXTENSION/$(EXECPOST)/" > $@ .ELSE # "$(COMPONENT_MANIFEST_GENERIC)" != "" - $(PERL) $(SOLARENV)$/bin$/makemani.pl $(PRJ)$/util$/manifest.xml $(EXTENSIONDIR) $(COMPONENT_MANIFEST_SEARCHDIR) $(@:d:d) + $(PERL) $(SOLARENV)/bin/makemani.pl $(PRJ)/util/manifest.xml $(EXTENSIONDIR) $(COMPONENT_MANIFEST_SEARCHDIR) $(@:d:d) .ENDIF # "$(COMPONENT_MANIFEST_GENERIC)" != "" .ENDIF # "$(COMPONENT_MANIFEST)"!="" diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk index fd45a4498577..84a9d48fd804 100644 --- a/solenv/inc/extension_pre.mk +++ b/solenv/inc/extension_pre.mk @@ -29,24 +29,24 @@ # #************************************************************************* -EXTENSIONDIR*:=$(MISC)$/$(EXTENSIONNAME) +EXTENSIONDIR*:=$(MISC)/$(EXTENSIONNAME) COMPONENT_CONFIGDIR*:=. -COMPONENT_CONFIGDEST*:=registry$/data -COMPONENT_CONFIGDESTSCHEMA*:=registry$/schema +COMPONENT_CONFIGDEST*:=registry/data +COMPONENT_CONFIGDESTSCHEMA*:=registry/schema .IF "$(COMPONENT_COPYONLY)"=="" -DESCRIPTION:=$(EXTENSIONDIR)$/description.xml +DESCRIPTION:=$(EXTENSIONDIR)/description.xml DESCRIPTION_SRC*:=description.xml -COMPONENT_MANIFEST*:=$(EXTENSIONDIR)$/META-INF$/manifest.xml +COMPONENT_MANIFEST*:=$(EXTENSIONDIR)/META-INF/manifest.xml MANIFEST_SRC*:=manifest.xml .IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT" -PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)$/registration$/license_$i.txt) +PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/license_$i.txt) COMPONENT_LIC_TEMPL*:=registration/license_xxx.txt .ELSE -PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)$/registration$/LICENSE_$i) +PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/LICENSE_$i) COMPONENT_LIC_TEMPL*:=registration/LICENSE_xxx .ENDIF diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk index 46bb537c86cf..6d34ced82a61 100644 --- a/solenv/inc/javaunittest.mk +++ b/solenv/inc/javaunittest.mk @@ -67,15 +67,15 @@ XCLASSPATH := $(CLASSDIR) .ELSE XCLASSPATH !:= $(XCLASSPATH)$(PATH_SEPERATOR)$(CLASSDIR) .ENDIF -CLASSDIR !:= $(CLASSDIR)$/test +CLASSDIR !:= $(CLASSDIR)/test .INCLUDE: target.mk ALLTAR: $(TESTS) -$(JAVAFILES): $(MISC)$/$(TARGET).classdir.flag +$(JAVAFILES): $(MISC)/$(TARGET).classdir.flag -$(MISC)$/$(TARGET).classdir.flag: +$(MISC)/$(TARGET).classdir.flag: - $(MKDIR) $(CLASSDIR) $(TOUCH) $@ @@ -85,26 +85,26 @@ $(TESTS): $(JAVACLASSFILES) %.test .PHONY: %.java $(JAVAI) $(JAVACPS) $(CLASSPATH) org.openoffice.Runner -TestBase java_complex \ - -NoOffice yes -o $(subst,$/,. $(subst,.test, $(PACKAGE).$@)) + -NoOffice yes -o $(subst,/,. $(subst,.test, $(PACKAGE).$@)) .IF "$(IDLTESTFILES)" != "" # The following dependency (to execute javac whenever javamaker has run) does # not work reliably, see #i28827#: -$(JAVAFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET).javamaker.flag +$(JAVAFILES) $(JAVACLASSFILES): $(MISC)/$(TARGET).javamaker.flag -$(MISC)$/$(TARGET).javamaker.flag: $(MISC)$/$(TARGET).rdb - $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD $< -X$(SOLARBINDIR)$/types.rdb +$(MISC)/$(TARGET).javamaker.flag: $(MISC)/$(TARGET).rdb + $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD $< -X$(SOLARBINDIR)/types.rdb $(TOUCH) $@ -$(MISC)$/$(TARGET).rdb .ERRREMOVE: \ - $(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)$/$(TARGET)$/$i)) +$(MISC)/$(TARGET).rdb .ERRREMOVE: \ + $(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)/$(TARGET)/$i)) - rm $@ $(REGMERGE) $@ /UCR $< -$(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)$/$(TARGET)$/$i)): \ +$(foreach,i,$(IDLTESTFILES) $(subst,.idl,.urd $(MISC)/$(TARGET)/$i)): \ $(IDLTESTFILES) - - $(MKDIR) $(MISC)$/$(TARGET) - $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< + - $(MKDIR) $(MISC)/$(TARGET) + $(IDLC) -O$(MISC)/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< .ENDIF diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 1ae4eeb9d11d..0d46f3ff9102 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -36,7 +36,7 @@ LIBSMKREV!:="$$Revision: 1.134.2.3 $$" #externe libs in plattform.mk # .IF "$(GUI)$(COM)"=="WNTGCC" -AWTLIB*=$(JAVA_HOME)$/lib$/jawt.lib +AWTLIB*=$(JAVA_HOME)/lib/jawt.lib .ELSE # "$(GUI)$(COM)"=="WNTGCC" AWTLIB*=-ljawt .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -54,7 +54,7 @@ ICUUCLIB=-licuuc ICUDATALIB=-licudata .ENDIF # "$(GUI)$(COM)"=="WNTGCC" I18NUTILLIB=-li18nutil$(COMID) -.INCLUDE .IGNORE : i18npool$/version.mk +.INCLUDE .IGNORE : i18npool/version.mk I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID) I18NPAPERLIB=-li18npaper$(DLLPOSTFIX) .IF "$(GUI)$(COM)"=="WNTGCC" @@ -63,7 +63,7 @@ SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX) -.INCLUDE .IGNORE : comphelper$/version.mk +.INCLUDE .IGNORE : comphelper/version.mk COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID) CONNECTIVITYLIB=-lconnectivity LDAPBERLIB=-lldapber @@ -77,7 +77,7 @@ CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID) CPPULIB=-luno_cppu CPPUHELPERLIB=-luno_cppuhelper$(COMID) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" -.INCLUDE .IGNORE : ucbhelper$/version.mk +.INCLUDE .IGNORE : ucbhelper/version.mk UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID) .IF "$(SYSTEM_OPENSSL)" == "YES" OPENSSLLIB=$(OPENSSL_LIBS) @@ -95,7 +95,7 @@ REGLIB=-lreg$(UDK_MAJOR) .ELSE # "$(GUI)$(COM)"=="WNTGCC" REGLIB=-lreg .ENDIF # "$(GUI)$(COM)"=="WNTGCC" -.INCLUDE .IGNORE : vos$/version.mk +.INCLUDE .IGNORE : vos/version.mk VOSLIB=-lvos$(VOS_MAJOR)$(COMID) XMLOFFLIB=-lxo$(DLLPOSTFIX) XMLOFFLLIB=-lxol @@ -106,7 +106,7 @@ SALLIB=-lsal$(UDK_MAJOR) STORELIB=-lstore SALLIB=-luno_sal .ENDIF # "$(GUI)$(COM)"=="WNTGCC" -.INCLUDE .IGNORE : connectivity$/version.mk +.INCLUDE .IGNORE : connectivity/version.mk ODBCLIB=-lodbc$(DLLPOSTFIX) ODBCBASELIB=-lodbcbase$(DLLPOSTFIX) DBFILELIB=-lfile$(DLLPOSTFIX) @@ -182,7 +182,6 @@ BTCOMMUNILIB=-lbtcommuni$(DLLPOSTFIX) AUTOMATIONLIB=-lsts$(DLLPOSTFIX) SVLLIB=-lsvl$(DLLPOSTFIX) TKTLIB=-ltkt$(DLLPOSTFIX) -SJLIB=-lj$(DLLPOSTFIX)_g GOODIESLIB=-lgo$(DLLPOSTFIX) SAXLIB=-lsax$(DLLPOSTFIX) MAILLIB=-lmail @@ -224,7 +223,7 @@ JPEG3RDLIB=-ljpeglib .IF "$(SYSTEM_NEON)" == "YES" || "$(GUI)$(COM)"=="WNTGCC" NEON3RDLIB=-lneon .ELIF "$(OS)" == "MACOSX" -NEON3RDLIB=$(SOLARLIBDIR)$/libneon.a +NEON3RDLIB=$(SOLARLIBDIR)/libneon.a .ELSE NEON3RDLIB=$(STATIC) -lneon $(DYNAMIC) .ENDIF @@ -350,7 +349,11 @@ AVMEDIALIB=iavmedia.lib ICUINLIB=icuin.lib ICULELIB=icule.lib ICUUCLIB=icuuc.lib +.IF "$(GUI)"=="OS2" +ICUDATALIB=icudt.lib +.ELSE ICUDATALIB=icudata.lib +.ENDIF I18NUTILLIB=ii18nutil.lib I18NISOLANGLIB=ii18nisolang.lib I18NPAPERLIB=ii18npaper.lib @@ -421,7 +424,6 @@ MAILLIB=mail.lib DOCMGRLIB=docmgr.lib BASICLIB=basic.lib TKTLIB=tkt.lib -SJLIB=sj.lib SVXCORELIB=isvxcore.lib SVXMSFILTERLIB=isvxmsfilter.lib SVXLIB=isvx.lib diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 8ba46f8c5357..9fa07643c387 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m57(Build:9422) -BUILD=9422 -LAST_MINOR=m57 +RSCREVISION=300m60(Build:9425) +BUILD=9425 +LAST_MINOR=m60 SOURCEVERSION=DEV300 diff --git a/solenv/inc/os2.mk b/solenv/inc/os2.mk index bcaabeb459ea..03ad2f7a35da 100644 --- a/solenv/inc/os2.mk +++ b/solenv/inc/os2.mk @@ -83,7 +83,7 @@ LINKFLAGSDEBUG=/v LINKFLAGSOPT=/Oc .ENDIF -STDOBJVCL=$(L)$/salmain.obj +STDOBJVCL=$(L)/salmain.obj STDOBJGUI=c02.obj STDSLOGUI=c02d.obj STDOBJCUI=c02.obj @@ -189,7 +189,7 @@ LINKFLAGSOPT= LINKFLAGS+=/COD .ENDIF -STDOBJVCL=$(L)$/salmain.obj +STDOBJVCL=$(L)/salmain.obj STDOBJGUI= STDSLOGUI= STDOBJCUI= @@ -292,7 +292,7 @@ LINKFLAGSPROF= LINKFLAGSDEBUG=debug all op undefsok LINKFLAGSOPT= -STDOBJVCL=$(L)$/salmain.obj +STDOBJVCL=$(L)/salmain.obj STDOBJGUI=libr clib3s.lib libr plib3s.lib libr math387s.lib STDSLOGUI=libr clib3s.lib libr os2386.lib libr plib3s.lib libr math387s.lib STDOBJCUI=libr clib3s.lib libr plib3s.lib libr math387s.lib diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk index 662c8779c72d..8305a5d25e56 100644 --- a/solenv/inc/os2gcci.mk +++ b/solenv/inc/os2gcci.mk @@ -50,7 +50,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" .IF "$(ttt)"!="" CDEFS+=-E @@ -245,7 +245,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=stdc432 gcc432 # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.obj +STDOBJVCL=$(L)/salmain.obj STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/pkg_config.mk b/solenv/inc/pkg_config.mk index d5c00db2315e..4c04de5b5520 100644 --- a/solenv/inc/pkg_config.mk +++ b/solenv/inc/pkg_config.mk @@ -32,11 +32,11 @@ .INCLUDE .IGNORE : pkgroot.mk .IF "$(PKGCONFIG_ROOT)"!="" -PKG_CONFIG=$(PKGCONFIG_ROOT)$/bin$/pkg-config +PKG_CONFIG=$(PKGCONFIG_ROOT)/bin/pkg-config .IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U" -PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)$/lib$/64$/pkgconfig +PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)/lib/64/pkgconfig .ELSE -PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)$/lib$/pkgconfig +PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)/lib/pkgconfig .ENDIF .EXPORT : PKG_CONFIG_PATH PKGCONFIG_PREFIX=--define-variable=prefix=$(PKGCONFIG_ROOT) diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk index 26689c9acd9a..3101d0a6ac01 100644 --- a/solenv/inc/postset.mk +++ b/solenv/inc/postset.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -35,6 +35,116 @@ defaultlangiso=en-US # Complete list of all supported ISO codes -completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr hu it ja ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu + +completelangiso=\ + af \ + ar \ + as-IN \ + ast \ + be-BY \ + bg \ + bn \ + bn-BD \ + bn-IN \ + br \ + brx \ + bs \ + by \ + ca \ + cs \ + cy \ + da \ + de \ + dgo \ + dz \ + el \ + en-GB \ + en-US \ + en-ZA \ + eo \ + es \ + et \ + eu \ + fa \ + fi \ + fr \ + ga \ + gd \ + gl \ + gu \ + gu-IN \ + he \ + hi-IN \ + hr \ + hu \ + is \ + it \ + ja \ + ka \ + kk \ + km \ + kn \ + ko \ + kok \ + ks \ + ku \ + lo \ + lt \ + lv \ + mai \ + mk \ + ml-IN \ + mn \ + mni \ + mr-IN \ + ms \ + my \ + nb \ + ne \ + nl \ + nn \ + nr \ + ns \ + oc \ + om \ + or-IN \ + pa-IN \ + pl \ + pt \ + pt-BR \ + ro \ + ru \ + rw \ + sa-IN \ + sat \ + sc \ + sd \ + sh \ + sk \ + sl \ + so \ + sr \ + ss \ + st \ + sv \ + sw \ + sw-TZ \ + ta-IN \ + te-IN \ + tg \ + th \ + ti-ER \ + tn \ + tr \ + ts \ + uk \ + ur-IN \ + uz \ + ve \ + vi \ + xh \ + zh-CN \ + zh-TW \ + zu alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG))))) diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index a5555bdf6dd2..aa9813acbb05 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -36,30 +36,30 @@ .IF "$(SECOND_BUILD)"!="" .IF "$($(SECOND_BUILD)_OBJFILES)"!="" -$(OBJ)$/$(SECOND_BUILD)_%.obj : %.cxx +$(OBJ)/$(SECOND_BUILD)_%.obj : %.cxx @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx .ENDIF -$(OBJ)$/$(SECOND_BUILD)_%.obj : %.c +$(OBJ)/$(SECOND_BUILD)_%.obj : %.c @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$(SECOND_BUILD)_$*.o $*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -80,12 +80,12 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c .IF "$($(SECOND_BUILD)_SLOFILES)"!="" -$(SLO)$/$(SECOND_BUILD)_%.obj : %.cxx +$(SLO)/$(SECOND_BUILD)_%.obj : %.cxx @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -93,18 +93,18 @@ $(SLO)$/$(SECOND_BUILD)_%.obj : %.cxx .ELSE @-$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx .ELSE - $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) + $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx ) .ENDIF .ENDIF -$(SLO)$/$(SECOND_BUILD)_%.obj : %.c +$(SLO)/$(SECOND_BUILD)_%.obj : %.c @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $*.c .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -112,10 +112,10 @@ $(SLO)$/$(SECOND_BUILD)_%.obj : %.c .ELSE @-$(RM) $@ .IF "$(COM)"=="GCC" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c .ELSE - $(TYPE) $(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) - $(CC) @$(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $*.c ) + $(TYPE) $(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c ) + $(CC) @$(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c ) .ENDIF .ENDIF @@ -127,8 +127,8 @@ $(SLO)$/$(SECOND_BUILD)_%.obj : %.c #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .IF "$(PARFILES)"!="" -ULFPARFILES=$(foreach,i,$(ULFFILES) $(foreach,j,$(SCP_PRODUCT_TYPE) $(PAR)$/$j$/$(i:b).par)) -MOREPARFILES=$(foreach,i,$(PARFILES) $(foreach,j,$(SCP_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +ULFPARFILES=$(foreach,i,$(ULFFILES) $(foreach,j,$(SCP_PRODUCT_TYPE) $(PAR)/$j/$(i:b).par)) +MOREPARFILES=$(foreach,i,$(PARFILES) $(foreach,j,$(SCP_PRODUCT_TYPE) $(PAR)/$j/$i )) ALLPARFILES=$(uniq $(ULFPARFILES) $(MOREPARFILES)) SCP_PRODUCT_TYPE*=FAT @@ -139,23 +139,27 @@ LANGFILEEXT=mlf LANGFILEEXT=jlf .ENDIF -$(PAR)$/%.par : +$(PAR)/%.par : @echo ------------------------------ @echo Making: $@ - @@-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} -.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" - $(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre + @@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))} +.IF "$(GUI)"=="WNT" + $(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" - $(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 + $(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 .IF "$(common_build_srs)"!="" - $(SCPCOMP) -l {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(TARGET)$/$(@:b).$(LANGFILEEXT)} -s $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -o $@ + $(SCPCOMP) -l {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@ .ELSE # "$(common_build_srs)"!="" - $(SCPCOMP) -l {$(MISC)$/$(TARGET)$/$(@:b).$(LANGFILEEXT)} -s $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -o $@ + $(SCPCOMP) -l {$(MISC)/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@ .ENDIF # "$(common_build_srs)"!="" # hacked version -# $(SCPCOMP) -l $(@:b).$(LANGFILEEXT) -s $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).pre -o $@ +# $(SCPCOMP) -l $(@:b).$(LANGFILEEXT) -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@ .ENDIF # "$(PARFILES)"!="" @@ -167,12 +171,12 @@ $(PAR)$/%.par : some_unique_variable_name:=1 .IF "$(OS)" == "WNT" -REGEXP:="s/^[\#].*$$//" +REGEXP:="s/^[\#].*//" .ELSE -REGEXP:='s/^[\#].*$$//' +REGEXP:='s/^[\#].*//' .ENDIF -$(MISC)$/%.exp : sce$/%.sce +$(MISC)/%.exp : sce/%.sce @@-$(RM) $@ @@-$(RM) $(@:d)$(@:b).tst $(TYPE) $< | sed $(REGEXP) | sed "s/^/test_/" > $(@:d)$(@:b).tst diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 0496b949bf92..17e84d09ec59 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -31,12 +31,12 @@ MKFILENAME:=RULES.MK -$(OBJ)$/%.obj : %.cxx +$(OBJ)/%.obj : %.cxx @echo ------------------------------ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" .IF "$(noadjust)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) @@ -46,22 +46,22 @@ $(OBJ)$/%.obj : %.cxx .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx .ELSE - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" -$(OBJ)$/%.obj : %.cpp +$(OBJ)/%.obj : %.cpp @echo ------------------------------ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -69,22 +69,22 @@ $(OBJ)$/%.obj : %.cpp .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp .ELSE - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" -$(OBJ)$/%.obj : %.cc +$(OBJ)/%.obj : %.cc @echo ------------------------------ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cc + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -92,76 +92,76 @@ $(OBJ)$/%.obj : %.cc .ELSE @@$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc .ELSE - $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc ) + $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc ) .ENDIF .ENDIF .IF "$(ENABLE_PCH)"!="" # workaround for file locking problems on network volumes .IF "$(NETWORK_BUILD)"=="" -PCHOUTDIR=$(SLO)$/pch -PCHEXOUTDIR=$(SLO)$/pch_ex +PCHOUTDIR=$(SLO)/pch +PCHEXOUTDIR=$(SLO)/pch_ex .ELSE # "$(NETWORK_BUILD)"=="" -PCHOUTDIR=$(TMP)$/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)$(PROEXT) -PCHEXOUTDIR=$(TMP)$/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)_ex$(PROEXT) +PCHOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)$(PROEXT) +PCHEXOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)_ex$(PROEXT) .ENDIF # "$(NETWORK_BUILD)"=="" -$(SLO)$/precompiled.% .PHONY: - -$(MKDIRHIER) $(SLO)$/pch +$(SLO)/precompiled.% .PHONY: + -$(MKDIRHIER) $(SLO)/pch .IF "$(COM)"=="MSC" .IF "$(NETWORK_BUILD)"!="" -$(MKDIRHIER) $(PCHOUTDIR) .IF "$(HAVE_BIG_TMP)"=="" - -$(COPY) $(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) + -$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" - $(CXX) @$(mktmp -Fp$(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)$/precompiled_$(PRJNAME).cxx) + $(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx) .IF "$(NETWORK_BUILD)"!="" - $(COPY) $(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) .IF "$(HAVE_BIG_TMP)"=="" - $(RM) $(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(RMDIR) $(PCHOUTDIR) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000" - $(CXX) -o$(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx - @echo "#error Tried to use wrong precompiled header" > $(SLO)$/pch$/precompiled_$(PRJNAME).hxx + $(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx + @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx .ELSE # "$(COM)"=="MSC" - $(TOUCH) $(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(TOUCH) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(COM)"=="MSC" - @echo USED_PCHFLAGS=$(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF$(CFLAGSAPPEND)> $(INCCOM)$/pch.mk + @echo USED_PCHFLAGS=$(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF$(CFLAGSAPPEND)> $(INCCOM)/pch.mk -$(SLO)$/precompiled_ex.% .PHONY: - -$(MKDIRHIER) $(SLO)$/pch_ex +$(SLO)/precompiled_ex.% .PHONY: + -$(MKDIRHIER) $(SLO)/pch_ex .IF "$(COM)"=="MSC" .IF "$(NETWORK_BUILD)"!="" -$(MKDIRHIER) $(PCHEXOUTDIR) .IF "$(HAVE_BIG_TMP)"=="" - -$(COPY) $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) + -$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" - $(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)$/precompiled_$(PRJNAME).cxx) + $(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx) .IF "$(NETWORK_BUILD)"!="" - $(COPY) $(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) .IF "$(HAVE_BIG_TMP)"=="" - $(RM) $(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(RMDIR) $(PCHEXOUTDIR) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000" - $(CXX) -o$(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx - @echo "#error Tried to use wrong precompiled header" > $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx + $(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx + @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx .ELSE # "$(COM)"=="MSC" - $(TOUCH) $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST) + $(TOUCH) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(COM)"=="MSC" - @echo USED_EXCEPTIONS_PCHFLAGS=$(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)$/pch_ex.mk + @echo USED_EXCEPTIONS_PCHFLAGS=$(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)/pch_ex.mk -.INCLUDE .IGNORE : $(INCCOM)$/pch.mk -.INCLUDE .IGNORE : $(INCCOM)$/pch_ex.mk +.INCLUDE .IGNORE : $(INCCOM)/pch.mk +.INCLUDE .IGNORE : $(INCCOM)/pch_ex.mk .ENDIF # "$(ENABLE_PCH)"!="" -$(SLO)$/%.obj : %.cxx +$(SLO)/%.obj : %.cxx @echo ------------------------------ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) @@ -178,10 +178,10 @@ $(SLO)$/%.obj : %.cxx .ENDIF # "$(ENABLE_PCH)"!="" .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E $(CFLAGSINCXX)$(PWD)/$*.cxx .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT) + $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT) .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(CAPTURE_COMMAND)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -190,26 +190,26 @@ $(SLO)$/%.obj : %.cxx .ELSE # "$(GUI)"=="UNX" @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT) + $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT) .ELSE - $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT) + $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT) .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="UNX" .IF "$(nodep)"=="" # fixme: write to file - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" -$(SLO)$/%.obj : %.cpp +$(SLO)/%.obj : %.cpp @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(PWD)$/$*.cpp + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(PWD)/$*.cpp .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -218,25 +218,25 @@ $(SLO)$/%.obj : %.cpp .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp .ELSE - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" -$(SLO)$/%.obj : $(MISC)$/%.cxx +$(SLO)/%.obj : $(MISC)/%.cxx @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -244,43 +244,43 @@ $(SLO)$/%.obj : $(MISC)$/%.cxx .ENDIF .ELSE .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx .ELSE - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $@ ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $@ ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" -$(SLO)$/%.obj : $(MISC)$/%.cc +$(SLO)/%.obj : $(MISC)/%.cc @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)$/$*.cc + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cc + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cc .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE - $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cc ) + $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cc ) .ENDIF -$(OBJ)$/%.obj : $(MISC)$/%.cxx +$(OBJ)/%.obj : $(MISC)/%.cxx @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -288,25 +288,25 @@ $(OBJ)$/%.obj : $(MISC)$/%.cxx .ENDIF .ELSE .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx .ELSE - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" -$(OBJ)$/%.obj : %.c +$(OBJ)/%.obj : %.c @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" .IF "$(noadjust)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) @@ -316,23 +316,23 @@ $(OBJ)$/%.obj : %.c .ENDIF .ELSE .IF "$(COM)"=="GCC" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c .ELSE -@echo Cflags: $(CFLAGS) $(INCLUDE) - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" -$(OBJ)$/%.obj : $(MISC)$/%.c +$(OBJ)/%.obj : $(MISC)/%.c @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -340,22 +340,22 @@ $(OBJ)$/%.obj : $(MISC)$/%.c .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(MISC)$/$*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c .ELSE - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(MISC)$/$*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" -$(SLO)$/%.obj : $(MISC)$/%.c +$(SLO)/%.obj : $(MISC)/%.c @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -363,24 +363,24 @@ $(SLO)$/%.obj : $(MISC)$/%.c .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISC)$/$*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c .ELSE - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(MISC)$/$*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c .ENDIF .ENDIF .IF "$(nodep)"=="" $(TYPE) $(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) # avoid _version objects (see tg_shl.mk) - quite hacky... @noop $(!eq,$@,$(@:s/_version.obj/.obj/) $(NULL) $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))) .ENDIF # "$(nodep)"=="" -$(SLO)$/%.obj : %.c +$(SLO)/%.obj : %.c @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @@ -388,26 +388,26 @@ $(SLO)$/%.obj : %.c .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c .ELSE - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c + $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c .ENDIF .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" # Objective-C files -$(OBJ)$/%.obj : %.m +$(OBJ)/%.obj : %.m @echo ------------------------------ @echo Making: $@ .IF "$(OS)"=="MACOSX" .IF "$(TEST)"!="" - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.m + $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.m + $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -415,36 +415,36 @@ $(OBJ)$/%.obj : %.m .ENDIF "$(OS)"=="MACOSX" # Objective-C files -$(OBJ)$/%.obj : $(MISC)$/%.m +$(OBJ)/%.obj : $(MISC)/%.m @echo ------------------------------ @echo Making: $@ .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.m + $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE # "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C files is available for this platform" .ENDIF "$(OS)"=="MACOSX" # Objective-C files -$(SLO)$/%.obj : $(MISC)$/%.m +$(SLO)/%.obj : $(MISC)/%.m @echo ------------------------------ @echo Making: $@ .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.m + $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE # "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C files is available for this platform" .ENDIF "$(OS)"=="MACOSX" # Objective-C files -$(SLO)$/%.obj : %.m +$(SLO)/%.obj : %.m @echo ------------------------------ @echo Making: $@ .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.m + $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE # "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C files is available for this platform" @@ -452,23 +452,23 @@ $(SLO)$/%.obj : %.m # dependencies c / c++ -not_existing$/s_%.dpcc : %.c;@noop $(assign all_local_slo+:=$<) -not_existing$/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<) +not_existing/s_%.dpcc : %.c;@noop $(assign all_local_slo+:=$<) +not_existing/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<) # Objective-C++ files -$(OBJ)$/%.obj : %.mm +$(OBJ)/%.obj : %.mm @echo ------------------------------ @echo Making: $@ .IF "$(OS)"=="MACOSX" .IF "$(TEST)"!="" - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm + $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm + $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" .ELSE # "$(OS)"=="MACOSX" @@ -476,15 +476,15 @@ $(OBJ)$/%.obj : %.mm .ENDIF # "$(OS)"=="MACOSX" # Objective-C++ files -$(OBJ)$/%.obj : $(MISC)$/%.mm +$(OBJ)/%.obj : $(MISC)/%.mm @echo ------------------------------ @echo Making: $@ .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.mm + $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)$/o_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" .ELSE # "$(OS)"=="MACOSX" @@ -492,15 +492,15 @@ $(OBJ)$/%.obj : $(MISC)$/%.mm .ENDIF # "$(OS)"=="MACOSX" # Objective-C++ files -$(SLO)$/%.obj : $(MISC)$/%.mm +$(SLO)/%.obj : $(MISC)/%.mm @echo ------------------------------ @echo Making: $@ .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.mm + $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" .ELSE # "$(OS)"=="MACOSX" @@ -508,30 +508,30 @@ $(SLO)$/%.obj : $(MISC)$/%.mm .ENDIF # "$(OS)"=="MACOSX" # Objective-C++ files -$(SLO)$/%.obj : %.mm +$(SLO)/%.obj : %.mm @echo ------------------------------ @echo Making: $@ .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.mm + $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .IF "$(nodep)"=="" - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)$/s_$(@:f:s/.obj/.dpcc/) + $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/) @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)) .ENDIF # "$(nodep)"=="" .ELSE # "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C++ files is available for this platform" .ENDIF # "$(OS)"=="MACOSX" -$(MISC)$/%.dpslo : +$(MISC)/%.dpslo : @echo making .dpslo @@$(RM) $@ @@-$(CDD) $(MISC) && $(!null,$(all_local_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_slo:b:+".dpcc") s_$(i)) > $(@:f) @@-$(CDD) $(MISC) && $(!null,$(all_misc_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_slo:b:+".dpcc") s_$(i)) >> $(@:f) - @$(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i) $(foreach,i,$(all_misc_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)$/s_$i)) >> $@ + @$(TYPE) $(mktmp $(foreach,i,$(all_local_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i) $(foreach,i,$(all_misc_slo:b:+".dpcc") $(@:s#\#/#:^"\n") : $(MISC:s#\#/#)/s_$i)) >> $@ @$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_slo:b:+".dpcc":^"s_") $(all_misc_slo:b:+".dpcc":^"s_")) >> $@ -$(MISC)$/%.dpobj : +$(MISC)/%.dpobj : @echo making .dpobj @@$(RM) $@ @@-$(CDD) $(MISC) && $(!null,$(all_local_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_obj:b:+".dpcc") o_$(i)) > $(@:f) @@ -540,104 +540,99 @@ $(MISC)$/%.dpobj : @$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_obj:b:+".dpcc":^"s_") $(all_misc_obj:b:+".dpcc":^"s_")) >> $@ # see also %.dpslo -not_existing$/s_%.dpcc : %.cxx;@noop $(assign all_local_slo+:=$<) -not_existing$/o_%.dpcc : %.cxx;@noop $(assign all_local_obj+:=$<) +not_existing/s_%.dpcc : %.cxx;@noop $(assign all_local_slo+:=$<) +not_existing/o_%.dpcc : %.cxx;@noop $(assign all_local_obj+:=$<) -not_existing$/s_%.dpcc : %.cpp;@noop $(assign all_local_slo+:=$<) -not_existing$/o_%.dpcc : %.cpp;@noop $(assign all_local_obj+:=$<) +not_existing/s_%.dpcc : %.cpp;@noop $(assign all_local_slo+:=$<) +not_existing/o_%.dpcc : %.cpp;@noop $(assign all_local_obj+:=$<) -not_existing$/s_%.dpcc : $(MISC)$/%.c;@noop $(assign all_misc_slo+:=$<) -not_existing$/o_%.dpcc : $(MISC)$/%.c;@noop $(assign all_misc_obj+:=$<) +not_existing/s_%.dpcc : $(MISC)/%.c;@noop $(assign all_misc_slo+:=$<) +not_existing/o_%.dpcc : $(MISC)/%.c;@noop $(assign all_misc_obj+:=$<) -not_existing$/s_%.dpcc : $(MISC)$/%.cxx;@noop $(assign all_misc_slo+:=$<) -not_existing$/o_%.dpcc : $(MISC)$/%.cxx;@noop $(assign all_misc_obj+:=$<) +not_existing/s_%.dpcc : $(MISC)/%.cxx;@noop $(assign all_misc_slo+:=$<) +not_existing/o_%.dpcc : $(MISC)/%.cxx;@noop $(assign all_misc_obj+:=$<) -not_existing$/s_%.dpcc : %.mm;@noop $(assign all_local_slo+:=$<) -not_existing$/o_%.dpcc : %.mm;@noop $(assign all_local_obj+:=$<) +not_existing/s_%.dpcc : %.mm;@noop $(assign all_local_slo+:=$<) +not_existing/o_%.dpcc : %.mm;@noop $(assign all_local_obj+:=$<) -not_existing$/s_%.dpcc : $(MISC)$/%.mm;@noop $(assign all_misc_slo+:=$<) -not_existing$/o_%.dpcc : $(MISC)$/%.mm;@noop $(assign all_misc_obj+:=$<) +not_existing/s_%.dpcc : $(MISC)/%.mm;@noop $(assign all_misc_slo+:=$<) +not_existing/o_%.dpcc : $(MISC)/%.mm;@noop $(assign all_misc_obj+:=$<) # dependencies objective-c -$(MISC)$/s_%.dpcc : %.m +$(MISC)/s_%.dpcc : %.m @@-$(RM) $@ @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@ - @echo $@ : $(SLO)$/$(<:b).obj >> $@ + @echo $@ : $(SLO)/$(<:b).obj >> $@ -$(MISC)$/o_%.dpcc : %.m +$(MISC)/o_%.dpcc : %.m @@-$(RM) $@ @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@ - @echo $@ : $(OBJ)$/$(<:b).obj >> $@ + @echo $@ : $(OBJ)/$(<:b).obj >> $@ -$(MISC)$/s_%.dpcc : $(MISC)$/%.m +$(MISC)/s_%.dpcc : $(MISC)/%.m @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@ + @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@ .ELSE # "$(GUI)"=="UNX" @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@ .ENDIF # "$(GUI)"=="UNX" - @echo $@ : $(SLO)$/$(<:b).obj >> $@ + @echo $@ : $(SLO)/$(<:b).obj >> $@ -$(MISC)$/o_%.dpcc : $(MISC)$/%.m +$(MISC)/o_%.dpcc : $(MISC)/%.m @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@ + @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@ .ELSE # "$(GUI)"=="UNX" @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@ .ENDIF # "$(GUI)"=="UNX" - @echo $@ : $(OBJ)$/$(<:b).obj >> $@ + @echo $@ : $(OBJ)/$(<:b).obj >> $@ # dependency dummy for *.s files -$(MISC)$/s_%.dpcc : %.s +$(MISC)/s_%.dpcc : %.s @@-$(RM) $@ @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@ - @echo $@ : $(SLO)$/$(<:b).obj >> $@ + @echo $@ : $(SLO)/$(<:b).obj >> $@ -$(MISC)$/s_%.dpcc : $(SLO)$/%.obj +$(MISC)/s_%.dpcc : $(SLO)/%.obj @noop $(assign DEPS_MISSING+:=$(@:f)) -$(MISC)$/o_%.dpcc : $(OBJ)$/%.obj +$(MISC)/o_%.dpcc : $(OBJ)/%.obj @noop $(assign DEPS_MISSING+:=$(@:f)) # dependencies script files -$(MISC)$/%.dpsc : +$(MISC)/%.dpsc : @@-$(RM) $@ - @@-$(MKDIR) $(MISC)$/{$(subst,$(@:d:d:d), $(@:d:d))} - @$(MAKEDEPEND) -f - -p$(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))} -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(*:b).scp > $@ - @echo $@ : $(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).par >> $@ - @echo $(PAR)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).par : $(*:b).scp >> $@ + @@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))} + @$(MAKEDEPEND) -f - -p$(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))} -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(*:b).scp > $@ + @echo $@ : $(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).par >> $@ + @echo $(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).par : $(*:b).scp >> $@ # dependencies rc files (native resources for windows) -$(MISC)$/%.dprc : +$(MISC)/%.dprc : @@-$(RM) $@ - @$(MAKEDEPEND) -f - -p$(RES) -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) -I$(SOLARENV)$/inc $(*:b).rc >> $@ -# @echo $@ : $(RES)$/{$(subst,$(@:d:d:d), $(@:d:d))}$/$(*:b).res >> $@ - @echo $@ : $(RES)$/$(*:b).res >> $@ + @$(MAKEDEPEND) -f - -p$(RES) -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) -I$(SOLARENV)/inc $(*:b).rc >> $@ +# @echo $@ : $(RES)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).res >> $@ + @echo $@ : $(RES)/$(*:b).res >> $@ -$(MISC)$/%.dpr : +$(MISC)/%.dpr : @echo ------------------------------ .IF "$(nodep)"=="" @echo Making: $@ @@-$(RM) $@ dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES) - -$(TYPE) $(MISC)$/$(TARGET).*.dprr >> $@ + -$(TYPE) $(MISC)/$(TARGET).*.dprr >> $@ .ENDIF # "$(nodep)"=="" -$(MISC)$/%.dpz : +$(MISC)/%.dpz : @echo ------------------------------ .IF "$(nodep)"=="" @echo Making: $@ @@-$(RM) $@ -# line too long on 4nt -.IF "$(USE_SHELL)"!="4nt" || "$(GUI)"=="OS2" dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true $(ZIPDEPFILES) -.ELSE # "$(USE_SHELL)"!="4nt" - $(TYPE) $(mktmp $(ZIPDEPFILES:s/\/\\/)) | $(XARGS) dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true -.ENDIF # "$(USE_SHELL)"!="4nt" $(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" | grep -v "\.svn" >> $@ echo zipdep_langs=$(alllangiso) >> $@ @@-$(RM) $(ZIPDEPFILES) @@ -645,7 +640,7 @@ $(MISC)$/%.dpz : # Dependencies fuer java - Files -$(MISC)$/%.dpj : +$(MISC)/%.dpj : @echo Making dpj... .IF "$(nodep)"!="" .IF "$(GUI)"=="UNX" @@ -662,108 +657,108 @@ $(MISC)$/%.dpj : .ENDIF .ENDIF # "$(nodep)"=="" -$(SLO)$/%.obj : %.asm +$(SLO)/%.obj : %.asm @echo ------------------------------ @echo Making: $@ .IF "$(COM)"=="GCC" .IF "$(ASM)"=="ml" - $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm + $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm @@-$(RM) $*.err .ELSE # "$(ASM)"=="ml" @@-$(RM) $@ - $(ASM) $(AFLAGS) $*.asm,$(SLO)$/$*.obj; + $(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj; .ENDIF # "$(ASM)"=="ml" .ELSE .IF "$(COM)"=="WTC" - $(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)$/$*.obj + $(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)/$*.obj -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) .ELSE .IF "$(COM)"=="MSC" .IF "$(ASM)"=="ml" - $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm + $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) .ELSE # "$(ASM)"=="ml" @@-$(RM) $@ - $(ASM) $(AFLAGS) $*.asm,$(SLO)$/$*.obj; + $(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj; .ENDIF # "$(ASM)"=="ml" .ENDIF "$(COM)"=="MSC" .ENDIF .ENDIF -$(OBJ)$/%.obj : %.asm +$(OBJ)/%.obj : %.asm @echo ------------------------------ @echo Making: $@ .IF "$(COM)"=="GCC" .IF "$(ASM)"=="ml" - $(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)$/$*.obj $*.asm + $(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm @@-$(RM) $*.err .ELSE # "$(ASM)"=="ml" @@-$(RM) $@ - $(ASM) $(AFLAGS) $*.asm,$(OBJ)$/$*.obj; + $(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj; .ENDIF # "$(ASM)"=="ml" .ELSE .IF "$(COM)"=="MSC" .IF "$(ASM)"=="ml" - $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)$/$*.obj $*.asm + $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI) .ELSE # "$(ASM)"=="ml" @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI) - $(ASM) $(AFLAGS) $*.asm,$(OBJ)$/$*.obj; + $(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj; .ENDIF # "$(ASM)"=="ml" .ENDIF "$(COM)"=="MSC" .ENDIF -$(OUT)$/ucr$/$(IDLPACKAGE)$/%.urd : %.idl +$(OUT)/ucr/$(IDLPACKAGE)/%.urd : %.idl @noop $(assign all_outdated_idl+:=$<) -$(OUT)$/ucrdoc$/$(IDLPACKAGE)$/%.urd : %.idl +$(OUT)/ucrdoc/$(IDLPACKAGE)/%.urd : %.idl @noop $(assign all_outdated_doc_idl+:=$<) # generate hid files -$(SRS)$/%.hid : %.src +$(SRS)/%.hid : %.src @echo ------------------------------ @echo Making hid $@ - $(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)$/bin$/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE) + $(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)/bin/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE) # make *.xml descriptions available in $(MISC) -$(MISC)$/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml +$(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml $(COPY) $< $@ # dummy rule to make sure xml file is in place when used in settings.mk -$(MISC)$/%.mk : $(MISC)$/%$($(WINVERSIONNAMES)_MAJOR).xml +$(MISC)/%.mk : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml $(TOUCH) $@ echo XML2MK_FILES += $(@:b) >> $@ #generate descriptions from xml -$(MISC)$/%$($(WINVERSIONNAMES)_MAJOR)_description.cxx : $(MISC)$/%$($(WINVERSIONNAMES)_MAJOR).xml - xml2cmp -func $(MISC)$/$*$($(WINVERSIONNAMES)_MAJOR)_description.cxx $< +$(MISC)/%$($(WINVERSIONNAMES)_MAJOR)_description.cxx : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml + xml2cmp -func $(MISC)/$*$($(WINVERSIONNAMES)_MAJOR)_description.cxx $< #generate private rdb -$(BIN)$/%.rdb: $(MISC)$/%$($(WINVERSIONNAMES)_MAJOR).xml - $(RDBMAKER) -BUCR -O$(BIN)$/$*.rdb @$(mktmp $(foreach,i,$($(@:b)_XML2CMPTYPES) -T$i ) $(COMPRDB)) +$(BIN)/%.rdb: $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml + $(RDBMAKER) -BUCR -O$(BIN)/$*.rdb @$(mktmp $(foreach,i,$($(@:b)_XML2CMPTYPES) -T$i ) $(COMPRDB)) #strip dos lineends -$(MISC)$/%.sh : %.sh +$(MISC)/%.sh : %.sh @@-$(RM) -f $@ @tr -d "\015" < $< > $@ # merge targets .IF "$(WITH_LANG)"!="" -$(COMMONMISC)$/$(TARGET)$/%.ulf : %.ulf +$(COMMONMISC)/$(TARGET)/%.ulf : %.ulf -$(MKDIR) $(@:d) -$(RM) $@ $(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(COMMONMISC)$/$(TARGET)$/%.xrb : %.xrb +$(COMMONMISC)/$(TARGET)/%.xrb : %.xrb -$(MKDIR) $(@:d) -$(RM) $@ $(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(COMMONMISC)$/$(MYPATH)$/%.xrm : %.xrm +$(COMMONMISC)/$(MYPATH)/%.xrm : %.xrm -$(MKDIRHIER) $(@:d) -$(RM) $@ echo trysdf = $(TRYSDF) @@ -771,14 +766,14 @@ $(COMMONMISC)$/$(MYPATH)$/%.xrm : %.xrm $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -#$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm +#$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm # -$(MKDIRHIER) $(@:d) # -$(RM) $@ # $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all # $(RENAME) $@.$(INPATH) $@ # -$(RM) $@.$(INPATH) # -#$(COMMONMISC)$/%.xrm : %.xrm +#$(COMMONMISC)/%.xrm : %.xrm # -$(MKDIR) $(@:d) # -$(RM) $@ # $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all @@ -787,9 +782,9 @@ $(COMMONMISC)$/$(MYPATH)$/%.xrm : %.xrm .ENDIF # "$(WITH_LANG)"!="" .IF "$(WITH_LANG)"!="" -$(COMMONMISC)$/$(TARGET)$/%.jlf : $$(@:db).ulf +$(COMMONMISC)/$(TARGET)/%.jlf : $$(@:db).ulf .ELSE # "$(WITH_LANG)"!="" -$(COMMONMISC)$/$(TARGET)$/%.jlf : $$(@:b).ulf +$(COMMONMISC)/$(TARGET)/%.jlf : $$(@:b).ulf .ENDIF # "$(WITH_LANG)"!="" @-$(MKDIRHIER) $(@:d) -$(RM) $@ @@ -798,20 +793,20 @@ $(COMMONMISC)$/$(TARGET)$/%.jlf : $$(@:b).ulf -$(RM) $@.$(INPATH) .IF "$(WITH_LANG)"!="" -$(COMMONMISC)$/$(TARGET)$/%.mlf : $$(@:db).ulf +$(COMMONMISC)/$(TARGET)/%.mlf : $$(@:db).ulf .ELSE # "$(WITH_LANG)"!="" -$(COMMONMISC)$/$(TARGET)$/%.mlf : $$(@:b).ulf +$(COMMONMISC)/$(TARGET)/%.mlf : $$(@:b).ulf .ENDIF # "$(WITH_LANG)"!="" @-$(MKDIRHIER) $(@:d) -$(RM) $@ - @$(ULFCONV) -o $@.$(INPATH) -t $(SOLARBINDIR)$/msi-encodinglist.txt $< + @$(ULFCONV) -o $@.$(INPATH) -t $(SOLARBINDIR)/msi-encodinglist.txt $< @$(RENAME) $@.$(INPATH) $@ @-$(RM) $@.$(INPATH) .IF "$(WITH_LANG)"!="" -$(COMMONMISC)$/$(TARGET)$/%.uulf : $$(@:db).ulf +$(COMMONMISC)/$(TARGET)/%.uulf : $$(@:db).ulf .ELSE # "$(WITH_LANG)"!="" -$(COMMONMISC)$/$(TARGET)$/%.uulf : $$(@:b).ulf +$(COMMONMISC)/$(TARGET)/%.uulf : $$(@:b).ulf .ENDIF # "$(WITH_LANG)"!="" @-$(MKDIRHIER) $(@:d) -$(RM) $@ @@ -820,7 +815,7 @@ $(COMMONMISC)$/$(TARGET)$/%.uulf : $$(@:b).ulf @-$(RM) $@.$(INPATH) # This is still needed????? -$(COMMONMISC)$/$(TARGET)$/%.xrm : %.xrm +$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm -$(MKDIR) $(@:d) -$(RM) $@ $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index 585a745aaa70..fb8178f7e510 100644 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -49,7 +49,7 @@ USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR USE_CFLAGS_X64+=$(CFLAGS_X64) USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS USE_CDEFS_X64+=$(CDEFS_X64) -INCLUDE_X64=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) +INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) .IF "$(product)" != "" USE_CFLAGS_X64+=-Gy @@ -97,58 +97,58 @@ STDSLOCUI_X64= IMPLIBFLAGS_X64=-machine:X64 -LIBPATH_X64=$(PSDK)$/lib$/x64 -LIBPATH_VC_X64=$(PSDK)$/vc$/lib$/x64 - -ADVAPI32LIB_X64=$(LIBPATH_X64)$/advapi32.lib -SHELL32LIB_X64=$(LIBPATH_X64)$/shell32.lib -GDI32LIB_X64=$(LIBPATH_X64)$/gdi32.lib -OLE32LIB_X64=$(LIBPATH_X64)$/ole32.lib -OLEAUT32LIB_X64=$(LIBPATH_X64)$/oleaut32.lib -UUIDLIB_X64=$(LIBPATH_X64)$/uuid.lib -WINSPOOLLIB_X64=$(LIBPATH_X64)$/winspool.lib -IMM32LIB_X64=$(LIBPATH_X64)$/imm32.lib -VERSIONLIB_X64=$(LIBPATH_X64)$/version.lib -WINMMLIB_X64=$(LIBPATH_X64)$/winmm.lib -WSOCK32LIB_X64=$(LIBPATH_X64)$/wsock32.lib -MPRLIB_X64=$(LIBPATH_X64)$/mpr.lib -WS2_32LIB_X64=$(LIBPATH_X64)$/ws2_32.lib -KERNEL32LIB_X64=$(LIBPATH_X64)$/kernel32.lib -USER32LIB_X64=$(LIBPATH_X64)$/user32.lib -COMDLG32LIB_X64=$(LIBPATH_X64)$/comdlg32.lib -COMCTL32LIB_X64=$(LIBPATH_X64)$/comctl32.lib -CRYPT32LIB_X64=$(LIBPATH_X64)$/crypt32.lib -GDIPLUSLIB_X64=$(LIBPATH_X64)$/gdiplus.lib -DBGHELPLIB_X64=$(LIBPATH_X64)$/dbghelp.lib -MSILIB_X64=$(LIBPATH_X64)$/msi.lib -DDRAWLIB_X64=$(LIBPATH_X64)$/ddraw.lib -SHLWAPILIB_X64=$(LIBPATH_X64)$/shlwapi.lib -URLMONLIB_X64=$(LIBPATH_X64)$/urlmon.lib -UNICOWSLIB_X64=$(LIBPATH_X64)$/unicows.lib -WININETLIB_X64=$(LIBPATH_X64)$/wininet.lib -OLDNAMESLIB_X64=$(LIBPATH_VC_X64)$/oldnames.lib -MSIMG32LIB_X64=$(LIBPATH_X64)$/msimg32.lib -MSVCPRT_X64=$(LIBPATH_VC_X64)$/msvcprt.lib -MSVCRT_X64=$(LIBPATH_VC_X64)$/msvcrt.lib - -MISC_X64=$(MISC)$/x64 -OBJ_X64=$(OBJ)$/x64 -SLO_X64=$(SLO)$/x64 -LB_X64=$(LB)$/x64 -SLB_X64=$(SLB)$/x64 +LIBPATH_X64=$(PSDK)/lib/x64 +LIBPATH_VC_X64=$(PSDK)/vc/lib/x64 + +ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib +SHELL32LIB_X64=$(LIBPATH_X64)/shell32.lib +GDI32LIB_X64=$(LIBPATH_X64)/gdi32.lib +OLE32LIB_X64=$(LIBPATH_X64)/ole32.lib +OLEAUT32LIB_X64=$(LIBPATH_X64)/oleaut32.lib +UUIDLIB_X64=$(LIBPATH_X64)/uuid.lib +WINSPOOLLIB_X64=$(LIBPATH_X64)/winspool.lib +IMM32LIB_X64=$(LIBPATH_X64)/imm32.lib +VERSIONLIB_X64=$(LIBPATH_X64)/version.lib +WINMMLIB_X64=$(LIBPATH_X64)/winmm.lib +WSOCK32LIB_X64=$(LIBPATH_X64)/wsock32.lib +MPRLIB_X64=$(LIBPATH_X64)/mpr.lib +WS2_32LIB_X64=$(LIBPATH_X64)/ws2_32.lib +KERNEL32LIB_X64=$(LIBPATH_X64)/kernel32.lib +USER32LIB_X64=$(LIBPATH_X64)/user32.lib +COMDLG32LIB_X64=$(LIBPATH_X64)/comdlg32.lib +COMCTL32LIB_X64=$(LIBPATH_X64)/comctl32.lib +CRYPT32LIB_X64=$(LIBPATH_X64)/crypt32.lib +GDIPLUSLIB_X64=$(LIBPATH_X64)/gdiplus.lib +DBGHELPLIB_X64=$(LIBPATH_X64)/dbghelp.lib +MSILIB_X64=$(LIBPATH_X64)/msi.lib +DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib +SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib +URLMONLIB_X64=$(LIBPATH_X64)/urlmon.lib +UNICOWSLIB_X64=$(LIBPATH_X64)/unicows.lib +WININETLIB_X64=$(LIBPATH_X64)/wininet.lib +OLDNAMESLIB_X64=$(LIBPATH_VC_X64)/oldnames.lib +MSIMG32LIB_X64=$(LIBPATH_X64)/msimg32.lib +MSVCPRT_X64=$(LIBPATH_VC_X64)/msvcprt.lib +MSVCRT_X64=$(LIBPATH_VC_X64)/msvcrt.lib + +MISC_X64=$(MISC)/x64 +OBJ_X64=$(OBJ)/x64 +SLO_X64=$(SLO)/x64 +LB_X64=$(LB)/x64 +SLB_X64=$(SLB)/x64 L_X64=$(SOLARLIBDIR_X64) -VERSIONOBJ_X64=$(SLO_X64)$/_version.obj -BIN_X64=$(BIN)$/x64 -RES_X64=$(RES)$/x64 -SOLARLIBDIR_X64=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)$/x64 +VERSIONOBJ_X64=$(SLO_X64)/_version.obj +BIN_X64=$(BIN)/x64 +RES_X64=$(RES)/x64 +SOLARLIBDIR_X64=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)/x64 LIB_X64:=$(LB_X64);$(SLB_X64);$(ILIB_X64) .IF "$(LIBTARGET)"=="" .IF "$(OBJFILES_X64)$(IDLOBJFILES_X64)"!="" -OBJTARGET_X64=$(LB_X64)$/$(TARGET).lib +OBJTARGET_X64=$(LB_X64)/$(TARGET).lib .ENDIF # "$(OBJFILES_X64)$(IDLOBJFILES_X64)"!="" .IF "$(SLOFILES_X64)$(IDLSLOFILES_x64)"!="" -SLOTARGET_X64=$(SLB_X64)$/$(TARGET).lib +SLOTARGET_X64=$(SLB_X64)/$(TARGET).lib .ENDIF # "$(SLOFILES_X64)$(IDLSLOFILES_x64)"!="" .ENDIF # "$(LIBTARGET)"=="" @@ -165,10 +165,10 @@ NOLIBSLOTARGET_X64=$(SLOFILES_X64) .ENDIF .IF "$(SHL1TARGET_X64)"!="" -SHL1TARGETN_X64=$(BIN_X64)$/$(DLLPRE)$(SHL1TARGET_X64)$(DLLPOST) +SHL1TARGETN_X64=$(BIN_X64)/$(DLLPRE)$(SHL1TARGET_X64)$(DLLPOST) .ENDIF .IF "$(SHL2TARGET_X64)"!="" -SHL2TARGETN_X64=$(BIN_X64)$/$(DLLPRE)$(SHL2TARGET_X64)$(DLLPOST) +SHL2TARGETN_X64=$(BIN_X64)/$(DLLPRE)$(SHL2TARGET_X64)$(DLLPOST) .ENDIF .IF "$(LIB1TARGET_X64)" != "" LIB1TARGETN_X64=$(LIB1TARGET_X64) @@ -177,10 +177,10 @@ LIB1TARGETN_X64=$(LIB1TARGET_X64) LIB2TARGETN_X64=$(LIB2TARGET_X64) .ENDIF .IF "$(DEF1NAME_X64)"!="" -DEF1TARGETN_X64=$(MISC_X64)$/$(DEF1NAME_X64).def +DEF1TARGETN_X64=$(MISC_X64)/$(DEF1NAME_X64).def .ENDIF .IF "$(DEF2NAME_X64)"!="" -DEF2TARGETN_X64=$(MISC_X64)$/$(DEF2NAME_X64).def +DEF2TARGETN_X64=$(MISC_X64)/$(DEF2NAME_X64).def .ENDIF .ENDIF # "$(BUILD_X64)"!="" diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 98004ef2624c..3a8829448113 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -80,16 +80,16 @@ EXTNAME*=$(EXTENSIONNAME)_in WRONG_SOURCEVERSION .ENDIF -# Create $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk if needed -%minor.mk : $(SOLARENV)$/inc$/minor.mk - @@-$(MKDIRHIER) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) - @@$(COPY) $(SOLARENV)$/inc$/minor.mk $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk - @@$(TOUCH) $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg +# Create $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk if needed +%minor.mk : $(SOLARENV)/inc/minor.mk + @@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT) + @@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk + @@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg .ENDIF # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!="" -# Force creation of $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/ +# Force creation of $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/ # $(UPD)minor.mk could be empty as it's contents were already included from minor.mk -.INCLUDE : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk +.INCLUDE : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk .IF "$(BSCLIENT)"=="TRUE" .IF "$(UPDATER)"!="YES" @@ -117,9 +117,9 @@ JAVAINTERPRETER=jview.exe .ELSE .IF "$(JDK)" == "SCAFE" .IF "$(JDK_VERSION)" != "" -JAVAINTERPRETER=$(DEVROOT)$/vcafe11$/java$/bin$/java.exe +JAVAINTERPRETER=$(DEVROOT)/vcafe11/java/bin/java.exe .ELSE -JAVAINTERPRETER=$(DEVROOT)$/cafepro$/java$/bin$/java.exe +JAVAINTERPRETER=$(DEVROOT)/cafepro/java/bin/java.exe .ENDIF .ELSE .IF "$(JAVACISGCJ)" == "yes" @@ -138,9 +138,9 @@ JAVACOMPILER=jvc.exe .ELSE .IF "$(JDK)" == "SCAFE" .IF "$(JDK_VERSION)" != "" -JAVACOMPILER=$(DEVROOT)$/vcafe11$/bin$/sj.exe +JAVACOMPILER=$(DEVROOT)/vcafe11/bin/sj.exe .ELSE -JAVACOMPILER=$(DEVROOT)$/cafepro$/bin$/sj.exe +JAVACOMPILER=$(DEVROOT)/cafepro/bin/sj.exe .ENDIF .ELSE .IF "$(JAVACISGCJ)" == "yes" @@ -313,7 +313,7 @@ dbgutil= # weitergereicht, aber case significant ausgewertet! # --------------------------------------------------------------------------- -DMAKE_WORK_DIR*:=$(subst,/,$/ $(PWD)) +DMAKE_WORK_DIR*:=$(subst,/,/ $(PWD)) .IF "$(TMP)"!="" tmp*=$(TMP) @@ -538,54 +538,50 @@ TARGETTYPE=CUI # Output-Pfad # profile has to be first for not getting the .pro extension .IF "$(profile)"!="" -OUT=$(PRJ)$/$(OUTPATH).cap +OUT=$(PRJ)/$(OUTPATH).cap ROUT=$(OUTPATH).cap .ELSE .IF "$(product)"!="" -OUT=$(PRJ)$/$(OUTPATH).pro +OUT=$(PRJ)/$(OUTPATH).pro ROUT=$(OUTPATH).pro .ELSE .IF "$(profile)"!="" -OUT=$(PRJ)$/$(OUTPATH).cap +OUT=$(PRJ)/$(OUTPATH).cap ROUT=$(OUTPATH).cap .ENDIF .IF "$(dbcs)"!="" -OUT=$(PRJ)$/$(OUTPATH).w +OUT=$(PRJ)/$(OUTPATH).w ROUT=$(OUTPATH).w .ENDIF # could already be set by makefile.mk .IF "$(OUT)" == "" -OUT*=$(PRJ)$/$(OUTPATH) +OUT*=$(PRJ)/$(OUTPATH) ROUT*=$(OUTPATH) .ENDIF .ENDIF .ENDIF .IF "$(bndchk)" != "" -OUT:=$(PRJ)$/$(OUTPATH).bnd +OUT:=$(PRJ)/$(OUTPATH).bnd ROUT=$(OUTPATH).bnd .ENDIF .IF "$(truetime)" != "" -OUT=$(PRJ)$/$(OUTPATH).tt +OUT=$(PRJ)/$(OUTPATH).tt ROUT=$(OUTPATH).tt .ENDIF .IF "$(hbtoolkit)"!="" -OUT=$(PRJ)$/$(OUTPATH).tlk +OUT=$(PRJ)/$(OUTPATH).tlk ROUT=$(OUTPATH).tlk .ENDIF .IF "$(PRJ)"!="." .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" -.IF "$(USE_SHELL)"!="4nt" PATH_IN_MODULE:=\ - $(subst,$(normpath $(shell @+cd $(PRJ) && pwd $(PWDFLAGS)))$/, $(PWD)) -.ELSE # "$(USE_SHELL)"!="4nt" -PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && echo %_cwd)$/, $(PWD)) -.ENDIF # "$(USE_SHELL)"!="4nt" + $(subst,$(normpath $(shell @+cd $(PRJ) && pwd $(PWDFLAGS)))/, $(PWD)) .ELSE # "$(GUI)"=="WNT" -PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && pwd $(PWDFLAGS))$/, $(PWD)) +PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) && pwd $(PWDFLAGS))/, $(PWD)) .ENDIF # "$(GUI)"=="WNT" .ELSE # "$(PRJ)"!="." PATH_IN_MODULE:= @@ -617,24 +613,24 @@ LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT)) # --- generate output tree ----------------------------------------- # As this is not part of the initial startup makefile we define an infered -# target instead of using $(OUT)$/inc$/myworld.mk as target name. +# target instead of using $(OUT)/inc/myworld.mk as target name. # (See iz62795) -$(OUT)$/inc$/%world.mk : +$(OUT)/inc/%world.mk : @$(MKOUT) $(ROUT) @echo $(EMQ)# > $@ # don't need/want output trees in solenv!!! .IF "$(PRJNAME)"!="solenv" -.INCLUDE : $(OUT)$/inc$/myworld.mk +.INCLUDE : $(OUT)/inc/myworld.mk .ENDIF # "$(PRJNAME)"!="solenv" .IF "$(common_build)"!="" -$(LOCAL_COMMON_OUT)$/inc$/%world.mk : +$(LOCAL_COMMON_OUT)/inc/%world.mk : @$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT)) @echo $(EMQ)# > $@ .IF "$(PRJNAME)"!="solenv" -.INCLUDE : $(LOCAL_COMMON_OUT)$/inc$/myworld.mk +.INCLUDE : $(LOCAL_COMMON_OUT)/inc/myworld.mk .ENDIF # "$(PRJNAME)"!="solenv" .ENDIF # "$(common_build)"!="" @@ -642,10 +638,10 @@ $(LOCAL_COMMON_OUT)$/inc$/%world.mk : # Misc-Pfad .IF "$(UNR)"!="" -MISCX=$(OUT)$/umisc -MISC=$(OUT)$/umisc +MISCX=$(OUT)/umisc +MISC=$(OUT)/umisc .ELSE -MISC=$(OUT)$/misc +MISC=$(OUT)/misc # pointing to misc in common output tree if exists COMMONMISC={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))} .ENDIF @@ -654,31 +650,26 @@ L10N_MODULE*=l10n ALT_L10N_MODULE*=l10n_so .IF "$(WITH_LANG)"!="" -.INCLUDE .IGNORE: $(SOLARSRC)$/$(L10N_MODULE)/localization_present.mk -.INCLUDE .IGNORE: $(SOLARSRC)$/$(ALT_L10N_MODULE)/localization_present.mk - -#.IF "$(USE_SHELL)"!="4nt" -#PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ);pwd)$/,$(NULL) $(PWD)) -#.ELSE # "$(USE_SHELL)"!="4nt" -#PATH_IN_MODULE:=$(subst,$(shell @+cd $(PRJ) ^ echo %_cwd)$/,$(NULL) $(PWD)) -#.ENDIF # "$(USE_SHELL)"!="4nt" +.INCLUDE .IGNORE: $(SOLARSRC)/$(L10N_MODULE)/localization_present.mk +.INCLUDE .IGNORE: $(SOLARSRC)/$(ALT_L10N_MODULE)/localization_present.mk + .IF "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!="" -TRYSDF:=$(SOLARSRC)$/$(L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf +TRYSDF:=$(SOLARSRC)/$(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf .IF "$(ALT_LOCALIZATION_FOUND)"!="" -TRYALTSDF:=$(SOLARSRC)$/$(ALT_L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf +TRYALTSDF:=$(SOLARSRC)/$(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf # TODO: check performance impact... LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYALTSDF) $(THEN) echo $(TRYALTSDF) $(FI))) .ENDIF # "$(ALT_LOCALIZATION_FOUND)"!="" some_local_helper_var:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI) )) LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(some_local_helper_var) $(LOCALIZESDF)) -LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf $(LOCALIZESDF)) +LOCALIZESDF!:=$(eq,$(LOCALIZESDF),$(NULL) $(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf $(LOCALIZESDF)) .ELSE # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!="" -LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf +LOCALIZESDF:=$(COMMONMISC)/$(PRJNAME)/$(PATH_IN_MODULE)/localize.sdf .ENDIF # "$(LOCALIZATION_FOUND)"!="" || "$(ALT_LOCALIZATION_FOUND)"!="" .ENDIF # "$(WITH_LANG)"!="" -OUTCXX=$(OUT)$/cxx +OUTCXX=$(OUT)/cxx .IF "$(PACKAGE)"!="" IDLPACKAGE:=$(PACKAGE) @@ -689,20 +680,20 @@ IDLPACKAGENAME=$(PRJNAME) .ENDIF # Objekt-Pfad -OBJ=$(OUT)$/obj -SLO=$(OUT)$/slo -ROBJ=$(ROUT)$/obj -RSLO=$(ROUT)$/slo +OBJ=$(OUT)/obj +SLO=$(OUT)/slo +ROBJ=$(ROUT)/obj +RSLO=$(ROUT)/slo # Particle Path -PAR=$(OUT)$/par +PAR=$(OUT)/par # Library-Pfad -LB=$(OUT)$/lib -SLB=$(OUT)$/slb +LB=$(OUT)/lib +SLB=$(OUT)/slb # wir haben ein ucr verzeichnis -UCR=$(OUT)$/ucr +UCR=$(OUT)/ucr # $(L) nur noch pfad ins solver\upd\...\lib #L:={$(LB);$(SLB);$(ILIB)} @@ -716,11 +707,11 @@ ENVPRJ:=$(PRJ) # Class-Path for java-classes # obwohl der generierte Bytecode plattformunabhg. sein sollte # generieren wir ihn ersteinmal ins abhaengige Verzeichnis -CLASSDIR=$(OUT)$/class +CLASSDIR=$(OUT)/class CLASSPATH!:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(CLASSPATH) -STARJAR=java -classpath $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARENV)$/bin$/jtools.jar com.sun.star.tool.starjar.StarJar +STARJAR=java -classpath $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARENV)/bin/jtools.jar com.sun.star.tool.starjar.StarJar -STARDEP=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/javadep +STARDEP=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javadep .IF "$(PRJNAME)"=="sj2" CLASSPATH!:=$(CLASSPATH:s/sj2/no/) .ENDIF @@ -739,11 +730,11 @@ PROCESSOUT*:=$(MISC) .INCLUDE : libs.mk .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" -VERSIONOBJ=$(SLO)$/_version.obj +VERSIONOBJ=$(SLO)/_version.obj .ENDIF .IF "$(GUI)"=="UNX" -VERSIONOBJ=$(SLO)$/_version.o +VERSIONOBJ=$(SLO)/_version.o .ENDIF .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" @@ -760,25 +751,25 @@ SHELLLIB=gdi32.lib shell32.lib advapi32.lib comdlg32.lib # BIN-Pfad .IF "$(UNR)"!="" -BIN=$(OUT)$/ubin +BIN=$(OUT)/ubin .ELSE -BIN=$(OUT)$/bin +BIN=$(OUT)/bin .ENDIF # pointing to misc in common output tree if exists -COMMONBIN=$(LOCAL_COMMON_OUT)$/bin +COMMONBIN=$(LOCAL_COMMON_OUT)/bin # Include-Pfad # still without -I here s.a. target.mk INCLUDE -INC=$(PRJ)$/inc -INCPCH=$(PRJ)$/inc$/pch -INCLOCAL=..$/inc -INCGUI=$(PRJ)$/$(GUIBASE)$/inc -INCCOM=$(OUT)$/inc -INCCOMX=$(OUT)$/inc -INCUNOIDL=$(INCCOM)$/$(PRJNAME) -INCDEPN=. $(INCGUI) $(INCLOCAL) $(INC) $(INC)$/$(PRJNAME) +INC=$(PRJ)/inc +INCPCH=$(PRJ)/inc/pch +INCLOCAL=../inc +INCGUI=$(PRJ)/$(GUIBASE)/inc +INCCOM=$(OUT)/inc +INCCOMX=$(OUT)/inc +INCUNOIDL=$(INCCOM)/$(PRJNAME) +INCDEPN=. $(INCGUI) $(INCLOCAL) $(INC) $(INC)/$(PRJNAME) .IF "$(PRJINC)"!="" -INCLOCPRJ=$(foreach,i,$(PRJINC) $i$/inc) +INCLOCPRJ=$(foreach,i,$(PRJINC) $i/inc) INCDEPN+=$(INCLOCPRJ) .ENDIF .IF "$(INCPRE)"!="" @@ -788,28 +779,28 @@ INCDEPN+=$(INCPRE) # Resource-Pfad fuer .SRS .IF "$(common_build_srs)"!="" -SRS=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))$/srs -SRSX=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))$/srs +SRS=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))/srs +SRSX=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))/srs .ELSE # "$(common_build_srs)"!="" -SRS=$(OUT)$/srs -SRSX=$(OUT)$/srs +SRS=$(OUT)/srs +SRSX=$(OUT)/srs .ENDIF # "$(common_build_srs)"!="" # Resource-Pfad fuer .RC und .RES -RES=$(OUT)$/res +RES=$(OUT)/res # das normale MISC wird nicht an LDMISC angepasst, stattdessen MISCX .IF "$(make_xl)"!="" -BIN=$(PRJ)$/$(OUTPATH).xl$/bin +BIN=$(PRJ)/$(OUTPATH).xl/bin .ENDIF # damit gezielt Abhaengigkeiten auf s: angegeben werden koennen .IF "$(common_build)"!="" -SOLARIDLDIR=$(SOLARVERSION)$/common$(PROEXT)$/idl$(UPDMINOREXT) +SOLARIDLDIR=$(SOLARVERSION)/common$(PROEXT)/idl$(UPDMINOREXT) .ELSE -SOLARIDLDIR=$(SOLARVERSION)$/$(INPATH)$/idl$(UPDMINOREXT) +SOLARIDLDIR=$(SOLARVERSION)/$(INPATH)/idl$(UPDMINOREXT) .ENDIF #.IF "$(UPDMINOR)" != "" @@ -817,29 +808,29 @@ SOLARIDLDIR=$(SOLARVERSION)$/$(INPATH)$/idl$(UPDMINOREXT) #.ELSE #UPDMINOREXT= #.ENDIF -SOLARRESDIR=$(SOLARVERSION)$/$(INPATH)$/res$(UPDMINOREXT) -SOLARRESXDIR=$(SOLARVERSION)$/$(INPATH)$/res$(UPDMINOREXT) -SOLARLIBDIR=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) -SOLARJAVADIR=$(SOLARVERSION)$/$(INPATH)$/java$(UPDMINOREXT) -SOLARINCDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) -SOLARINCXDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) +SOLARRESDIR=$(SOLARVERSION)/gc$(INPATH)/res$(UPDMINOREXT) +SOLARRESXDIR=$(SOLARVERSION)/gc$(INPATH)/res$(UPDMINOREXT) +SOLARLIBDIR=$(SOLARVERSION)/gc$(INPATH)/lib$(UPDMINOREXT) +SOLARJAVADIR=$(SOLARVERSION)/gc$(INPATH)/java$(UPDMINOREXT) +SOLARINCDIR=$(SOLARVERSION)/gc$(INPATH)/inc$(UPDMINOREXT) +SOLARINCXDIR=$(SOLARVERSION)/gc$(INPATH)/inc$(UPDMINOREXT) .IF "$(SOLARLANG)"!="deut" .IF "$(SOLARLANG)" != "" -SOLARINCXDIR=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(SOLARLANG) -SOLARRESXDIR=$(SOLARVERSION)$/$(INPATH)$/res$(UPDMINOREXT)$/$(SOLARLANG) -.ENDIF -.ENDIF -SOLARBINDIR:=$(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT) -SOLARUCRDIR=$(SOLARVERSION)$/$(INPATH)$/ucr$(UPDMINOREXT) -SOLARPARDIR=$(SOLARVERSION)$/$(INPATH)$/par$(UPDMINOREXT) -SOLARXMLDIR=$(SOLARVERSION)$/$(INPATH)$/xml$(UPDMINOREXT) -SOLARDOCDIR=$(SOLARVERSION)$/$(INPATH)$/doc$(UPDMINOREXT) -SOLARPCKDIR=$(SOLARVERSION)$/$(INPATH)$/pck$(UPDMINOREXT) -SOLARSDFDIR=$(SOLARVERSION)$/$(INPATH)$/sdf$(UPDMINOREXT) -SOLARCOMMONBINDIR=$(SOLARVERSION)$/common$(PROEXT)$/bin$(UPDMINOREXT) -SOLARCOMMONRESDIR=$(SOLARVERSION)$/common$(PROEXT)$/res$(UPDMINOREXT) -SOLARCOMMONPCKDIR=$(SOLARVERSION)$/common$(PROEXT)$/pck$(UPDMINOREXT) -SOLARCOMMONSDFDIR=$(SOLARVERSION)$/common$(PROEXT)$/sdf$(UPDMINOREXT) +SOLARINCXDIR=$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(SOLARLANG) +SOLARRESXDIR=$(SOLARVERSION)/$(INPATH)/res$(UPDMINOREXT)/$(SOLARLANG) +.ENDIF +.ENDIF +SOLARBINDIR:=$(SOLARVERSION)/$(INPATH)/bin$(UPDMINOREXT) +SOLARUCRDIR=$(SOLARVERSION)/$(INPATH)/ucr$(UPDMINOREXT) +SOLARPARDIR=$(SOLARVERSION)/$(INPATH)/par$(UPDMINOREXT) +SOLARXMLDIR=$(SOLARVERSION)/$(INPATH)/xml$(UPDMINOREXT) +SOLARDOCDIR=$(SOLARVERSION)/$(INPATH)/doc$(UPDMINOREXT) +SOLARPCKDIR=$(SOLARVERSION)/$(INPATH)/pck$(UPDMINOREXT) +SOLARSDFDIR=$(SOLARVERSION)/$(INPATH)/sdf$(UPDMINOREXT) +SOLARCOMMONBINDIR=$(SOLARVERSION)/common$(PROEXT)/bin$(UPDMINOREXT) +SOLARCOMMONRESDIR=$(SOLARVERSION)/common$(PROEXT)/res$(UPDMINOREXT) +SOLARCOMMONPCKDIR=$(SOLARVERSION)/common$(PROEXT)/pck$(UPDMINOREXT) +SOLARCOMMONSDFDIR=$(SOLARVERSION)/common$(PROEXT)/sdf$(UPDMINOREXT) .IF "$(common_build)"=="" SOLARCOMMONBINDIR=$(SOLARBINDIR) SOLARCOMMONRESDIR=$(SOLARRESDIR) @@ -881,9 +872,9 @@ LOCALIZESDF:=$(COMMONMISC)$/$(PRJNAME)$/dummy$/localize.sdf .IF "$(PRE)"=="" #JARDIR=$(CLASSDIR) -JARDIR=$(OUT)$/class +JARDIR=$(OUT)/class .ELSE -JARDIR=$(PRE)$/class +JARDIR=$(PRE)/class .ENDIF # needs to be expanded!!! @@ -928,9 +919,9 @@ UNOIDLDEFS+=-DSUPD=$(UPD) -DUPD=$(UPD) UNOIDLDEPFLAGS=-Mdepend=$(SOLARVER) .IF "$(PRE)"!="" -UNOIDLINC!:=-I$(PRE)$/idl $(UNOIDLINC) +UNOIDLINC!:=-I$(PRE)/idl $(UNOIDLINC) .ENDIF -UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)$/inc -I$(PRJ)$/$(INPATH)$/idl -I$(OUT)$/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR) +UNOIDLINC+=-I. -I.. -I$(PRJ) -I$(PRJ)/inc -I$(PRJ)/$(INPATH)/idl -I$(OUT)/inc -I$(SOLARIDLDIR) -I$(SOLARINCDIR) CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME) @@ -966,9 +957,9 @@ HDEFS=-D:$(GUI) -D:$(COM) MKDEPFLAGS+=-I$(INCDEPN:s/ / -I/:s/-I-I/-I/) MKDEPALLINC=$(SOLARINC:s/-I/ -I/) -MKDEPPREINC=-I$(PREPATH)$/$(INPATH)$/inc$(UPDMINOREXT) -MKDEPSOLENV=-I$(SOLARENV)$/inc -I$(SOLARENV)$/$(GUI)$(CVER)$(COMEX)$/inc -MKDEPSOLVER=-I$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) -I$(SOLARVERSION)$/$(INPATH)$/inc +MKDEPPREINC=-I$(PREPATH)/$(INPATH)/inc$(UPDMINOREXT) +MKDEPSOLENV=-I$(SOLARENV)/inc -I$(SOLARENV)/$(GUI)$(CVER)$(COMEX)/inc +MKDEPSOLVER=-I$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT) -I$(SOLARVERSION)/$(INPATH)/inc MKDEPLOCAL=-I$(INCCOM) .IF "$(MKDEPENDALL)"!="" @@ -994,9 +985,9 @@ MKDEPFLAGS+=$(MKDEPLOCAL) BISON=bison YACCFLAGS*=-d -SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/svidl +SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/svidl -LDUMP2*=$(SOLARBINDIR)$/ldump4 +LDUMP2*=$(SOLARBINDIR)/ldump4 ZIPUPDATE=-u -j ZIPFLAGS=$(ZIPUPDATE) @@ -1010,9 +1001,9 @@ SCPLINKFLAGS+=-v $(SCPLINKVERSION) .ENDIF # "$(SCPLINKVERSION)"!="" .IF "$(make_srs_deps)"!="" -RSC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/rscdep +RSC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rscdep .ELSE # "$(make_srs_deps)"!="" -RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)$/rsc +RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc .ENDIF # "$(make_srs_deps)"!="" #new @@ -1043,9 +1034,9 @@ XPIDL_LINK=xpt_link # LINKEXTENDLINE compilerabhaengig definiert werden LINKEXTENDLINE=+ -LNT=$(DEVROOT)$/lint$/lint -#LNTFLAGS=+v -i$(DEVROOT)$/lint\ -mL options.lnt -u -LNTFLAGS=+v -i$(DEVROOT)$/lint$/ -mL options.lnt -u +LNT=$(DEVROOT)/lint/lint +#LNTFLAGS=+v -i$(DEVROOT)/lint\ -mL options.lnt -u +LNTFLAGS=+v -i$(DEVROOT)/lint/ -mL options.lnt -u LNTFLAGSOUTOBJ=-os .IF "$(GUI)"=="WNT" @@ -1076,19 +1067,19 @@ MAXPROCESS!:=1 # allow seperate handling EXTMAXPROCESS*=$(MAXPROCESS) -IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/idlc -REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regmerge -REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regcompare -REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/regcomp -CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cppumaker -JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/javamaker -RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/rdbmaker -CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/climaker +IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/idlc +REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regmerge +REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcompare +REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcomp +CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cppumaker +JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker +RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker +CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker -TESTSHL2=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/testshl2 -HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/helpex -LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/lngconvex -HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/HelpLinker +TESTSHL2=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/testshl2 +HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex +LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex +HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker .IF "$(JAVAINTERPRETER)" == "" JAVA*:=java @@ -1099,10 +1090,10 @@ JAVA*:=$(JAVAINTERPRETER) # Define SCPCOMP without wrapper because pre2par.pl chokes on DOS style # pathes. (See iz57443) -SCPCOMP=$(PERL) $(SOLARENV)$/bin$/pre2par.pl -SCPLINK=$(PERL) $(SOLARENV)$/bin$/par2script.pl +SCPCOMP=$(PERL) $(SOLARENV)/bin/pre2par.pl +SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl LZIP*=lzip -CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cpplcc +CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc .IF "$(DISABLE_ENHANCED_COMID)"=="" .INCLUDE : tg_compv.mk @@ -1116,7 +1107,7 @@ COMID=$(COM) .ENDIF # "$(SOLAR_JAVA)"=="TRUE" .IF "$(COM)"=="GCC" -GXX_INCLUDE_PATH*:=$(COMPATH)$/include$/c++$/$(CCVER) +GXX_INCLUDE_PATH*:=$(COMPATH)/include/c++/$(CCVER) .EXPORT : GXX_INCLUDE_PATH CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) .ENDIF @@ -1337,13 +1328,13 @@ LINKCFLAGS+=$(LINKFLAGSADD) #defaults for UCR HEADER UNOUCRBASE*=UCR -UNOUCROUT*=$(OUT)$/inc$/$(TARGET) +UNOUCROUT*=$(OUT)/inc/$(TARGET) INCPRE+=-I$(UNOUCROUT) -UNOUCRRDB*=$(SOLARBINDIR)$/types.rdb +UNOUCRRDB*=$(SOLARBINDIR)/types.rdb # location of trustedinfo.manifest for Windows Vista .IF "$(COM)"=="MSC" -TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)$/inc +TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)/inc .ENDIF # "$(COM)"=="MSC" # --- Compiler ----------------------------------------------------- @@ -1352,53 +1343,53 @@ TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)$/inc # --- include typelists -------------------------------------------- .IF "$(COMP1TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)$/$(COMP1TYPELIST).mk -$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +.INCLUDE .IGNORE : $(MISC)/$(COMP1TYPELIST).mk +$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP2TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)$/$(COMP2TYPELIST).mk -$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +.INCLUDE .IGNORE : $(MISC)/$(COMP2TYPELIST).mk +$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP3TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)$/$(COMP3TYPELIST).mk -$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +.INCLUDE .IGNORE : $(MISC)/$(COMP3TYPELIST).mk +$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP4TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)$/$(COMP4TYPELIST).mk -$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +.INCLUDE .IGNORE : $(MISC)/$(COMP4TYPELIST).mk +$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP5TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)$/$(COMP5TYPELIST).mk -$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +.INCLUDE .IGNORE : $(MISC)/$(COMP5TYPELIST).mk +$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP6TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)$/$(COMP6TYPELIST).mk -$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +.INCLUDE .IGNORE : $(MISC)/$(COMP6TYPELIST).mk +$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP7TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)$/$(COMP7TYPELIST).mk -$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +.INCLUDE .IGNORE : $(MISC)/$(COMP7TYPELIST).mk +$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP8TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)$/$(COMP8TYPELIST).mk -$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +.INCLUDE .IGNORE : $(MISC)/$(COMP8TYPELIST).mk +$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF .IF "$(COMP9TYPELIST)"!="" -.INCLUDE .IGNORE : $(MISC)$/$(COMP9TYPELIST).mk -$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) +.INCLUDE .IGNORE : $(MISC)/$(COMP9TYPELIST).mk +$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xml2cmp -types stdout $(MISC)/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml) .ENDIF # some place to define these jars for SO environment -XML_APIS_JAR*=$(SOLARBINDIR)$/xml-apis.jar -XERCES_JAR*=$(SOLARBINDIR)$/xercesImpl.jar +XML_APIS_JAR*=$(SOLARBINDIR)/xml-apis.jar +XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar # workaround for strange dmake bug: # if the previous block was a rule or a target, "\#" isn't recognized diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk index 58b00978e910..35f903f60922 100644 --- a/solenv/inc/startup/wnt/macros.mk +++ b/solenv/inc/startup/wnt/macros.mk @@ -17,26 +17,6 @@ E *:= .exe # Executables # Now set the remaining arguments depending on which SHELL we # are going to use. -.IF $(USE_SHELL) == 4nt - -.IMPORT : COMSPEC - -SHELL *:= $(COMSPEC) - - SHELLFLAGS *:= $(SWITCHAR)c - GROUPFLAGS *:= $(SHELLFLAGS) - SHELLMETAS *:= "<>|&%^ -# Fix syntax highlighting: " - GROUPSUFFIX *:= .bat - DIVFILE *= $(TMPFILE:s,/,\,) - RM *= +del - RMFLAGS *= /y /E - MV *= +rename - __.DIVSEP-sh-yes *:= \\ - __.DIVSEP-sh-no *:= \\ - DIRSEPSTR := \\ - -.ELSE # Non 4nt case .IF $(USE_SHELL) == bash SHELLFLAGS *:= -c @@ -59,30 +39,14 @@ SHELL *:= $(COMSPEC) __.DIVSEP-sh-no *:= \\ DIRSEPSTR :=/ -.ENDIF - .EXPORT : GUWCMD -.IF $(USE_SHELL) == 4nt - -my4ver:=$(shell @echo %_4ver) - -.IF "$(my4ver:s/.//:s/,//)" >= "400" -.ELSE # "$(my4ver:s/.//:s/,//)" >= "400" -.ERROR : ; @echo Forced error: 4NT version too old! Version 4.0 or newer is required. -4NT_version_too_old -.ENDIF # "$(my4ver:s/.//:s/,//)" >= "400" - -.ELSE # $(USE_SHELL) == 4nt - .IF $(SHELL) == $(NULL) # SHELL has to be set in (non-4NT) OOobuild environment .ERROR : ; @echo Forced error: Environment variable SHELL has to be set for OOo build! SHELL_variable_needed .END -.END # $(USE_SHELL) == 4nt - GROUPSHELL *:= $(SHELL) # Does not respect case of filenames. diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index b0fabb84d649..705368b3b4e3 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -56,21 +56,21 @@ INCEXT*=. INCPRE*=. INCPOST*=. .IF "$(PRE)"!="" -ENVINCPRE+=-I$(PRE)$/inc +ENVINCPRE+=-I$(PRE)/inc .ENDIF # "$(PRE)"!="" .IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" -UNOINCLUDES=$(SOLARINCDIR)$/offuh +UNOINCLUDES=$(SOLARINCDIR)/offuh .ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"=="" SOLARINC+=$(JDKINCS) # make sure INCLUDE isn't set INCLUDE:= .EXPORT : INCLUDE .IF "$(PRJINC)"!="" -INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST) +INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) .ELSE # "$(PRJINC)"!="" -INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)$/res -I$(INCPOST) +INCLUDE!:=-I. $(ENVINCPRE) $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) .ENDIF # "$(PRJINC)"!="" -INCLUDE_C=$(subst,$/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) +INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) .EXPORT : LIB # --- Compiler ----------------------------------------------------- @@ -89,32 +89,32 @@ SUBDIRSDEPS=$(RC_SUBDIRSDEPS) .IF "$(L10N_framework)"=="" .IF "$(DEPOBJFILES)"!="" -DEPCOLLECT_SLO+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(SLO),ttt $i) $(NULL) $(subst,$(SLO)$/,not_existing$/s_ $(i:s/.obj/.dpcc/)))) -DEPCOLLECT_OBJ+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(OBJ),ttt $i) $(NULL) $(subst,$(OBJ)$/,not_existing$/o_ $(i:s/.obj/.dpcc/)))) +DEPCOLLECT_SLO+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(SLO),ttt $i) $(NULL) $(subst,$(SLO)/,not_existing/s_ $(i:s/.obj/.dpcc/)))) +DEPCOLLECT_OBJ+:=$(foreach,i,$(DEPOBJFILES) $(eq,$i,$(subst,$(OBJ),ttt $i) $(NULL) $(subst,$(OBJ)/,not_existing/o_ $(i:s/.obj/.dpcc/)))) .ENDIF # "$(DEPOBJFILES)"!="" # point to not existing directory as there is no creation intended anyway and # stat call looks faster -DEPCOLLECT_SLO+:=$(subst,$(SLO)$/,not_existing$/s_ $(SLOFILES:s/.obj/.dpcc/)) -DEPCOLLECT_OBJ+:=$(subst,$(OBJ)$/,not_existing$/o_ $(OBJFILES:s/.obj/.dpcc/)) +DEPCOLLECT_SLO+:=$(subst,$(SLO)/,not_existing/s_ $(SLOFILES:s/.obj/.dpcc/)) +DEPCOLLECT_OBJ+:=$(subst,$(OBJ)/,not_existing/o_ $(OBJFILES:s/.obj/.dpcc/)) .ENDIF # "$(L10N_framework)"=="" DEPFILESx+:=$(subst,$(PAR),$(MISC) $(ALLPARFILES:s/.par/.dpsc/)) .IF "$(L10N_framework)"=="" .IF "$(RCFILES)"!="" .IF "$(RESNAME)"!="" -DEPFILESx+:=$(MISC)$/$(RESNAME).dpcc +DEPFILESx+:=$(MISC)/$(RESNAME).dpcc .ELSE # "$(RESNAME)"!="" -DEPFILESx+:=$(MISC)$/$(TARGET).dprc +DEPFILESx+:=$(MISC)/$(TARGET).dprc .ENDIF # "$(RESNAME)"!="" .ENDIF # "$(RCFILES)"!="" .ENDIF # "$(L10N_framework)"=="" DEPFILES:=$(uniq $(DEPFILESx)) DEPCOLLECT_SLO!:=$(strip $(uniq $(DEPCOLLECT_SLO))) .IF "$(DEPCOLLECT_SLO)"!="" -DEPFILE_SLO+:=$(MISC)$/all_$(TARGET).dpslo +DEPFILE_SLO+:=$(MISC)/all_$(TARGET).dpslo .ENDIF # "$(DEPCOLLECT_SLO)"!="" DEPCOLLECT_OBJ!:=$(strip $(uniq $(DEPCOLLECT_OBJ))) .IF "$(DEPCOLLECT_OBJ)"!="" -DEPFILE_OBJ+:=$(MISC)$/all_$(TARGET).dpobj +DEPFILE_OBJ+:=$(MISC)/all_$(TARGET).dpobj .ENDIF # "$(DEPCOLLECT_OBJ)"!="" .ENDIF # "$(nodep)"=="" @@ -160,19 +160,19 @@ APP9TARGET= .IF "$(IDLFILES)"!="" -URDFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)$/ucr$/$(IDLPACKAGE)$/$i) +URDFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)/ucr/$(IDLPACKAGE)/$i) UNOIDLTARGETS+=$(URDFILES) .IF "$(URDFILES)"!="" -LOCALDBTARGET=$(OUT)$/ucr$/$(TARGET).db +LOCALDBTARGET=$(OUT)/ucr/$(TARGET).db .ENDIF .IF "$(URDDOC)" != "" -URDDOCFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)$/ucrdoc$/$(IDLPACKAGE)$/$i) +URDDOCFILES+=$(foreach,i,$(IDLFILES:s/.idl/.urd/:f) $(OUT)/ucrdoc/$(IDLPACKAGE)/$i) UNOIDLTARGETS+=$(URDDOCFILES) .IF "$(URDDOCFILES)"!="" -LOCALDOCDBTARGET=$(OUT)$/ucrdoc$/$(TARGET).db +LOCALDOCDBTARGET=$(OUT)/ucrdoc/$(TARGET).db .ENDIF .ENDIF # "$(URDDOC)" != "" @@ -180,10 +180,10 @@ LOCALDOCDBTARGET=$(OUT)$/ucrdoc$/$(TARGET).db .ENDIF # "$(IDLFILES)"!="" .IF "$(UNOIDLDBFILES)"!="" -UNOIDLDBTARGET=$(OUT)$/ucr$/$(PRJNAME).db +UNOIDLDBTARGET=$(OUT)/ucr/$(PRJNAME).db .IF "$(URDDOC)" != "" -UNOIDLDBDOCFILES:=$(subst,$/ucr$/,$/ucrdoc$/ $(UNOIDLDBFILES)) -UNOIDLDBDOCTARGET=$(OUT)$/ucrdoc$/$(PRJNAME)_doc.db +UNOIDLDBDOCFILES:=$(subst,/ucr/,/ucrdoc/ $(UNOIDLDBFILES)) +UNOIDLDBDOCTARGET=$(OUT)/ucrdoc/$(PRJNAME)_doc.db .IF "$(UNOIDLDBREGS)"!="" UNOIDLDBDOCREGS=$(foreach,i,$(UNOIDLDBREGS) $(i:d)$(i:b)_doc$(i:e)) .ENDIF # "$(UNOIDLDBREGS)"!="" @@ -192,14 +192,14 @@ UNOIDLDBDOCREGS=$(foreach,i,$(UNOIDLDBREGS) $(i:d)$(i:b)_doc$(i:e)) .IF "$(IDLFILES)"!="" .IF "$(PACKAGE)"!="" -IDLDIRS=$(SOLARIDLDIR)$/$(PACKAGE) +IDLDIRS=$(SOLARIDLDIR)/$(PACKAGE) .ELSE # "$(PACKAGE)"!="" IDLDIRS=$(SOLARIDLDIR) .ENDIF # "$(PACKAGE)"!="" .IF "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!="" .IF "$(EXTERNIDLFILES)"!="" -DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)$/$i) +DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)/$i) .ELSE # "$(EXTERNIDLFILES)"!="" DEPIDLFILES:=$(IDLFILES) .ENDIF # "$(EXTERNIDLFILES)"!="" @@ -214,12 +214,12 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print) .IF "$(L10N_framework)"=="" .IF "$(JARFILES)"!="" -LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)$/$i) +LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)/$i) NEWCLASS:=$(LOCALJARS) -NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)$/$i $(NULL))) +NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)/$i $(NULL))) .ENDIF # "$(JARFILES)"!="" .IF "$(EXTRAJARFILES)"!="" -NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)$/$i) +NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)/$i) .ENDIF # "$(EXTRAJARFILES)"!="" .IF "$(GENJAVACLASSFILES)"!="" NEWCLASS+=$(CLASSGENDIR) @@ -240,25 +240,25 @@ EXCEPTIONSNOOPTTARGET=do_it_exceptions_noopt .IF "$(LIBTARGET)"=="" .IF "$(OBJFILES)$(IDLOBJFILES)"!="" -OBJTARGET=$(LB)$/$(TARGET).lib +OBJTARGET=$(LB)/$(TARGET).lib .ENDIF .IF "$(SLOFILES)$(IDLSLOFILES)"!="" -SLOTARGET=$(SLB)$/$(TARGET).lib +SLOTARGET=$(SLB)/$(TARGET).lib .ENDIF .ENDIF # "$(LIBTARGET)"=="" .IF "$(SECOND_BUILD)"!="" .IF "$($(SECOND_BUILD)_SLOFILES)"!="" .IF "$(LIBTARGET)"=="" -$(SECOND_BUILD)SLOTARGET=$(SLB)$/$(SECOND_BUILD)_$(TARGET).lib +$(SECOND_BUILD)SLOTARGET=$(SLB)/$(SECOND_BUILD)_$(TARGET).lib .ENDIF # "$(LIBTARGET)"=="" REAL_$(SECOND_BUILD)_SLOFILES=$(foreach,i,$($(SECOND_BUILD)_SLOFILES) $(i:d)$(SECOND_BUILD)_$(i:f)) .ENDIF .IF "$($(SECOND_BUILD)_OBJFILES)"!="" .IF "$(LIBTARGET)"=="" -$(SECOND_BUILD)OBJTARGET=$(LB)$/$(SECOND_BUILD)_$(TARGET).lib +$(SECOND_BUILD)OBJTARGET=$(LB)/$(SECOND_BUILD)_$(TARGET).lib .ENDIF # "$(LIBTARGET)"=="" REAL_$(SECOND_BUILD)_OBJFILES=$(foreach,i,$($(SECOND_BUILD)_OBJFILES) $(i:d)$(SECOND_BUILD)_$(i:f)) .ENDIF @@ -286,80 +286,80 @@ NOLIBSLOTARGET=$(SLOFILES) .ENDIF .IF "$(SRC1FILES)"!="" -SRC1TARGET=$(SRS)$/$(SRS1NAME).srs -DEPSRS1FILE+=$(MISC)$/$(TARGET).$(SRS1NAME).dprr +SRC1TARGET=$(SRS)/$(SRS1NAME).srs +DEPSRS1FILE+=$(MISC)/$(TARGET).$(SRS1NAME).dprr DEPSRSFILES+=$(DEPSRS1FILE) .ENDIF .IF "$(SRC2FILES)"!="" -SRC2TARGET=$(SRS)$/$(SRS2NAME).srs -DEPSRS2FILE+=$(MISC)$/$(TARGET).$(SRS2NAME).dprr +SRC2TARGET=$(SRS)/$(SRS2NAME).srs +DEPSRS2FILE+=$(MISC)/$(TARGET).$(SRS2NAME).dprr DEPSRSFILES+=$(DEPSRS2FILE) .ENDIF .IF "$(SRC3FILES)"!="" -SRC3TARGET=$(SRS)$/$(SRS3NAME).srs -DEPSRS3FILE+=$(MISC)$/$(TARGET).$(SRS3NAME).dprr +SRC3TARGET=$(SRS)/$(SRS3NAME).srs +DEPSRS3FILE+=$(MISC)/$(TARGET).$(SRS3NAME).dprr DEPSRSFILES+=$(DEPSRS3FILE) .ENDIF .IF "$(SRC4FILES)"!="" -SRC4TARGET=$(SRS)$/$(SRS4NAME).srs -DEPSRS4FILE+=$(MISC)$/$(TARGET).$(SRS4NAME).dprr +SRC4TARGET=$(SRS)/$(SRS4NAME).srs +DEPSRS4FILE+=$(MISC)/$(TARGET).$(SRS4NAME).dprr DEPSRSFILES+=$(DEPSRS4FILE) .ENDIF .IF "$(SRC5FILES)"!="" -SRC5TARGET=$(SRS)$/$(SRS5NAME).srs -DEPSRS5FILE+=$(MISC)$/$(TARGET).$(SRS5NAME).dprr +SRC5TARGET=$(SRS)/$(SRS5NAME).srs +DEPSRS5FILE+=$(MISC)/$(TARGET).$(SRS5NAME).dprr DEPSRSFILES+=$(DEPSRS5FILE) .ENDIF .IF "$(SRC6FILES)"!="" -SRC6TARGET=$(SRS)$/$(SRS6NAME).srs -DEPSRS6FILE+=$(MISC)$/$(TARGET).$(SRS6NAME).dprr +SRC6TARGET=$(SRS)/$(SRS6NAME).srs +DEPSRS6FILE+=$(MISC)/$(TARGET).$(SRS6NAME).dprr DEPSRSFILES+=$(DEPSRS6FILE) .ENDIF .IF "$(SRC7FILES)"!="" -SRC7TARGET=$(SRS)$/$(SRS7NAME).srs -DEPSRS7FILE+=$(MISC)$/$(TARGET).$(SRS7NAME).dprr +SRC7TARGET=$(SRS)/$(SRS7NAME).srs +DEPSRS7FILE+=$(MISC)/$(TARGET).$(SRS7NAME).dprr DEPSRSFILES+=$(DEPSRS7FILE) .ENDIF .IF "$(SRC8FILES)"!="" -SRC8TARGET=$(SRS)$/$(SRS8NAME).srs -DEPSRS8FILE+=$(MISC)$/$(TARGET).$(SRS8NAME).dprr +SRC8TARGET=$(SRS)/$(SRS8NAME).srs +DEPSRS8FILE+=$(MISC)/$(TARGET).$(SRS8NAME).dprr DEPSRSFILES+=$(DEPSRS8FILE) .ENDIF .IF "$(SRC9FILES)"!="" -SRC9TARGET=$(SRS)$/$(SRS9NAME).srs -DEPSRS9FILE+=$(MISC)$/$(TARGET).$(SRS9NAME).dprr +SRC9TARGET=$(SRS)/$(SRS9NAME).srs +DEPSRS9FILE+=$(MISC)/$(TARGET).$(SRS9NAME).dprr DEPSRSFILES+=$(DEPSRS9FILE) .ENDIF .IF "$(SOLAR_JAVA)"!="" .IF "$(JAVAFILES)$(JAVACLASSFILES)$(GENJAVAFILES)"!="" .IF "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)" -JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class) +JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:s/.java//).class) .ELSE # "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)" .IF "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVACLASSFILES)" -JAVAFILES= $(foreach,i,$(JAVACLASSFILES) $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(i:s/.class//).java)) +JAVAFILES= $(foreach,i,$(JAVACLASSFILES) $(subst,$(CLASSDIR)/$(PACKAGE)/, $(i:s/.class//).java)) .ENDIF # "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVACLASSFILES)" .ENDIF # "$(JAVAFILES)$(JAVACLASSFILES)"=="$(JAVAFILES)" -JAVATARGET:=$(MISC)$/$(TARGET)_dummy.java +JAVATARGET:=$(MISC)/$(TARGET)_dummy.java .ENDIF # "$(JAVAFILES)$(JAVACLASSFILES)$(GENJAVAFILES)"!="" .IF "$(JARTARGET)"!="" JARCLASSDIRS*=. .IF "$(NEW_JAR_PACK)"!="" -JARMANIFEST*=$(CLASSDIR)$/$(TARGET)$/META-INF$/MANIFEST.MF +JARMANIFEST*=$(CLASSDIR)/$(TARGET)/META-INF/MANIFEST.MF .ENDIF # "$(NEW_JAR_PACK)"!="" -JARTARGETN=$(CLASSDIR)$/$(JARTARGET) +JARTARGETN=$(CLASSDIR)/$(JARTARGET) .IF "$(NOJARDEP)$(NEW_JAR_PACK)"=="" JARTARGETDEP=$(JARTARGET).dep -JARTARGETDEPN=$(MISC)$/$(JARTARGET).dep +JARTARGETDEPN=$(MISC)/$(JARTARGET).dep .ENDIF # "$(NOJARDEP)$(NEW_JAR_PACK)"=="" .ENDIF # "$(JARTARGET)"!="" .ELSE # "$(SOLAR_JAVA)"!="" @@ -372,49 +372,49 @@ javauno:= .IF "$(RCFILES)"!="" RESNAME*=$(TARGET) .IF "$(RCFILES)" != "verinfo.rc" -RCTARGET=$(RES)$/$(RESNAME).res +RCTARGET=$(RES)/$(RESNAME).res .ELSE # "$(RCFILES)" != "verinfo.rc" RCFILES= .ENDIF # "$(RCFILES)" != "verinfo.rc" .ENDIF # "$(RCFILES)"!="" .ENDIF # "$(L10N_framework)"=="" -LOCALIZE_ME_DEST:=$(foreach,i,$(LOCALIZE_ME) $(INCCOM)$/$(i:f:s/_tmpl//)) +LOCALIZE_ME_DEST:=$(foreach,i,$(LOCALIZE_ME) $(INCCOM)/$(i:f:s/_tmpl//)) .IF "$(SCP1TARGET)"!="" -SCP1TARGETN:=$(foreach,i,$(SCP1LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP1TARGET)$(SCPPOST)) +SCP1TARGETN:=$(foreach,i,$(SCP1LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP1TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP2TARGET)"!="" -SCP2TARGETN:=$(foreach,i,$(SCP2LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP2TARGET)$(SCPPOST)) +SCP2TARGETN:=$(foreach,i,$(SCP2LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP2TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP3TARGET)"!="" -SCP3TARGETN:=$(foreach,i,$(SCP3LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP3TARGET)$(SCPPOST)) +SCP3TARGETN:=$(foreach,i,$(SCP3LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP3TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP4TARGET)"!="" -SCP4TARGETN:=$(foreach,i,$(SCP4LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP4TARGET)$(SCPPOST)) +SCP4TARGETN:=$(foreach,i,$(SCP4LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP4TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP5TARGET)"!="" -SCP5TARGETN:=$(foreach,i,$(SCP5LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP5TARGET)$(SCPPOST)) +SCP5TARGETN:=$(foreach,i,$(SCP5LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP5TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP6TARGET)"!="" -SCP6TARGETN:=$(foreach,i,$(SCP6LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP6TARGET)$(SCPPOST)) +SCP6TARGETN:=$(foreach,i,$(SCP6LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP6TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP7TARGET)"!="" -SCP7TARGETN:=$(foreach,i,$(SCP7LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP7TARGET)$(SCPPOST)) +SCP7TARGETN:=$(foreach,i,$(SCP7LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP7TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP8TARGET)"!="" -SCP8TARGETN:=$(foreach,i,$(SCP8LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP8TARGET)$(SCPPOST)) +SCP8TARGETN:=$(foreach,i,$(SCP8LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP8TARGET)$(SCPPOST)) .ENDIF .IF "$(SCP9TARGET)"!="" -SCP9TARGETN:=$(foreach,i,$(SCP9LINK_PRODUCT_TYPE) $(BIN)$/$i$/$(SCP9TARGET)$(SCPPOST)) +SCP9TARGETN:=$(foreach,i,$(SCP9LINK_PRODUCT_TYPE) $(BIN)/$i/$(SCP9TARGET)$(SCPPOST)) .ENDIF .IF "$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)"!="$(ZIP1LIST:s/LANGDIR//)$(ZIP2LIST:s/LANGDIR//)$(ZIP3LIST:s/LANGDIR//)$(ZIP4LIST:s/LANGDIR//)$(ZIP5LIST:s/LANGDIR//)$(ZIP6LIST:s/LANGDIR//)$(ZIP7LIST:s/LANGDIR//)$(ZIP8LIST:s/LANGDIR//)$(ZIP9LIST:s/LANGDIR//)" @@ -424,7 +424,7 @@ ZIPALL=ZIPALLTARGET .ENDIF # .IF "$(APP1TARGET)"!="" -APP1TARGETN=$(BIN)$/$(APP1TARGET)$(EXECPOST) +APP1TARGETN=$(BIN)/$(APP1TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP1BASE)"=="" @@ -436,7 +436,7 @@ APP1BASEX=/BASE:$(APP1BASE) .ENDIF .IF "$(APP2TARGET)"!="" -APP2TARGETN=$(BIN)$/$(APP2TARGET)$(EXECPOST) +APP2TARGETN=$(BIN)/$(APP2TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP2BASE)"=="" @@ -448,7 +448,7 @@ APP2BASEX=/BASE:$(APP2BASE) .ENDIF .IF "$(APP3TARGET)"!="" -APP3TARGETN=$(BIN)$/$(APP3TARGET)$(EXECPOST) +APP3TARGETN=$(BIN)/$(APP3TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP3BASE)"=="" @@ -460,7 +460,7 @@ APP3BASEX=/BASE:$(APP3BASE) .ENDIF .IF "$(APP4TARGET)"!="" -APP4TARGETN=$(BIN)$/$(APP4TARGET)$(EXECPOST) +APP4TARGETN=$(BIN)/$(APP4TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP4BASE)"=="" @@ -472,7 +472,7 @@ APP4BASEX=/BASE:$(APP4BASE) .ENDIF .IF "$(APP5TARGET)"!="" -APP5TARGETN=$(BIN)$/$(APP5TARGET)$(EXECPOST) +APP5TARGETN=$(BIN)/$(APP5TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP5BASE)"=="" @@ -484,7 +484,7 @@ APP5BASEX=/BASE:$(APP5BASE) .ENDIF .IF "$(APP6TARGET)"!="" -APP6TARGETN=$(BIN)$/$(APP6TARGET)$(EXECPOST) +APP6TARGETN=$(BIN)/$(APP6TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP6BASE)"=="" @@ -496,7 +496,7 @@ APP6BASEX=/BASE:$(APP6BASE) .ENDIF .IF "$(APP7TARGET)"!="" -APP7TARGETN=$(BIN)$/$(APP7TARGET)$(EXECPOST) +APP7TARGETN=$(BIN)/$(APP7TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" .IF "$(APP7BASE)"=="" @@ -508,7 +508,7 @@ APP7BASEX=/BASE:$(APP7BASE) .ENDIF .IF "$(APP8TARGET)"!="" -APP8TARGETN=$(BIN)$/$(APP8TARGET)$(EXECPOST) +APP8TARGETN=$(BIN)/$(APP8TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP8BASE)"=="" @@ -520,7 +520,7 @@ APP8BASEX=/BASE:$(APP8BASE) .ENDIF .IF "$(APP9TARGET)"!="" -APP9TARGETN=$(BIN)$/$(APP9TARGET)$(EXECPOST) +APP9TARGETN=$(BIN)/$(APP9TARGET)$(EXECPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP9BASE)"=="" @@ -536,7 +536,7 @@ APP9BASEX=/BASE:$(APP9BASE) SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL1DLLPRE*=$(DLLPRE) -SHL1TARGETN=$(DLLDEST)$/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST) +SHL1TARGETN=$(DLLDEST)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL1BASE)"=="" @@ -552,7 +552,7 @@ SHL1BASEX=/BASE:$(SHL1BASE) SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL2DLLPRE*=$(DLLPRE) -SHL2TARGETN=$(DLLDEST)$/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST) +SHL2TARGETN=$(DLLDEST)/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL2BASE)"=="" @@ -568,7 +568,7 @@ SHL2BASEX=/BASE:$(SHL2BASE) SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL3DLLPRE*=$(DLLPRE) -SHL3TARGETN=$(DLLDEST)$/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST) +SHL3TARGETN=$(DLLDEST)/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL3BASE)"=="" @@ -584,7 +584,7 @@ SHL3BASEX=/BASE:$(SHL3BASE) SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL4DLLPRE*=$(DLLPRE) -SHL4TARGETN=$(DLLDEST)$/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST) +SHL4TARGETN=$(DLLDEST)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL4BASE)"=="" @@ -600,7 +600,7 @@ SHL4BASEX=/BASE:$(SHL4BASE) SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL5DLLPRE*=$(DLLPRE) -SHL5TARGETN=$(DLLDEST)$/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST) +SHL5TARGETN=$(DLLDEST)/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL5BASE)"=="" @@ -616,7 +616,7 @@ SHL5BASEX=/BASE:$(SHL5BASE) SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL6DLLPRE*=$(DLLPRE) -SHL6TARGETN=$(DLLDEST)$/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST) +SHL6TARGETN=$(DLLDEST)/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL6BASE)"=="" @@ -632,7 +632,7 @@ SHL6BASEX=/BASE:$(SHL6BASE) SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL7DLLPRE*=$(DLLPRE) -SHL7TARGETN=$(DLLDEST)$/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST) +SHL7TARGETN=$(DLLDEST)/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL7BASE)"=="" @@ -648,7 +648,7 @@ SHL7BASEX=/BASE:$(SHL7BASE) SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL8DLLPRE*=$(DLLPRE) -SHL8TARGETN=$(DLLDEST)$/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST) +SHL8TARGETN=$(DLLDEST)/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL8BASE)"=="" @@ -664,7 +664,7 @@ SHL8BASEX=/BASE:$(SHL8BASE) SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" SHL9DLLPRE*=$(DLLPRE) -SHL9TARGETN=$(DLLDEST)$/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST) +SHL9TARGETN=$(DLLDEST)/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST) .IF "$(BASE)" != "" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(SHL9BASE)"=="" @@ -679,73 +679,73 @@ SHL9BASEX=/BASE:$(SHL9BASE) .IF "$(UNOUCRRDB)"!="" COMPRDB*:=$(UNOUCRRDB) .ELSE # "$(UNOUCRRDB)"!="" -COMPRDB*:=$(SOLARBINDIR)$/types.rdb +COMPRDB*:=$(SOLARBINDIR)/types.rdb .ENDIF # "$(UNOUCRRDB)"!="" .ENDIF # "$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!="" .IF "$(COMP1TYPELIST)"!="" UNOTYPES+=$($(COMP1TYPELIST)_XML2CMPTYPES) -COMP1RDBTARGETN:=$(BIN)$/$(COMP1TYPELIST).rdb -#COMP1TYPELISTN:=$(MISC)$/$(COMP1TYPELIST).xml +COMP1RDBTARGETN:=$(BIN)/$(COMP1TYPELIST).rdb +#COMP1TYPELISTN:=$(MISC)/$(COMP1TYPELIST).xml .ENDIF .IF "$(COMP2TYPELIST)"!="" UNOTYPES+=$($(COMP2TYPELIST)_XML2CMPTYPES) -COMP2RDBTARGETN:=$(BIN)$/$(COMP2TYPELIST).rdb -#COMP2TYPELISTN:=$(MISC)$/$(COMP2TYPELIST).xml +COMP2RDBTARGETN:=$(BIN)/$(COMP2TYPELIST).rdb +#COMP2TYPELISTN:=$(MISC)/$(COMP2TYPELIST).xml .ENDIF .IF "$(COMP3TYPELIST)"!="" UNOTYPES+=$($(COMP3TYPELIST)_XML2CMPTYPES) -COMP3RDBTARGETN:=$(BIN)$/$(COMP3TYPELIST).rdb -#COMP3TYPELISTN:=$(MISC)$/$(COMP3TYPELIST).xml +COMP3RDBTARGETN:=$(BIN)/$(COMP3TYPELIST).rdb +#COMP3TYPELISTN:=$(MISC)/$(COMP3TYPELIST).xml .ENDIF .IF "$(COMP4TYPELIST)"!="" UNOTYPES+=$($(COMP4TYPELIST)_XML2CMPTYPES) -COMP4RDBTARGETN:=$(BIN)$/$(COMP4TYPELIST).rdb -#COMP4TYPELISTN:=$(MISC)$/$(COMP4TYPELIST).xml +COMP4RDBTARGETN:=$(BIN)/$(COMP4TYPELIST).rdb +#COMP4TYPELISTN:=$(MISC)/$(COMP4TYPELIST).xml .ENDIF .IF "$(COMP5TYPELIST)"!="" UNOTYPES+=$($(COMP5TYPELIST)_XML2CMPTYPES) -COMP5RDBTARGETN:=$(BIN)$/$(COMP5TYPELIST).rdb -#COMP5TYPELISTN:=$(MISC)$/$(COMP5TYPELIST).xml +COMP5RDBTARGETN:=$(BIN)/$(COMP5TYPELIST).rdb +#COMP5TYPELISTN:=$(MISC)/$(COMP5TYPELIST).xml .ENDIF .IF "$(COMP6TYPELIST)"!="" UNOTYPES+=$($(COMP6TYPELIST)_XML2CMPTYPES) -COMP6RDBTARGETN:=$(BIN)$/$(COMP6TYPELIST).rdb -#COMP6TYPELISTN:=$(MISC)$/$(COMP6TYPELIST).xml +COMP6RDBTARGETN:=$(BIN)/$(COMP6TYPELIST).rdb +#COMP6TYPELISTN:=$(MISC)/$(COMP6TYPELIST).xml .ENDIF .IF "$(COMP7TYPELIST)"!="" UNOTYPES+=$($(COMP7TYPELIST)_XML2CMPTYPES) -COMP7RDBTARGETN:=$(BIN)$/$(COMP7TYPELIST).rdb -#COMP7TYPELISTN:=$(MISC)$/$(COMP7TYPELIST).xml +COMP7RDBTARGETN:=$(BIN)/$(COMP7TYPELIST).rdb +#COMP7TYPELISTN:=$(MISC)/$(COMP7TYPELIST).xml .ENDIF .IF "$(COMP8TYPELIST)"!="" UNOTYPES+=$($(COMP8TYPELIST)_XML2CMPTYPES) -COMP8RDBTARGETN:=$(BIN)$/$(COMP8TYPELIST).rdb -#COMP8TYPELISTN:=$(MISC)$/$(COMP8TYPELIST).xml +COMP8RDBTARGETN:=$(BIN)/$(COMP8TYPELIST).rdb +#COMP8TYPELISTN:=$(MISC)/$(COMP8TYPELIST).xml .ENDIF .IF "$(COMP9TYPELIST)"!="" UNOTYPES+=$($(COMP9TYPELIST)_XML2CMPTYPES) -COMP9RDBTARGETN:=$(BIN)$/$(COMP9TYPELIST).rdb -#COMP9TYPELISTN:=$(MISC)$/$(COMP9TYPELIST).xml +COMP9RDBTARGETN:=$(BIN)/$(COMP9TYPELIST).rdb +#COMP9TYPELISTN:=$(MISC)/$(COMP9TYPELIST).xml .ENDIF UNOTYPES!:=$(strip $(UNOTYPES)) #moved here to get UNOTYPES from COMPxTYPELIST .IF "$(UNOTYPES)" != "" -UNOUCRHEADER=$(foreach,j,$(subst,.,$/ $(UNOTYPES)) $(UNOUCROUT)$/$(j:+".hpp")) -UNOUCRTARGET:=$(INCCOM)$/$(TARGET)_headergen.done +UNOUCRHEADER=$(foreach,j,$(subst,.,/ $(UNOTYPES)) $(UNOUCROUT)/$(j:+".hpp")) +UNOUCRTARGET:=$(INCCOM)/$(TARGET)_headergen.done .ENDIF # "$(UNOTYPES)" != "" .IF "$(HELPIDFILES)"!="" -MAKE_HELPIDS=$(MISC)$/helpids.don +MAKE_HELPIDS=$(MISC)/helpids.don .ENDIF .IF "$(HXXCOPYFILES)" != "" @@ -806,11 +806,11 @@ LIB9ARCHIV= .IF "$(RESLIB1NOVERSION)"=="" .ENDIF # "$(RESLIB1NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)LANGEXT.res -RSC_MULTI1=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB1NAME) +RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB1NAME)LANGEXT.res +RSC_MULTI1=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB1NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB1TARGETN=$(BIN)$/$(RESLIB1NAME)LANGEXT.res -RSC_MULTI1=$(MISC)$/rsc_$(RESLIB1NAME) +RESLIB1TARGETN=$(BIN)/$(RESLIB1NAME)LANGEXT.res +RSC_MULTI1=$(MISC)/rsc_$(RESLIB1NAME) .ENDIF # "$(common_build_reslib)"!="" # change to iso if resmgr is changed RESLIB1TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB1TARGETN))) @@ -820,11 +820,11 @@ RESLIB1TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB1TARGETN)) .IF "$(RESLIB2NOVERSION)"=="" .ENDIF # "$(RESLIB2NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)LANGEXT.res -RSC_MULTI2=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB2NAME) +RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB2NAME)LANGEXT.res +RSC_MULTI2=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB2NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB2TARGETN=$(BIN)$/$(RESLIB2NAME)LANGEXT.res -RSC_MULTI2=$(MISC)$/rsc_$(RESLIB2NAME) +RESLIB2TARGETN=$(BIN)/$(RESLIB2NAME)LANGEXT.res +RSC_MULTI2=$(MISC)/rsc_$(RESLIB2NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB2TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB2TARGETN))) .ENDIF @@ -833,11 +833,11 @@ RESLIB2TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB2TARGETN)) .IF "$(RESLIB3NOVERSION)"=="" .ENDIF # "$(RESLIB3NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)LANGEXT.res -RSC_MULTI3=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB3NAME) +RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB3NAME)LANGEXT.res +RSC_MULTI3=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB3NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB3TARGETN=$(BIN)$/$(RESLIB3NAME)LANGEXT.res -RSC_MULTI3=$(MISC)$/rsc_$(RESLIB3NAME) +RESLIB3TARGETN=$(BIN)/$(RESLIB3NAME)LANGEXT.res +RSC_MULTI3=$(MISC)/rsc_$(RESLIB3NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB3TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB3TARGETN))) .ENDIF @@ -846,11 +846,11 @@ RESLIB3TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB3TARGETN)) .IF "$(RESLIB4NOVERSION)"=="" .ENDIF # "$(RESLIB4NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)LANGEXT.res -RSC_MULTI4=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB4NAME) +RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB4NAME)LANGEXT.res +RSC_MULTI4=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB4NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB4TARGETN=$(BIN)$/$(RESLIB4NAME)LANGEXT.res -RSC_MULTI4=$(MISC)$/rsc_$(RESLIB4NAME) +RESLIB4TARGETN=$(BIN)/$(RESLIB4NAME)LANGEXT.res +RSC_MULTI4=$(MISC)/rsc_$(RESLIB4NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB4TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB4TARGETN))) .ENDIF @@ -859,11 +859,11 @@ RESLIB4TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB4TARGETN)) .IF "$(RESLIB5NOVERSION)"=="" .ENDIF # "$(RESLIB5NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)LANGEXT.res -RSC_MULTI5=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB5NAME) +RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB5NAME)LANGEXT.res +RSC_MULTI5=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB5NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB5TARGETN=$(BIN)$/$(RESLIB5NAME)LANGEXT.res -RSC_MULTI5=$(MISC)$/rsc_$(RESLIB5NAME) +RESLIB5TARGETN=$(BIN)/$(RESLIB5NAME)LANGEXT.res +RSC_MULTI5=$(MISC)/rsc_$(RESLIB5NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB5TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB5TARGETN))) .ENDIF @@ -872,11 +872,11 @@ RESLIB5TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB5TARGETN)) .IF "$(RESLIB6NOVERSION)"=="" .ENDIF # "$(RESLIB6NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)LANGEXT.res -RSC_MULTI6=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB6NAME) +RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB6NAME)LANGEXT.res +RSC_MULTI6=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB6NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB6TARGETN=$(BIN)$/$(RESLIB6NAME)LANGEXT.res -RSC_MULTI6=$(MISC)$/rsc_$(RESLIB6NAME) +RESLIB6TARGETN=$(BIN)/$(RESLIB6NAME)LANGEXT.res +RSC_MULTI6=$(MISC)/rsc_$(RESLIB6NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB6TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB6TARGETN))) .ENDIF @@ -885,11 +885,11 @@ RESLIB6TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB6TARGETN)) .IF "$(RESLIB7NOVERSION)"=="" .ENDIF # "$(RESLIB7NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)LANGEXT.res -RSC_MULTI7=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB7NAME) +RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB7NAME)LANGEXT.res +RSC_MULTI7=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB7NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB7TARGETN=$(BIN)$/$(RESLIB7NAME)LANGEXT.res -RSC_MULTI7=$(MISC)$/rsc_$(RESLIB7NAME) +RESLIB7TARGETN=$(BIN)/$(RESLIB7NAME)LANGEXT.res +RSC_MULTI7=$(MISC)/rsc_$(RESLIB7NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB7TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB7TARGETN))) .ENDIF @@ -898,11 +898,11 @@ RESLIB7TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB7TARGETN)) .IF "$(RESLIB8NOVERSION)"=="" .ENDIF # "$(RESLIB8NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)LANGEXT.res -RSC_MULTI8=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB8NAME) +RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB8NAME)LANGEXT.res +RSC_MULTI8=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB8NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB8TARGETN=$(BIN)$/$(RESLIB8NAME)LANGEXT.res -RSC_MULTI8=$(MISC)$/rsc_$(RESLIB8NAME) +RESLIB8TARGETN=$(BIN)/$(RESLIB8NAME)LANGEXT.res +RSC_MULTI8=$(MISC)/rsc_$(RESLIB8NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB8TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB8TARGETN))) .ENDIF @@ -911,53 +911,53 @@ RESLIB8TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB8TARGETN)) .IF "$(RESLIB9NOVERSION)"=="" .ENDIF # "$(RESLIB9NOVERSION)"=="" .IF "$(common_build_reslib)"!="" -RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)LANGEXT.res -RSC_MULTI9=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/rsc_$(RESLIB9NAME) +RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB9NAME)LANGEXT.res +RSC_MULTI9=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/rsc_$(RESLIB9NAME) .ELSE # "$(common_build_reslib)"!="" -RESLIB9TARGETN=$(BIN)$/$(RESLIB9NAME)LANGEXT.res -RSC_MULTI9=$(MISC)$/rsc_$(RESLIB9NAME) +RESLIB9TARGETN=$(BIN)/$(RESLIB9NAME)LANGEXT.res +RSC_MULTI9=$(MISC)/rsc_$(RESLIB9NAME) .ENDIF # "$(common_build_reslib)"!="" RESLIB9TARGETN!:=$(foreach,i,$(alllangiso) $(subst,LANGEXT,$i $(RESLIB9TARGETN))) .ENDIF .IF "$(INDPRESLIB1NAME)"!="" -INDPRESLIB1TARGETN=$(BIN)$/$(INDPRESLIB1NAME).dll +INDPRESLIB1TARGETN=$(BIN)/$(INDPRESLIB1NAME).dll .ENDIF .IF "$(DEF1NAME)"!="" -DEF1TARGETN=$(MISC)$/$(DEF1NAME).def +DEF1TARGETN=$(MISC)/$(DEF1NAME).def .ENDIF .IF "$(DEF2NAME)"!="" -DEF2TARGETN=$(MISC)$/$(DEF2NAME).def +DEF2TARGETN=$(MISC)/$(DEF2NAME).def .ENDIF .IF "$(DEF3NAME)"!="" -DEF3TARGETN=$(MISC)$/$(DEF3NAME).def +DEF3TARGETN=$(MISC)/$(DEF3NAME).def .ENDIF .IF "$(DEF4NAME)"!="" -DEF4TARGETN=$(MISC)$/$(DEF4NAME).def +DEF4TARGETN=$(MISC)/$(DEF4NAME).def .ENDIF .IF "$(DEF5NAME)"!="" -DEF5TARGETN=$(MISC)$/$(DEF5NAME).def +DEF5TARGETN=$(MISC)/$(DEF5NAME).def .ENDIF .IF "$(DEF6NAME)"!="" -DEF6TARGETN=$(MISC)$/$(DEF6NAME).def +DEF6TARGETN=$(MISC)/$(DEF6NAME).def .ENDIF .IF "$(DEF7NAME)"!="" -DEF7TARGETN=$(MISC)$/$(DEF7NAME).def +DEF7TARGETN=$(MISC)/$(DEF7NAME).def .ENDIF .IF "$(DEF8NAME)"!="" -DEF8TARGETN=$(MISC)$/$(DEF8NAME).def +DEF8TARGETN=$(MISC)/$(DEF8NAME).def .ENDIF .IF "$(DEF9NAME)"!="" -DEF9TARGETN=$(MISC)$/$(DEF9NAME).def +DEF9TARGETN=$(MISC)/$(DEF9NAME).def .ENDIF # IZ65415 - catch obsolete macro. Can be removed later. @@ -968,36 +968,36 @@ NO_SDINAME_allowed .IF "$(SDI1NAME)"!="" .DIRCACHE=no -SDI1TARGET=$(MISC)$/$(SDI1NAME).don -HIDSID1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI1NAME)_sid.hid +SDI1TARGET=$(MISC)/$(SDI1NAME).don +HIDSID1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI1NAME)_sid.hid .ENDIF .IF "$(SDI2NAME)"!="" .DIRCACHE=no -SDI2TARGET=$(MISC)$/$(SDI2NAME).don -HIDSID2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI2NAME)_sid.hid +SDI2TARGET=$(MISC)/$(SDI2NAME).don +HIDSID2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI2NAME)_sid.hid .ENDIF .IF "$(SDI3NAME)"!="" .DIRCACHE=no -SDI3TARGET=$(MISC)$/$(SDI3NAME).don -HIDSID3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI3NAME)_sid.hid +SDI3TARGET=$(MISC)/$(SDI3NAME).don +HIDSID3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI3NAME)_sid.hid .ENDIF .IF "$(SDI4NAME)"!="" .DIRCACHE=no -SDI4TARGET=$(MISC)$/$(SDI4NAME).don -HIDSID4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI4NAME)_sid.hid +SDI4TARGET=$(MISC)/$(SDI4NAME).don +HIDSID4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI4NAME)_sid.hid .ENDIF .IF "$(SDI5NAME)"!="" .DIRCACHE=no -SDI5TARGET=$(MISC)$/$(SDI5NAME).don -HIDSID5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(SDI5NAME)_sid.hid +SDI5TARGET=$(MISC)/$(SDI5NAME).don +HIDSID5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI5NAME)_sid.hid .ENDIF .IF "$(XMLPROPERTIES)"!="" -XMLPROPERTIESN:=$(foreach,i,$(XMLPROPERTIES) $(MISC)$/$(TARGET)_$(i:s/.xrb/.done/)) +XMLPROPERTIESN:=$(foreach,i,$(XMLPROPERTIES) $(MISC)/$(TARGET)_$(i:s/.xrb/.done/)) .ENDIF # "$(XMLPROPERTIES)"!="" .IF "$(UNIXTEXT)"!="" @@ -1007,36 +1007,36 @@ CONVERTUNIXTEXT:=$(UNIXTEXT) .ENDIF # "$(UNIXTEXT)"!="" .IF "$(EXTUPDATEINFO_NAME)"!="" -EXTUPDATEINFO_DEST:=$(MISC)$/$(EXTUPDATEINFO_NAME) +EXTUPDATEINFO_DEST:=$(MISC)/$(EXTUPDATEINFO_NAME) EXTUPDATEINFO_SOURCE*=description.xml .ENDIF # "$(EXTUPDATEINFO_NAME)"!="" .IF "$(JAVACLASSFILES:s/DEFINED//)"!="" || "$(javauno)"!="" .IF "$(L10N_framework)"=="" -TARGETDPJ=$(MISC)$/$(TARGET).dpj +TARGETDPJ=$(MISC)/$(TARGET).dpj .ENDIF # "$(L10N_framework)"=="" .ENDIF .IF "$(no_hids)$(NO_HIDS)"=="" BUILDHIDS:=TRUE .IF "$(GEN_HID_OTHER)"!="" -PRJHIDOTHERTARGET=$(SRS)$/hidother.hid -COMMONPRJHIDOTHERTARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC)$/$(TARGET)_othr.hid) +PRJHIDOTHERTARGET=$(SRS)/hidother.hid +COMMONPRJHIDOTHERTARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC)/$(TARGET)_othr.hid) .ENDIF .IF "$(GEN_HID2)"!="" -PRJHID2TARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst +PRJHID2TARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .ENDIF .ENDIF # "$(no_hids)$(NO_HIDS)"=="" .IF "$(make_srs_deps)"=="" .IF "$(SRCFILES)" != "" || "$(SRC1FILES)" != "" || "$(SRC2FILES)" != "" -DPRTARGET= $(MISC)$/$(TARGET).dpr +DPRTARGET= $(MISC)/$(TARGET).dpr .ENDIF .ENDIF .IF "$(make_zip_deps)"=="" .IF "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != "" -DPZTARGET= $(MISC)$/$(TARGET).dpz +DPZTARGET= $(MISC)/$(TARGET).dpz .ENDIF # "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != "" .ENDIF # "$(make_zip_deps)"=="" @@ -1060,7 +1060,7 @@ ALL_JAVA_TARGETS= \ .IF "$(lintit)"=="" .IF "$(L10N_framework)"!="" ALLTAR: \ - "$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk" \ + "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \ $(SUBDIRS) \ $(DPRTARGET) \ $(DPZTARGET) \ @@ -1112,7 +1112,7 @@ ALLTAR: \ .ELSE # "$(L10N_framework)"!="" ALLTAR: \ - "$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk" \ + "$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/$(UPD)minor.mk" \ $(MAKEDEMODIR) $(MAKECOMPDIR) $(MAKEXLDIR) \ $(COMPVERMK) \ $(JAVAVERMK) \ @@ -1233,7 +1233,7 @@ ALLTAR : \ $(SHL1TARGETN_X64) $(SHL2TARGETN_X64) .ENDIF # "$(BUILD_X64)"!="" -ALLTAR : "$(SOLARINCDIR)$/$(UPD)minor.mk" +ALLTAR : "$(SOLARINCDIR)/$(UPD)minor.mk" .IF "$(EXCEPTIONSNOOPT_FLAG)"=="" TARGETDEPS+=$(EXCEPTIONSNOOPTTARGET) @@ -1295,7 +1295,7 @@ $(UNOUCRHEADER): $(UNOUCRTARGET) : $(UNOUCRDEP) .IF "$(XML2MK_FILES)"!="" - @@-$(RM) $(foreach,i,$(XML2MK_FILES) $(MISC)$/$(i).mk) + @@-$(RM) $(foreach,i,$(XML2MK_FILES) $(MISC)/$(i).mk) .ENDIF # "$(XML2MK_FILES)"!="" @@-$(MKDIRHIER) $(UNOUCROUT) $(CPPUMAKER) @$(mktmp $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOTYPES:^"-T") $(UNOUCRRDB)) && $(TOUCH) $@ @@ -1345,27 +1345,27 @@ ALLTAR: $(OBJFILES) $(SLOFILES) .ENDIF # "$(lintit)"=="" .IF "$(SDINAME)"!="" -$(OBJ)$/$(CINTERNAME).obj : $(SDITARGET) +$(OBJ)/$(CINTERNAME).obj : $(SDITARGET) .ENDIF .IF "$(SDI1NAME)"!="" -$(OBJ)$/$(CINTER1NAME).obj : $(SDI1TARGET) +$(OBJ)/$(CINTER1NAME).obj : $(SDI1TARGET) .ENDIF .IF "$(SDI2NAME)"!="" -$(OBJ)$/$(CINTER2NAME).obj : $(SDI2TARGET) +$(OBJ)/$(CINTER2NAME).obj : $(SDI2TARGET) .ENDIF .IF "$(SDI3NAME)"!="" -$(OBJ)$/$(CINTER3NAME).obj : $(SDI3TARGET) +$(OBJ)/$(CINTER3NAME).obj : $(SDI3TARGET) .ENDIF .IF "$(SDI4NAME)"!="" -$(OBJ)$/$(CINTER4NAME).obj : $(SDI4TARGET) +$(OBJ)/$(CINTER4NAME).obj : $(SDI4TARGET) .ENDIF .IF "$(SDI5NAME)"!="" -$(OBJ)$/$(CINTER5NAME).obj : $(SDI5TARGET) +$(OBJ)/$(CINTER5NAME).obj : $(SDI5TARGET) .ENDIF .IF "$(SOLAR_JAVA)"!="" @@ -1398,38 +1398,36 @@ $(LOCALIZESDF)%: @@-$(MKDIRHIER) $(@:d) .IF "$(LOCALIZATION_FOUND)"=="" -.IF "$(LOCALSDFFILE)"!="" -$(LOCALSDFFILE) : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip +.IF "$(LOCALIZESDF)"!="" +"$(LOCALIZESDF)" : $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip @@-$(MKDIRHIER) $(@:d) - @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET) - -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@) - $(TOUCH) $@ - -.ENDIF # "$(LOCALSDFFILE)"!="" -.ENDIF # "$(LOCALIZATION_FOUND)"=="" + @@-$(MKDIRHIER) $(COMMONMISC)/$(PRJNAME)_$(TARGET) + @@$(IFNOTEXIST) $(LOCALIZESDF) $(THEN) unzip -o -d $(COMMONMISC)/$(PRJNAME)_$(TARGET) $(SOLARCOMMONSDFDIR)/$(PRJNAME).zip $(FI) + @@-cp -r $(COMMONMISC)/$(PRJNAME)_$(TARGET)/* $(COMMONMISC)/$(PRJNAME) + @@-$(RM) -rf $(COMMONMISC)/$(PRJNAME)_$(TARGET) .ENDIF # "$(LOCALIZESDF)"!="" .ENDIF # "$(WITH_LANG)"!="" .IF "$(EXTUPDATEINFO_NAME)"!="" $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE) - $(PERL) $(SOLARENV)$/bin/make_ext_update_info.pl --out $(EXTUPDATEINFO_DEST) $(foreach,i,$(EXTUPDATEINFO_URLS) --update-url "$i") $(EXTUPDATEINFO_SOURCE) + $(PERL) $(SOLARENV)/bin/make_ext_update_info.pl --out $(EXTUPDATEINFO_DEST) $(foreach,i,$(EXTUPDATEINFO_URLS) --update-url "$i") $(EXTUPDATEINFO_SOURCE) .ENDIF # "$(EXTUPDATEINFO_NAME)"!="" makedoc: - @@-mkdir $(OUT)$/ucrdoc - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n")) -# -$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P..$/$(PRJNAME)$/$(IDLPACKAGE) -OH$(PRJ)$/..$/unodoc $(DOCIDLFILES) $(IDLFILES) + @@-mkdir $(OUT)/ucrdoc + $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(DEPIDLFILES:+"\n")) +# -$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P../$(PRJNAME)/$(IDLPACKAGE) -OH$(PRJ)/../unodoc $(DOCIDLFILES) $(IDLFILES) .IF "$(LOCALDBTARGET)"!="" $(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES) - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl)) + $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)/ucr/$(IDLPACKAGE) $(all_outdated_idl)) -$(RM) $@ $(REGMERGE) $@ UCR @$(mktmp $(URDFILES)) .ENDIF .IF "$(LOCALDOCDBTARGET)"!="" $(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES) - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl)) + $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(all_outdated_idl)) -$(RM) $@ $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES)) .ENDIF @@ -1454,12 +1452,12 @@ $(UNOIDLDBDOCTARGET) : $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS) .IF "$(SCP_PRODUCT_TYPE)"!="" $(SCP_PRODUCT_TYPE): - @@-$(MKDIRHIER) $(PAR)$/$@ - @@-$(MKDIRHIER) $(BIN)$/$@ + @@-$(MKDIRHIER) $(PAR)/$@ + @@-$(MKDIRHIER) $(BIN)/$@ .ENDIF # "$(PARFILES)"!="" -"$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg" : +"$(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg" : $(TOUCH) $@ .IF "$(COMPVERMK)"!="" @@ -1468,7 +1466,7 @@ $(SCP_PRODUCT_TYPE): COMPVERMK_PHONY:=.PHONY .ENDIF # "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)" COMPVTMP:=$(mktmp iii) -"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg +"$(COMPVERMK)" $(COMPVERMK_PHONY): $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg .IF "$(CCNUMVER)"!="" @echo COMNAME:=$(COMNAME) > $(COMPVTMP) @echo COMID:=$(COMID) >> $(COMPVTMP) @@ -1495,7 +1493,7 @@ COMPVTMP:=$(mktmp iii) .IF "$(JAVALOCATION)"!="$(JAVA_HOME)" "$(JAVAVERMK)" .PHONY : .ELSE # "$(JAVALOCATION)"!="$(JAVA_HOME)" -"$(JAVAVERMK)" : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg +"$(JAVAVERMK)" : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg .ENDIF # "$(JAVALOCATION)"!="$(JAVA_HOME)" @-$(RM) $@ @echo JAVAVER:=$(JAVAVER) > $@ @@ -1514,23 +1512,23 @@ $(TARGETDEPS) : $(LOCALIZE_ME_DEST) .IF "$(WITH_LANG)"=="" $(LOCALIZE_ME_DEST) : $(LOCALIZE_ME) - -$(RM) $(INCCOM)$/$(TARGET)_lastrun.mk + -$(RM) $(INCCOM)/$(TARGET)_lastrun.mk -$(MKDIR) $(@:d) -$(RM) $@ $(COPY) $(@:b:+"_tmpl")$(@:e) $@ .ELSE # "$(WITH_LANG)"=="" # LASTRUN_MERGED -.INCLUDE .IGNORE : $(INCCOM)$/$(TARGET)_lastrun.mk +.INCLUDE .IGNORE : $(INCCOM)/$(TARGET)_lastrun.mk .IF "$(LASTRUN_MERGED)"=="TRUE" $(LOCALIZE_ME_DEST) : $(LOCALIZE_ME) $(LOCALIZESDF) .ELSE # "$(LASTRUN_MERGED)"=="TRUE" $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF) - echo LASTRUN_MERGED:=TRUE > $(INCCOM)$/$(TARGET)_lastrun.mk + echo LASTRUN_MERGED:=TRUE > $(INCCOM)/$(TARGET)_lastrun.mk .ENDIF # "$(LASTRUN_MERGED)"=="TRUE" -$(MKDIR) $(@:d) -$(RM) $@ - $(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)$/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all + $(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all $(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@ .ENDIF # "$(WITH_LANG)"=="" @@ -1541,13 +1539,13 @@ $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF) XML_ISO_CODE*=-ISO99 $(L10N_framework) .ENDIF .IF "$(WITH_LANG)"!="" -$(MISC)$/$(TARGET)_%.done : $(COMMONMISC)$/$(TARGET)$/%.xrb +$(MISC)/$(TARGET)_%.done : $(COMMONMISC)/$(TARGET)/%.xrb .ELSE # "$(WITH_LANG)"!="" -$(MISC)$/$(TARGET)_%.done : %.xrb +$(MISC)/$(TARGET)_%.done : %.xrb .ENDIF # "$(WITH_LANG)"!="" - @@-$(RM) $(MISC)$/$(<:b).interm$(TARGET) - native2ascii -encoding UTF8 $< $(MISC)$/$(<:b).interm$(TARGET) && $(XMLEX) -i $(MISC)$/$(<:b).interm$(TARGET) -o $(CLASSDIR) $(XML_ISO_CODE) -g -d $@ - @@$(RM) $(MISC)$/$(<:b).interm$(TARGET) + @@-$(RM) $(MISC)/$(<:b).interm$(TARGET) + native2ascii -encoding UTF8 $< $(MISC)/$(<:b).interm$(TARGET) && $(XMLEX) -i $(MISC)/$(<:b).interm$(TARGET) -o $(CLASSDIR) $(XML_ISO_CODE) -g -d $@ + @@$(RM) $(MISC)/$(<:b).interm$(TARGET) .ENDIF # "$(XMLPROPERTIES)"!="" .IF "$(HIDSID1PARTICLE)$(SDI1TARGET)$(HIDSID2PARTICLE)$(SDI2TARGET)$(HIDSID3PARTICLE)$(SDI3TARGET)$(HIDSID4PARTICLE)$(SDI4TARGET)$(HIDSID5PARTICLE)$(SDI5TARGET)$(HIDSID6PARTICLE)$(SDI6TARGET)$(HIDSID7PARTICLE)$(SDI7TARGET)$(HIDSID8PARTICLE)$(SDI8TARGET)$(HIDSID9PARTICLE)$(SDI9TARGET)"!="" @@ -1689,7 +1687,7 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET) .IF "$(make_srs_deps)"=="" .IF "$(SRCFILES)" != "" || "$(SRC1FILES)" != "" || "$(SRC2FILES)" != "" .IF "$(nodep)"=="" -.INCLUDE : $(MISC)$/$(TARGET).dpr +.INCLUDE : $(MISC)/$(TARGET).dpr .ENDIF # "$(nodep)"=="" .ENDIF .ENDIF @@ -1697,7 +1695,7 @@ $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET) .IF "$(make_zip_deps)"=="" .IF "$(ZIP1TARGET)" != "" || "$(ZIP2TARGET)" != "" || "$(ZIP3TARGET)" != "" .IF "$(nodep)"=="" -.INCLUDE : $(MISC)$/$(TARGET).dpz +.INCLUDE : $(MISC)/$(TARGET).dpz # introduce separation char missing_zipdep_langs=$(alllangiso:^"+":+"+") some_dummy_var:=$(foreach,i,$(zipdep_langs) $(assign missing_zipdep_langs:=$(strip $(subst,+$(i)+, $(missing_zipdep_langs))))) @@ -1711,11 +1709,11 @@ ZIPDEPPHONY=.PHONY last_target: @echo ------------- -$(MISC)$/$(TARGET)genjava.mk: $(IDLFILES) +$(MISC)/$(TARGET)genjava.mk: $(IDLFILES) .IF "$(JAVACLASSFILES:s/DEFINED//)"!="" .IF "$(L10N_framework)"=="" -.INCLUDE .IGNORE : $(MISC)$/$(TARGET).dpj +.INCLUDE .IGNORE : $(MISC)/$(TARGET).dpj $(TARGETDPJ) : $(JAVAFILES) $(JAVATARGET) .ENDIF # "$(L10N_framework)"=="" .ENDIF @@ -1781,29 +1779,29 @@ ALLTAR : forcedeps # - several kill targets - # ------------------------- -"$(TMP)$/makedt.don": - @$(TOUCH) $(TMP)$/makedt.don +"$(TMP)/makedt.don": + @$(TOUCH) $(TMP)/makedt.don killbin: .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" - @$(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) - @$(IFEXIST) $(BIN)$/$(SHL4TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL4TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL5TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL5TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL6TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL6TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL7TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL7TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL8TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL8TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(SHL9TARGET).dll $(THEN) $(RM:s/+//) $(BIN)$/$(SHL9TARGET).dll $(FI) - @$(IFEXIST) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP1TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP2TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP3TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP4TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP5TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP6TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP7TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP8TARGET)$(EXECPOST) $(FI) - @$(IFEXIST) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)$/$(APP9TARGET)$(EXECPOST) $(FI) + @$(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) + @$(IFEXIST) $(BIN)/$(SHL4TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL4TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL5TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL5TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL6TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL6TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL7TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL7TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL8TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL8TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(SHL9TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL9TARGET).dll $(FI) + @$(IFEXIST) $(BIN)/$(APP1TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP1TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP2TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP2TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP3TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP3TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP4TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP4TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP5TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP5TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP6TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP6TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP7TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP7TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP8TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP8TARGET)$(EXECPOST) $(FI) + @$(IFEXIST) $(BIN)/$(APP9TARGET)$(EXECPOST) $(THEN) $(RM:s/+//) $(BIN)/$(APP9TARGET)$(EXECPOST) $(FI) .ELSE # "$(GUI)"=="WNT" .IF "$(SHL1TARGET)"!="" @@ -1925,7 +1923,7 @@ killlib: clean_misc : .IF "$(MISC)"!="" - rm -rf $(MISC)$/* + rm -rf $(MISC)/* @echo misc is gone! .ELSE # "$(MISC)"!="" @echo can\'t be done! $$(MISC) not defined. @@ -1933,11 +1931,7 @@ clean_misc : clean_all : .IF "$(OUT)"!="" -.IF "$(USE_SHELL)"!="4nt" - test -f $(PRJ)$/prj/build.lst && rm -rf $(OUT) -.ELSE # "$(USE_SHELL)"!="4nt" - $(IFEXIST) $(PRJ)$/prj/build.lst $(THEN) del /sxyz $(OUT) $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" + test -f $(PRJ)/prj/build.lst && rm -rf $(OUT) @echo local output tree is gone! .ELSE # "$(OUT)"!="" @echo can\'t be done! $$(OUT) not defined. @@ -1984,15 +1978,15 @@ delzip: force_dmake_to_error .IF "$(make_srs_deps)"=="" -$(MISC)$/$(TARGET).dpr : $(SRCFILES) $(SRC1FILES) $(SRC2FILES) $(SRC3FILES) +$(MISC)/$(TARGET).dpr : $(SRCFILES) $(SRC1FILES) $(SRC2FILES) $(SRC3FILES) .ENDIF .IF "$(make_zip_deps)"=="" -$(MISC)$/$(TARGET).dpz $(ZIPDEPPHONY) : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN) +$(MISC)/$(TARGET).dpz $(ZIPDEPPHONY) : $(ZIP1TARGETN) $(ZIP2TARGETN) $(ZIP3TARGETN) $(ZIP4TARGETN) $(ZIP5TARGETN) $(ZIP6TARGETN) $(ZIP7TARGETN) $(ZIP8TARGETN) $(ZIP9TARGETN) .ENDIF VERSIONTMP:=$(mktmp iii) -$(INCCOM)$/%_version.h : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/minormkchanged.flg +$(INCCOM)/%_version.h : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg @echo $(EMQ)#define _BUILD $(EMQ)"$(BUILD)$(EMQ)" > $(VERSIONTMP) @echo $(EMQ)#define _UPD $(EMQ)"$(UPD)$(EMQ)" >> $(VERSIONTMP) @echo $(EMQ)#define _LAST_MINOR $(EMQ)"$(LAST_MINOR)$(EMQ)" >> $(VERSIONTMP) @@ -2020,17 +2014,17 @@ UNOUCRDEPxxx : $(UNOUCRDEP); #new hid.lst trigger with GEN_HID2=TRUE -$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst .PHONY : +$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY : @echo Making $@ : @echo --------------- @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp - $(TYPE) $(SOLARCOMMONBINDIR)$/hid$/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp + $(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) @-$(RENAME) $@.$(ROUT).tmp $@ @-mkdir $(@:d)hid - $(PERL) $(SOLARENV)$/bin$/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)$/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv.$(ROUT).tmp - @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv $(FI) - @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid$/userfeedback_VCL_names.csv + $(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp + @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI) + @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv .IF "$(SOLAR_JAVA)"!="" @@ -2042,7 +2036,7 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst .PHONY : .INCLUDE : tg_merge.mk wordcount: - wc *.* >> $(TMP)$/wc.lst + wc *.* >> $(TMP)/wc.lst testt: @echo test diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index efffc86156c3..fc0b3d351ad1 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -34,7 +34,7 @@ # unroll begin .IF "$(GUI)" == "OS2" && "$(TARGETTYPE)" == "GUI" -APP$(TNR)DEF = $(MISC)$/$(APP$(TNR)TARGET).def +APP$(TNR)DEF = $(MISC)/$(APP$(TNR)TARGET).def .ENDIF .IF "$(APP$(TNR)LINKTYPE)" != "" @@ -76,7 +76,7 @@ APP$(TNR)OBJS+= $(STDOBJVCL) .IF "$(GUI)$(COM)" == "WNTGCC" APP$(TNR)RESO= .IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != "" -APP$(TNR)RESO=$(MISC)$/$(APP$(TNR)TARGET:b)_res.o +APP$(TNR)RESO=$(MISC)/$(APP$(TNR)TARGET:b)_res.o .ENDIF .ENDIF @@ -88,19 +88,19 @@ USE_APP$(TNR)DEF= .IF "$(APP$(TNR)TARGETN)"!="" .IF "$(APP$(TNR)PRODUCTNAME)"!="" -APP$(TNR)PRODUCTDEF:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\" +APP$(TNR)PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\" .ENDIF # "$(APP$(TNR)PRODUCTNAME)"!="" .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" .IF "$(APP$(TNR)LIBS)"!="" -$(MISC)$/$(APP$(TNR)TARGET)_linkinc.ls .PHONY: +$(MISC)/$(APP$(TNR)TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - sed -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(APP$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@ + sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF #"$(APP$(TNR)LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(APP$(TNR)TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(APP$(TNR)TARGETN:b)_linkinc.ls $(APP$(TNR)TARGETN) : $(LINKINCTARGETS) .ENDIF # "$(linkinc)"!="" @@ -108,7 +108,7 @@ $(APP$(TNR)TARGETN) : $(LINKINCTARGETS) 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 = $(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 = @@ -123,24 +123,24 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @-$(RM) $(MISC)$/$(@:b).strip + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @-$(RM) $(MISC)/$(@:b).strip @echo $(STDSLO) $(APP$(TNR)OBJS:s/.obj/.o/) \ - `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) -o $@ \ - $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)$/$(@:b).list > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + `cat /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \ + $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd # Need to strip __objcInit symbol to avoid duplicate symbols when loading # libraries at runtime - @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)$/$(@:b).strip - @strip -i -R $(MISC)$/$(@:b).strip -X $@ + @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip + @strip -i -R $(MISC)/$(@:b).strip -X $@ @ls -l $@ - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ app $(APP$(TNR)RPATH) $@ .IF "$(TARGETTYPE)"=="GUI" @echo "Making: $@.app" @@ -148,44 +148,44 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ .ENDIF # "$(TARGETTYPE)"=="GUI" .ELSE # "$(OS)"=="MACOSX" @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ - $(APP$(TNR)OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ + $(APP$(TNR)OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @ls -l $@ .ENDIF # "$(OS)"=="MACOSX" .ENDIF .IF "$(GUI)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP$(TNR)LINKRES)" != "" - @@-$(RM) $(MISC)$/$(APP$(TNR)LINKRES:b).rc + @@-$(RM) $(MISC)/$(APP$(TNR)LINKRES:b).rc .IF "$(APP$(TNR)ICON)" != "" - @-echo 1 ICON $(EMQ)"$(APP$(TNR)ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc + @-echo 1 ICON $(EMQ)"$(APP$(TNR)ICON:s/\/\\/)$(EMQ)" >> $(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 + @-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)" != "" - $(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc + $(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc .ENDIF # "$(APP$(TNR)LINKRES)" != "" .IF "$(COM)" == "GCC" @echo mingw .IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != "" - @cat $(APP$(TNR)LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) > $(MISC)$/$(@:b)_all.res - windres $(MISC)$/$(@:b)_all.res $(APP$(TNR)RESO) + @cat $(APP$(TNR)LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) > $(MISC)/$(@:b)_all.res + windres $(MISC)/$(@:b)_all.res $(APP$(TNR)RESO) .ENDIF - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \ $(APP$(TNR)BASEX) $(APP$(TNR)STACKN) -o $@ $(APP$(TNR)OBJS) \ - -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP$(TNR)RESO) \ + -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP$(TNR)RESO) \ `$(TYPE) /dev/null $(APP$(TNR)LIBS) | sed s#$(ROUT)#$(OUT)#g` \ $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) \ -Wl,--start-group $(APP$(TNR)STDLIBS) -Wl,--end-group $(APP$(TNR)STDLIB) \ - $(STDLIB$(TNR)) $(MINGWSSTDENDOBJ) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + $(STDLIB$(TNR)) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @ls -l $@ .ELSE # "$(COM)" == "GCC" .IF "$(linkinc)" == "" @@ -194,7 +194,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \ $(APP$(TNR)STACKN) \ -out:$@ \ - -map:$(MISC)$/{$(subst,$/,_ $(APP$(TNR)TARGET)).map} \ + -map:$(MISC)/{$(subst,/,_ $(APP$(TNR)TARGET)).map} \ $(STDOBJ) \ $(APP$(TNR)LINKRES) \ $(APP$(TNR)RES) \ @@ -205,7 +205,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ ) @-echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI) @@ -230,17 +230,13 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ $(APP$(TNR)STDLIBS) \ $(APP$(TNR)STDLIB) $(STDLIB$(TNR))) $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP$(TNR)TARGETN:b)_linkobj.lst >> $(MISC)\$(APP$(TNR)TARGET).lst - $(IFEXIST) $(MISC)$/$(APP$(TNR)TARGET).lst $(THEN) type $(MISC)$/$(APP$(TNR)TARGET).lst >> $(MISC)$/$(APP$(TNR)TARGET).lnk $(FI) + $(IFEXIST) $(MISC)/$(APP$(TNR)TARGET).lst $(THEN) type $(MISC)/$(APP$(TNR)TARGET).lst >> $(MISC)/$(APP$(TNR)TARGET).lnk $(FI) $(APP$(TNR)LINKER) @$(MISC)\$(APP$(TNR)TARGET).lnk .ENDIF # "$(linkinc)" == "" .ENDIF # "$(COM)" == "GCC" .IF "$(APP$(TNR)TARGET)" == "loader" $(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" $(RM) $@ $(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" @@ -250,23 +246,19 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ .IF "$(GUI)" == "OS2" @+-$(MKDIR) $(@:d:d) >& $(NULLDEV) .IF "$(APP$(TNR)LINKRES)" != "" - @+-$(RM) $(MISC)$/$(APP$(TNR)LINKRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(APP$(TNR)LINKRES:b).rc >& $(NULLDEV) .IF "$(APP$(TNR)ICON)" != "" -.IF "$(USE_SHELL)"=="4nt" - @-+echo ICON 1 "$(APP$(TNR)ICON:s/\/\\/)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc -.ELSE # "$(USE_SHELL)"=="4nt" - @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP$(TNR)ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc -.ENDIF # "$(USE_SHELL)"=="4nt" + @-+$(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 + @-+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)" != "" - $(RC) -r -DOS2 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc + $(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 + @echo NAME $(APP$(TNR)TARGET) WINDOWAPI > $(MISC)/$(APP$(TNR)TARGET).def .ENDIF @+echo $(APP$(TNR)LINKFLAGS) \ @@ -274,7 +266,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ $(APP$(TNR)STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP$(TNR)LINKRES) \ $(APP$(TNR)RES) \ @@ -289,7 +281,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ $(APP$(TNR)STACKN) \ -o $@ \ -Zmap -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(STDOBJ) \ $(APP$(TNR)LINKRES) \ $(APP$(TNR)RES) \ @@ -302,11 +294,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ .IF "$(APP$(TNR)TARGET)" == "loader" +$(PERL) loader.pl $@ -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe -.ENDIF # "$(USE_SHELL)"=="4nt" +$(RM) $@ +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk index 8ad196a17057..5c00ffb74f28 100644 --- a/solenv/inc/tg_compv.mk +++ b/solenv/inc/tg_compv.mk @@ -29,7 +29,7 @@ # #************************************************************************* -COMPVERMK:=$(SOLARINCDIR)$/comp_ver.mk +COMPVERMK:=$(SOLARINCDIR)/comp_ver.mk .INCLUDE .IGNORE : $(COMPVERMK) @@ -41,20 +41,20 @@ COMNAME:= .IF "$(COM)"=="GCC" CFLAGSVERSION=-dumpversion CFLAGSVERSION_CMD=-dumpversion -CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk -#CFLAGSNUMVERSION_CMD=-dumpversion | 2>&1 $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk +CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk +#CFLAGSNUMVERSION_CMD=-dumpversion | 2>&1 $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk .ENDIF .IF "$(COM)"=="MSC" CFLAGSVERSION= -CFLAGSVERSION_CMD= $(PIPEERROR) $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk -CFLAGSNUMVERSION_CMD= $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk +CFLAGSVERSION_CMD= $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk +CFLAGSNUMVERSION_CMD= $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk .ENDIF .IF "$(COM)"=="C55" || "$(COM)"=="C54" || "$(COM)"=="C52" || "$(COM)"=="C40" || "$(COM)"=="sunpro" CFLAGSVERSION= -V -CFLAGSVERSION_CMD= -V $(PIPEERROR) $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk -CFLAGSNUMVERSION_CMD= -V $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk +CFLAGSVERSION_CMD= -V $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk +CFLAGSNUMVERSION_CMD= -V $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk .ENDIF .IF "$(COM)"=="C730" diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk index 61130c289906..099ec9ee636b 100644 --- a/solenv/inc/tg_config.mk +++ b/solenv/inc/tg_config.mk @@ -29,13 +29,17 @@ # #************************************************************************* -PACKAGEDIR*:=$(subst,.,$/ $(PACKAGE)) +PACKAGEDIR*:=$(subst,.,/ $(PACKAGE)) XSLTPACKAGEDIR*:=$(subst,.,/ $(PACKAGE)) XCSROOTURL!:=$(ABSXCSROOT) .IF $(GUI)==WNT XCSROOTURL!:=file:///$(subst,\,/ $(XCSROOTURL)) .ENDIF -SYSXSLDIR*:=$(XSLDIR)$/ +SYSXSLDIR*:=$(XSLDIR)/ +.IF $(GUI)==OS2 +XCSROOTURL!:=$(subst,\,/ $(XCSROOTURL)) +SYSXSLDIR!:=$(subst,\,/ $(SYSXSLDIR))/ +.ENDIF # # --- XCS --- @@ -43,50 +47,50 @@ SYSXSLDIR*:=$(XSLDIR)$/ .IF "$(XCSFILES)"!="" # remove unnecessary info from the component schemas -XCS_TRIM=$(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/{$(XCSFILES)} +XCS_TRIM=$(PROCESSOUT)/registry/schema/$(PACKAGEDIR)/{$(XCSFILES)} # transform xcs format to properties format -# XCS_RESOURCES=$(foreach,i,$(XCSFILES) $(MISC)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/$(i:b).properties) +# XCS_RESOURCES=$(foreach,i,$(XCSFILES) $(MISC)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/$(i:b).properties) ALLTAR: \ $(XCS_TRIM) .ENDIF # "$(XCSFILES)"!="" .IF "$(XCS_TRIM)" != "" -$(XCS_TRIM) : $(DTDDIR)$/registry$/component-schema.dtd \ - $(XSLDIR)$/schema_val.xsl \ - $(XSLDIR)$/sanity.xsl \ - $(XSLDIR)$/schema_trim.xsl +$(XCS_TRIM) : $(DTDDIR)/registry/component-schema.dtd \ + $(XSLDIR)/schema_val.xsl \ + $(XSLDIR)/sanity.xsl \ + $(XSLDIR)/schema_trim.xsl .ENDIF -$(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs +$(PROCESSOUT)/registry/schema/$(PACKAGEDIR)/%.xcs : %.xcs @echo -------------+ validating and stripping schema files -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.val) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \ --stringparam componentName $(PACKAGE).$* \ $(SYSXSLDIR)schema_val.xsl $< - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.san) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.san) \ $(SYSXSLDIR)sanity.xsl $< - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \ $(SYSXSLDIR)schema_trim.xsl $< +-$(RM) $(@:d)$*.val > $(NULLDEV) +-$(RM) $(@:d)$*.san > $(NULLDEV) -$(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs : %.xcs +$(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcs : %.xcs # just a copy for now - insert "cfgex" commandline when required -$(MKDIRHIER) $(@:d) $(COPY) $< $@ # Create properties files for localized <info> contents (Currently not built) .IF "$(XCS_RESOURCES)" != "" -$(XCS_RESOURCES) : $(XSLDIR)$/resource.xsl +$(XCS_RESOURCES) : $(XSLDIR)/resource.xsl .ENDIF -$(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs +$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.properties :| $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcs @echo -------------+ creating locale dependent resource bundles -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \ - --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \ + --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \ $(SYSXSLDIR)resource.xsl $< # @@ -94,25 +98,25 @@ $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $( # .IF "$(XCUFILES)"!="" -XCU_DEFAULT =$(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/{$(XCUFILES)} -XCU_MODULES =$(foreach,i,$(MODULEFILES) $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/$(i)) -XCU_LANG =$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/$(i)) +XCU_DEFAULT =$(PROCESSOUT)/registry/data/$(PACKAGEDIR)/{$(XCUFILES)} +XCU_MODULES =$(foreach,i,$(MODULEFILES) $(PROCESSOUT)/registry/spool/$(PACKAGEDIR)/$(i)) +XCU_LANG =$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/$(i)) .ENDIF # "$(XCUFILES)"!="" .IF "$(XCU_DEFAULT)" != "" -$(XCU_DEFAULT) : $(DTDDIR)$/registry$/component-update.dtd \ - $(XSLDIR)$/data_val.xsl \ - $(XSLDIR)$/alllang.xsl +$(XCU_DEFAULT) : $(DTDDIR)/registry/component-update.dtd \ + $(XSLDIR)/data_val.xsl \ + $(XSLDIR)/alllang.xsl .ENDIF -$(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu +$(PROCESSOUT)/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu @echo -------------+ validating and creating a locale independent file -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $(@:d))$*.val) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ $(SYSXSLDIR)data_val.xsl $< - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ $(SYSXSLDIR)alllang.xsl $< @@ -124,48 +128,48 @@ $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu $(XCU_LANG) : $(LOCALIZESDF) .ENDIF # "$(XCU_LANG)"!="" -$(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu : %.xcu +$(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu : %.xcu -$(MKDIRHIER) $(@:d) $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all .IF "$(XCU_LANG)" != "" -$(XCU_LANG) : $(XSLDIR)$/alllang.xsl +$(XCU_LANG) : $(XSLDIR)/alllang.xsl .ENDIF -$(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu +$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu .ELSE # "$(WITH_LANG)"!="" -$(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.xcu :| %.xcu +$(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| %.xcu .ENDIF # "$(WITH_LANG)"!="" @echo ------------- creating locale dependent entries -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ - --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \ + --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \ $(SYSXSLDIR)alllang.xsl $< # --- languagepack tag modules --- .IF "$(LANGUAGEPACKS)" != "" -$(LANGUAGEPACKS) : $(XSLDIR)$/delcomment.sed +$(LANGUAGEPACKS) : $(XSLDIR)/delcomment.sed .ENDIF -$(PROCESSOUT)$/registry$/spool$/Langpack-%.xcu : Langpack.xcu.tmpl +$(PROCESSOUT)/registry/spool/Langpack-%.xcu : Langpack.xcu.tmpl @echo -------------+ creating a Langpack module for locale $* -$(MKDIRHIER) $(@:d) - $(SED) -e "s/__LANGUAGE__/$*/" -f $(XSLDIR)$/delcomment.sed $< > $@ + $(SED) -e "s/__LANGUAGE__/$*/" -f $(XSLDIR)/delcomment.sed $< > $@ # --- modules --- .IF "$(XCU_MODULES)" != "" -$(XCU_MODULES) : $(XSLDIR)$/alllang.xsl +$(XCU_MODULES) : $(XSLDIR)/alllang.xsl .ENDIF -$(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu +$(PROCESSOUT)/registry/spool/$(PACKAGEDIR)/%.xcu :| $$(@:b:s/-/./:b).xcu @echo -------------+ creating a module file -$(MKDIRHIER) $(@:d) - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))$/$(subst,$(PRJ), $@)) \ + $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \ --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$(<:b).xcs \ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ --stringparam module $(subst,$(<:b)-, $(*)) \ @@ -177,7 +181,7 @@ ALLTAR: \ $(XCU_MODULES) \ $(XCU_LANG) -$(XCU_DEFAULT) : $$(@:d:s!$(PROCESSOUT)$/registry$/data$/!$(ABSXCSROOT)$/registry$/schema$/!)$$(@:f:s/.xcu/.xcs/) +$(XCU_DEFAULT) : $$(@:d:s!$(PROCESSOUT)/registry/data/!$(ABSXCSROOT)/registry/schema/!)$$(@:f:s/.xcu/.xcs/) .ENDIF # "$(XCUFILES)"!="" diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk index ff26f53271b2..88feb367c08b 100644 --- a/solenv/inc/tg_def.mk +++ b/solenv/inc/tg_def.mk @@ -41,19 +41,19 @@ DEFLIB$(TNR)NAME*=$(DEF$(TNR)LIBNAME) .ENDIF # "$(DEF$(TNR)LIBNAME)"!="" .IF "$(DEFLIB$(TNR)NAME)"!="" -DEF$(TNR)DEPN+=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib) +DEF$(TNR)DEPN+=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) .ENDIF .IF "$(SHL$(TNR)VERSIONMAP)"!="" .IF "$(DEF$(TNR)EXPORTFILE)"=="" .IF "$(GUI)"=="WNT" -DEF$(TNR)EXPORTFILE=$(MISC)$/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET).dxp +DEF$(TNR)EXPORTFILE=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET).dxp .IF "$(COM)"=="GCC" $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS) .ENDIF # .IF "$(COM)"=="GCC" $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .IF "$(COM)"=="GCC" -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols -$(GREP) "\*\|?" $@ > $@.symbols-regexp @@ -61,7 +61,7 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP) # Extract RTTI symbols from all the objects that will be used to build a shared library nm -gP $(SHL$(TNR)OBJS) \ `$(TYPE) /dev/null $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - | $(SOLARENV)$/bin$/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols # overwrite the map file generate into the local output tree with the generated # exported symbols list $(RENAME) $@.exported-symbols $@ @@ -70,9 +70,9 @@ $(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=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET).dxp $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP) - $(TYPE) $< | $(AWK) -f $(SOLARENV)$/bin$/getcsym.awk > $@ + $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@ .ENDIF # "$(GUI)"=="OS2" .ENDIF # "$(DEF$(TNR)EXPORTFILE)"=="" @@ -80,7 +80,7 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP) .IF "$(GUI)"=="WNT" -DEF$(TNR)FILTER=$(SOLARENV)$/inc$/dummy.flt +DEF$(TNR)FILTER=$(SOLARENV)/inc/dummy.flt RMHACK$(TNR):=$(RM) @@ -109,20 +109,20 @@ $(DEF$(TNR)TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB$(TNR)NAME)"!="" .IF "$(COM)"=="GCC" - @-$(RM) $(MISC)$/$(SHL$(TNR)TARGET).exp - dlltool --output-def $(MISC)$/$(SHL$(TNR)TARGET).exp --export-all-symbols \ - `$(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib) | sed s#$(ROUT)#$(PRJ)$/$(ROUT)#g` - tail --lines +3 $(MISC)$/$(SHL$(TNR)TARGET).exp | sed '/^;/d' >>$@.tmpfile - @-$(RM) $(MISC)$/$(SHL$(TNR)TARGET).exp + @-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp + dlltool --output-def $(MISC)/$(SHL$(TNR)TARGET).exp --export-all-symbols \ + `$(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g` + tail --lines +3 $(MISC)/$(SHL$(TNR)TARGET).exp | sed '/^;/d' >>$@.tmpfile + @-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp .ELSE .IF "$(SHL$(TNR)USE_EXPORTS)"=="" - @-$(RMHACK$(TNR)) $(MISC)$/$(SHL$(TNR)TARGET).exp - @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)$/$(SHL$(TNR)TARGET).exp $(SLB)$/$(DEFLIB$(TNR)NAME).lib - @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)$/$(SHL$(TNR)TARGET).flt $(MISC)$/$(SHL$(TNR)TARGET).exp >>$@.tmpfile - $(RMHACK$(TNR)) $(MISC)$/$(SHL$(TNR)TARGET).exp + @-$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp + @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL$(TNR)TARGET).exp $(SLB)/$(DEFLIB$(TNR)NAME).lib + @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL$(TNR)TARGET).flt $(MISC)/$(SHL$(TNR)TARGET).exp >>$@.tmpfile + $(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp .ELSE # "$(SHL$(TNR)USE_EXPORTS)"=="" - @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)$/$(i).lib) | $(GREP) EXPORT: > $(MISC)$/$(SHL$(TNR)TARGET).direct - @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF$(TNR)FILTER) $(MISC)$/$(SHL$(TNR)TARGET).direct >>$@.tmpfile + @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL$(TNR)TARGET).direct + @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF$(TNR)FILTER) $(MISC)/$(SHL$(TNR)TARGET).direct >>$@.tmpfile .ENDIF # "$(SHL$(TNR)USE_EXPORTS)"=="" .ENDIF .ENDIF # "$(DEFLIB$(TNR)NAME)"!="" @@ -203,8 +203,8 @@ $(DEF$(TNR)TARGETN) .PHONY : #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) +DEF$(TNR)FILTER=$(SOLARENV)/inc/dummy.flt +DEF$(TNR)NAMELIST=$(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) .IF "$(link_always)"=="" $(DEF$(TNR)TARGETN) : \ @@ -226,7 +226,7 @@ $(DEF$(TNR)TARGETN) .PHONY : .ENDIF .IF "$(DEFLIB$(TNR)NAME)"!="" - @+echo $(SLB)$/$(DEFLIB$(TNR)NAME).lib + @+echo $(SLB)/$(DEFLIB$(TNR)NAME).lib @+emxexpr $(DEF$(TNR)NAMELIST) | fix_exp_file >> $@.tmp_ord .ENDIF # "$(DEFLIB$(TNR)NAME)"!="" diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk index e80a66429678..46a5ffbf196b 100644 --- a/solenv/inc/tg_dep.mk +++ b/solenv/inc/tg_dep.mk @@ -31,40 +31,27 @@ .IF "$(SLOFILES)$(OBJFILES)$(DEPOBJFILES)$(SRCFILES)$(SRC1FILES)$(SRC2FILES)$(SRC3FILES)$(RCFILES)$(HDBDEPNTARGET)$(IDLFILES)$(PARFILES)$(ZIP1TARGET)$(ZIP2TARGET)$(ZIP3TARGET)$(ZIP4TARGET)$(ZIP5TARGET)$(ZIP6TARGET)$(ZIP7TARGET)$(ZIP8TARGET)$(ZIP9TARGET)$(COMP1TYPELIST)$(COMP2TYPELIST)$(COMP3TYPELIST)$(COMP4TYPELIST)$(COMP5TYPELIST)$(COMP6TYPELIST)$(COMP7TYPELIST)$(COMP8TYPELIST)$(COMP9TYPELIST)"!="" ALLDEP .PHONY: -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - @-$(IFEXIST) $(SRS)$/$(TARGET).*.dpr $(THEN) $(RM:s/+//) $(SRS)$/$(TARGET).*.dpr >& $(NULLDEV) $(FI) -.ELSE - @@-$(RM) $(SRS)$/$(TARGET).*.dpr -.ENDIF - @@-$(RM) $(MISC)$/$(TARGET).dpr - @@-$(RM) $(MISC)$/$(TARGET).*.dprr - @@-$(RM) $(MISC)$/$(TARGET).dpj - @@-$(RM) $(MISC)$/$(TARGET).dpz - @@-$(RM) $(MISC)$/$(COMP1TYPELIST).mk $(MISC)$/$(COMP2TYPELIST).mk $(MISC)$/$(COMP3TYPELIST).mk $(MISC)$/$(COMP4TYPELIST).mk $(MISC)$/$(COMP5TYPELIST).mk $(MISC)$/$(COMP6TYPELIST).mk $(MISC)$/$(COMP7TYPELIST).mk $(MISC)$/$(COMP8TYPELIST).mk $(MISC)$/$(COMP9TYPELIST).mk + @-$(IFEXIST) $(SRS)/$(TARGET).*.dpr $(THEN) $(RM:s/+//) $(SRS)/$(TARGET).*.dpr >& $(NULLDEV) $(FI) + @@-$(RM) $(MISC)/$(TARGET).dpr + @@-$(RM) $(MISC)/$(TARGET).*.dprr + @@-$(RM) $(MISC)/$(TARGET).dpj + @@-$(RM) $(MISC)/$(TARGET).dpz + @@-$(RM) $(MISC)/$(COMP1TYPELIST).mk $(MISC)/$(COMP2TYPELIST).mk $(MISC)/$(COMP3TYPELIST).mk $(MISC)/$(COMP4TYPELIST).mk $(MISC)/$(COMP5TYPELIST).mk $(MISC)/$(COMP6TYPELIST).mk $(MISC)/$(COMP7TYPELIST).mk $(MISC)/$(COMP8TYPELIST).mk $(MISC)/$(COMP9TYPELIST).mk .IF "$(nodep)"=="" .IF "$(DEPFILE_SLO)"!="" @@-$(RM) $(DEPFILE_SLO) - $(foreach,i,$(all_local_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) > $(MISC)$/s_$(i:b).dpcc )) - $(foreach,i,$(all_misc_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) > $(MISC)$/s_$(i:b).dpcc )) + $(foreach,i,$(all_local_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) > $(MISC)/s_$(i:b).dpcc )) + $(foreach,i,$(all_misc_slo) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $i ) > $(MISC)/s_$(i:b).dpcc )) .ENDIF # "$(DEPFILE_SLO)"!="" .IF "$(DEPFILE_OBJ)"!="" @@-$(RM) $(DEPFILE_OBJ) - $(foreach,i,$(all_local_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $i ) > $(MISC)$/o_$(i:b).dpcc )) - $(foreach,i,$(all_misc_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $i ) > $(MISC)$/o_$(i:b).dpcc )) + $(foreach,i,$(all_local_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $i ) > $(MISC)/o_$(i:b).dpcc )) + $(foreach,i,$(all_misc_obj) $(shell @$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $i ) > $(MISC)/o_$(i:b).dpcc )) .ENDIF # "$(DEPFILE_OBJ)"!="" .ENDIF # "$(nodep)"=="" .IF "$(DEPFILES)" != "" echo xxx$(DEPFILES)xxx -#to keep win9x happy -.IF "$(GROUPSHELL:b:l)"=="4dos" - @@-echo $(foreach,i,$(DEPFILES) $(shell @@$(4nt_force_shell)-del $i)) -.ELSE # "$(GROUPSHELL:b)"=="4dos" -.IF "$(USE_SHELL)"=="4nt" - @@-echo $(foreach,i,$(DEPFILES) $(shell @@$(4nt_force_shell)-del $i )) -.ELSE # "$(USE_SHELL)"=="4nt" @@-$(RM) $(DEPFILES) -.ENDIF # "$(USE_SHELL)"=="4nt" -.ENDIF # "$(GROUPSHELL:b)"=="4dos" .ENDIF # "$(DEPFILES)" != "" @echo --- @echo $(PWD) - Old dependency files removed or updated @@ -78,7 +65,7 @@ ALLDPC: \ $(HDBDEPNTARGET) .IF "$(nodep)"!="" @echo NOT-Making: Depend-Lists - @echo ttt: ppp > $(MISC)$/$(TARGET).dpc + @echo ttt: ppp > $(MISC)/$(TARGET).dpc .ELSE @echo Making : Dependencies .IF "$(CFILES)$(CXXFILES)"!="" @@ -91,17 +78,17 @@ ALLDPC: \ .ENDIF .ENDIF .IF "$(HDBDEPNTARGET)$(OBJFILES)$(SLOFILES)$(DEPOBJFILES)$(RCFILES)$(PARFILES)"!="" - @$(IFEXIST) $(MISC)$/$(TARGET).dpj $(THEN) $(RM:s/+//) $(MISC)$/$(TARGET).dpj >& $(NULLDEV) $(FI) - @$(IFEXIST) $(MISC)$/genjava.mk $(THEN) $(RM:s/+//) $(MISC)$/genjava.mk >& $(NULLDEV) $(FI) - $(TOUCH) $(MISC)$/$(TARGET).dpc + @$(IFEXIST) $(MISC)/$(TARGET).dpj $(THEN) $(RM:s/+//) $(MISC)/$(TARGET).dpj >& $(NULLDEV) $(FI) + @$(IFEXIST) $(MISC)/genjava.mk $(THEN) $(RM:s/+//) $(MISC)/genjava.mk >& $(NULLDEV) $(FI) + $(TOUCH) $(MISC)/$(TARGET).dpc .IF "$($(SECOND_BUILD)_SLOFILES)"!="" - @$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_SLOFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $i )) >> $(MISC)$/$(TARGET).dpc + @$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_SLOFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $i )) >> $(MISC)/$(TARGET).dpc .ENDIF .IF "$($(SECOND_BUILD)_OBJFILES)"!="" - @$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_OBJFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $(i:d:s/obj/slo/)$(i:b).obj )) >> $(MISC)$/$(TARGET).dpc + @$(TYPE) $(mktmp $(foreach,i,$($(SECOND_BUILD)_OBJFILES) $(i:d:^"\n")$(SECOND_BUILD)_$(i:f) : $(i:d:s/obj/slo/)$(i:b).obj )) >> $(MISC)/$(TARGET).dpc .ENDIF .ELSE # "$(HDBDEPNTARGET)$(OBJFILES)$(SLOFILES)$(DEPOBJFILES)$(RCFILES)"!="" - @echo ttt: ppp > $(MISC)$/$(TARGET).dpc + @echo ttt: ppp > $(MISC)/$(TARGET).dpc .ENDIF # "$(HDBDEPNTARGET)$(OBJFILES)$(SLOFILES)$(DEPOBJFILES)$(RCFILES)"!="" .ENDIF # "$(nodep)"!="" .ELSE # anything requiring dependencies @@ -110,7 +97,7 @@ ALLDPC: \ ALLDPC: @echo ------------------------------ @echo No Dependencies - @echo $(EMQ)# > $(MISC)$/$(TARGET).dpc + @echo $(EMQ)# > $(MISC)/$(TARGET).dpc ALLDEP: @echo ------------------------------ diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index ced838d44000..b0096d799161 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -34,7 +34,7 @@ # setup INCLUDE variable for use by VC++ .IF "$(GUI)$(COM)"=="WNTMSC" .IF "$(EXT_USE_STLPORT)"=="" -INCLUDE!:=. $(subst,$/stl, $(SOLARINC)) +INCLUDE!:=. $(subst,/stl, $(SOLARINC)) .ELSE # "$(EXT_USE_STLPORT)"=="" INCLUDE!:=. $(SOLARINC) .ENDIF # "$(EXT_USE_STLPORT)"=="" @@ -55,29 +55,29 @@ PATH!:=.$(PATH_SEPERATOR)$(SOLARBINDIR)$(PATH_SEPERATOR)$(PATH) .EXPORT : PATH #override -PACKAGE_DIR=$(MISC)$/build -ABS_PACKAGE_DIR:=$(MAKEDIR)$/$(MISC)$/build +PACKAGE_DIR=$(MISC)/build +ABS_PACKAGE_DIR:=$(MAKEDIR)/$(MISC)/build #MUST match with PACKAGE_DIR -BACK_PATH=..$/..$/..$/ +BACK_PATH=../../../ #MUST match with reference (currently MISC) -MBACK_PATH=..$/..$/ +MBACK_PATH=../../ .IF "$(TARFILE_IS_FLAT)" != "" -fake_root_dir=$/$(TARFILE_NAME) +fake_root_dir=/$(TARFILE_NAME) #MUST match fake_root_dir in directory levels -fake_back=..$/ +fake_back=../ .ENDIF "$(TARFILE_IS_FLAT)" != "" -P_CONFIGURE_DIR=$(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$(CONFIGURE_DIR) -P_BUILD_DIR=$(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$(BUILD_DIR) -P_INSTALL_DIR=$(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$(BUILD_DIR) -P_INSTALL_TARGET_DIR=$(MISC)$/install +P_CONFIGURE_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(CONFIGURE_DIR) +P_BUILD_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR) +P_INSTALL_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$(BUILD_DIR) +P_INSTALL_TARGET_DIR=$(MISC)/install .IF "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" NEW_PATCH_FILE_NAME:=$(TARFILE_NAME) .ELSE # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" NEW_PATCH_FILE_NAME:=$(TARFILE_NAME)-newpatch-rename_me.patch -PATCH_FILE_DEP:=$(PRJ)$/$(PATH_IN_MODULE)$/{$(PATCH_FILES)} +PATCH_FILE_DEP:=$(PRJ)/$(PATH_IN_MODULE)/{$(PATCH_FILES)} .ENDIF # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" .IF "$(TAR_EXCLUDES)"!="" @@ -91,8 +91,8 @@ unzip_quiet_switch:= .ENDIF # "$(VERBOSE)"=="TRUE" .IF "$(ADDITIONAL_FILES)"!="" -P_ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES) $(MISC)$/$(TARFILE_ROOTDIR)$/$i) -T_ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) +P_ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES) $(MISC)/$(TARFILE_ROOTDIR)/$i) +T_ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) .ENDIF # "$(ADDITIONAL_FILES)"!="" EXTRPATH*=OOO @@ -100,90 +100,84 @@ EXTRPATH*=OOO .IF "$(L10N_framework)"=="" ALLTAR : \ - $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) \ - $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) \ - $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) \ - $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) \ - $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) \ - $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) \ - $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) \ + $(PACKAGE_DIR)/$(BUILD_FLAG_FILE) \ + $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) \ + $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) \ + $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) \ + $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) \ + $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) clean: cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) clean - $(RM) $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) + $(RM) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE) -$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.bz2 +$(MISC)/%.unpack : $(PRJ)/download/%.tar.bz2 @-$(RM) $@ .IF "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ") + @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ") .ELSE # "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) .ENDIF # "$(GUI)"=="UNX" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.Z +$(MISC)/%.unpack : $(PRJ)/download/%.tar.Z @-$(RM) $@ .IF "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := sh -c "uncompress -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.Z | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ") + @noop $(assign UNPACKCMD := sh -c "uncompress -c $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ") .ELSE # "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := uncompress -c $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.Z | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := uncompress -c $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.Z | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) .ENDIF # "$(GUI)"=="UNX" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz +$(MISC)/%.unpack : $(PRJ)/download/%.tar.gz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)$/%.unpack : $(PRJ)$/download$/%.tgz +$(MISC)/%.unpack : $(PRJ)/download/%.tgz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)$/%.unpack : $(PRJ)$/download$/%.tar +$(MISC)/%.unpack : $(PRJ)/download/%.tar @-$(RM) $@ - noop $(assign UNPACKCMD := $(TAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).tar) + noop $(assign UNPACKCMD := $(GNUTAR) $(TAR_EXCLUDE_SWITCH) -x$(tar_verbose_switch)f $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).tar) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)$/%.unpack : $(PRJ)$/download$/%.zip +$(MISC)/%.unpack : $(PRJ)/download/%.zip @-$(RM) $@ - noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).zip) + noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).zip) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ -$(MISC)$/%.unpack : $(PRJ)$/download$/%.jar +$(MISC)/%.unpack : $(PRJ)/download/%.jar @-$(RM) $@ .IF "$(OS)"=="SOLARIS" - noop $(assign UNPACKCMD := jar xf $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).jar) + noop $(assign UNPACKCMD := jar xf $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).jar) .ELSE # "$(OS)"=="SOLARIS" - noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(BACK_PATH)$(fake_back)download$/$(TARFILE_NAME).jar) + noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(BACK_PATH)$(fake_back)download/$(TARFILE_NAME).jar) .ENDIF # "$(OS)"=="SOLARIS" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ #do unpack -$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack $(PATCH_FILE_DEP) - $(IFEXIST) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme $(FI) - -rm -rf $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)_removeme +$(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack $(PATCH_FILE_DEP) + $(IFEXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI) + -rm -rf $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell $(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE) + cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE) @echo make writeable... -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE) @cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -exec chmod a+x {{}} \; -.ELSE # "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -# Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds - $(DELAY) 2 - @cd $(PACKAGE_DIR) && attrib /s -r $(TARFILE_ROOTDIR) >& $(NULLDEV) && $(TOUCH) $(UNTAR_FLAG_FILE) -.ENDIF # "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" #add new files to patch -$(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) $(T_ADDITIONAL_FILES:+".dummy") +$(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) $(T_ADDITIONAL_FILES:+".dummy") .IF "$(GUI)"=="WNT" @$(TOUCH) $@ .ELSE # "$(GUI)"=="WNT" @@ -191,7 +185,7 @@ $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) $(T_ .ENDIF # "$(GUI)"=="WNT" #patch -$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) +$(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) .IF "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" @echo no patch needed... $(TOUCH) $@ @@ -199,16 +193,16 @@ $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) .IF "$(GUI)"=="WNT" # hack to make 4nt version 4,01 work and still get propper # errorcodes for versions < 3,00 -.IF "$(my4ver:s/.//:s/,//)" >= "300" - cd $(PACKAGE_DIR) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE) -.ELSE # "$(my4ver:s/.//:s/,//)" >= "300" - cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) -.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300" +#.IF "$(my4ver:s/.//:s/,//)" >= "300" +# cd $(PACKAGE_DIR) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE) +#.ELSE # "$(my4ver:s/.//:s/,//)" >= "300" + cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) +#.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300" .ELSE # "$(GUI)"=="WNT" .IF "$(BSCLIENT)"=="TRUE" - cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) + cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) .ELSE # "$(BSCLIENT)"!="" - cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) + cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) .ENDIF # "$(BSCLIENT)"!="" .ENDIF # "$(GUI)"=="WNT" .ENDIF # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" @@ -217,28 +211,28 @@ $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) # Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds $(DELAY) 2 .ENDIF # "$(GUI)"=="WNT" - $(TOUCH) $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) + $(TOUCH) $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) .ENDIF # "$(T_ADDITIONAL_FILES)"!="" .IF "$(CONVERTFILES)"!="" -$(MISC)$/$(TARGET)_convert_unx_flag : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) - $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) && $(TOUCH) $(MISC)$/$(TARGET)_convert_unx_flag +$(MISC)/$(TARGET)_convert_unx_flag : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) + $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) && $(TOUCH) $(MISC)/$(TARGET)_convert_unx_flag -$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/$(TARGET)_convert_unx_flag +$(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(MISC)/$(TARGET)_convert_unx_flag -$(MISC)$/$(TARGET)_convert_dos_flag : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) - $(CONVERT) dos $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) && $(TOUCH) $(MISC)$/$(TARGET)_convert_dos_flag +$(MISC)/$(TARGET)_convert_dos_flag : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) + $(CONVERT) dos $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) && $(TOUCH) $(MISC)/$(TARGET)_convert_dos_flag -$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(MISC)$/$(TARGET)_convert_dos_flag +$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(MISC)/$(TARGET)_convert_dos_flag -patch : $(MISC)$/$(TARGET)_convert_dos_flag +patch : $(MISC)/$(TARGET)_convert_dos_flag .ENDIF # "$(CONVERTFILES)"!="" -$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) +$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) @@-$(RM) $@ .IF "$(CONFIGURE_ACTION)" == "none" || "$(CONFIGURE_ACTION)"=="" - $(TOUCH) $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) + $(TOUCH) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) .ELSE # "$(CONFIGURE_ACTION)"=="none" || "$(CONFIGURE_ACTION)"=="" -$(MKDIR) $(P_CONFIGURE_DIR) .IF "$(OS)"=="OS2" @@ -246,99 +240,94 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) .ELSE cd $(P_CONFIGURE_DIR) && $(CONFIGURE_ACTION) $(CONFIGURE_FLAGS) && $(TOUCH) $(CONFIGURE_FLAG_FILE) .ENDIF - mv $(P_CONFIGURE_DIR)$/$(CONFIGURE_FLAG_FILE) $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) + mv $(P_CONFIGURE_DIR)/$(CONFIGURE_FLAG_FILE) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) .ENDIF # "$(CONFIGURE_ACTION)"=="none" || "$(CONFIGURE_ACTION)"=="" -$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) : $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) +$(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) @@-$(RM) $@ .IF "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true" - $(TOUCH) $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) + $(TOUCH) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE) .ELSE # "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true" -$(MKDIR) $(P_BUILD_DIR) - cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) && $(TOUCH) $(ABS_PACKAGE_DIR)$/$(BUILD_FLAG_FILE) + cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) && $(TOUCH) $(ABS_PACKAGE_DIR)/$(BUILD_FLAG_FILE) .ENDIF # "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true" -$(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) +$(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) : $(PACKAGE_DIR)/$(BUILD_FLAG_FILE) @@-$(RM) $@ .IF "$(INSTALL_ACTION)"=="none" || "$(INSTALL_ACTION)"=="" - $(TOUCH) $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + $(TOUCH) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) .ELSE # "$(INSTALL_ACTION)"=="none" || "$(INSTALL_ACTION)"=="" -$(MKDIR) $(P_INSTALL_DIR) -$(MKDIR) $(P_INSTALL_TARGET_DIR) cd $(P_INSTALL_DIR) && $(INSTALL_ACTION) $(INSTALL_FLAGS) && $(TOUCH) $(INSTALL_FLAG_FILE) - mv $(P_INSTALL_DIR)$/$(INSTALL_FLAG_FILE) $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) + mv $(P_INSTALL_DIR)/$(INSTALL_FLAG_FILE) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) .ENDIF # "$(INSTALL_ACTION)"=="none" || "$(INSTALL_ACTION)"=="" -$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE) +$(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) .IF "$(OUT2LIB)"!="" - $(COPY) $(foreach,i,$(OUT2LIB) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(LB) + $(COPY) $(foreach,i,$(OUT2LIB) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(LB) .IF "$(OS)"=="MACOSX" - $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl extshl \ + $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl extshl \ $(EXTRPATH) \ - $(shell ls $(foreach,j,$(OUT2LIB) $(LB)$/$(j:f)) | \ + $(shell ls $(foreach,j,$(OUT2LIB) $(LB)/$(j:f)) | \ (grep -v '\.a$$' || test $$? = 1)) .ENDIF .ENDIF # "$(OUT2LIB)"!="" .IF "$(OUT2INC)"!="" .IF "$(OUT2INC_SUBDIR)"!="" - -$(MKDIRHIER) $(INCCOM)$/$(OUT2INC_SUBDIR) - $(COPY) $(foreach,i,$(OUT2INC) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(INCCOM)$/$(OUT2INC_SUBDIR) + -$(MKDIRHIER) $(INCCOM)/$(OUT2INC_SUBDIR) + $(COPY) $(foreach,i,$(OUT2INC) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(INCCOM)/$(OUT2INC_SUBDIR) .ELSE # "$(OUT2INC_SUBDIR)"!="" - $(COPY) $(foreach,i,$(OUT2INC) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(INCCOM) + $(COPY) $(foreach,i,$(OUT2INC) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(INCCOM) .ENDIF # "$(OUT2INC_SUBDIR)"!="" .ENDIF # "$(OUT2INC)"!="" .IF "$(OUTDIR2INC)"!="" -.IF "$(USE_SHELL)"=="4nt" - @-$(MKDIR) $(foreach,i,$(OUTDIR2INC) $(INCCOM)$/$(i:b)) - @echo copied $(foreach,i,$(OUTDIR2INC) $(shell @$(COPY) $(COPYRECURSE) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i$/* $(INCCOM)$/$(i:b) >& $(NULLDEV) && echo $i)) -.ELSE # "$(USE_SHELL)"=="4nt" - $(COPY) $(DEREFERENCE) $(COPYRECURSE) $(foreach,i,$(OUTDIR2INC) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(INCCOM) -.ENDIF # "$(USE_SHELL)"=="4nt" + $(COPY) $(DEREFERENCE) $(COPYRECURSE) $(foreach,i,$(OUTDIR2INC) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(INCCOM) .ENDIF # "$(OUTDIR2INC)"!="" .IF "$(OUT2BIN)"!="" - $(COPY) $(foreach,i,$(OUT2BIN) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(BIN) + $(COPY) $(foreach,i,$(OUT2BIN) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(BIN) .IF "$(GUI)$(COM)$(COMEX)"=="WNTMSC12" @noop $(foreach,j,$(foreach,k,$(OUT2BIN) \ - $(shell -ls -1 $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$k | $(GREP) .dll)) \ + $(shell -ls -1 $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$k | $(GREP) .dll)) \ $(shell @$(IFEXIST) $(j).manifest $(THEN) mt.exe \ - -manifest $(j).manifest -outputresource:$(BIN)$/$(j:f)$(EMQ);2 $(FI))) + -manifest $(j).manifest -outputresource:$(BIN)/$(j:f)$(EMQ);2 $(FI))) .ENDIF # "$(GUI)$(COM)$(COMEX)"=="WNTMSC12" .ENDIF # "$(OUT2BIN)"!="" .IF "$(OUT2CLASS)"!="" - $(COPY) $(foreach,i,$(OUT2CLASS) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) $(CLASSDIR) + $(COPY) $(foreach,i,$(OUT2CLASS) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(CLASSDIR) .ENDIF # "$(OUT2BIN)"!="" - $(TOUCH) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) + $(TOUCH) $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) -$(MISC)$/$(TARFILE_ROOTDIR).done : $(MISC)$/$(TARFILE_NAME).unpack $(PATCH_FILES) - @-mv $(MISC)$/$(TARFILE_ROOTDIR) $(MISC)$/$(TARFILE_ROOTDIR).old - @-rm -rf $(MISC)$/$(TARFILE_ROOTDIR).old +$(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_NAME).unpack $(PATCH_FILES) + @-mv $(MISC)/$(TARFILE_ROOTDIR) $(MISC)/$(TARFILE_ROOTDIR).old + @-rm -rf $(MISC)/$(TARFILE_ROOTDIR).old @-$(MKDIRHIER) $(MISC)$(fake_root_dir) - cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)$/$(ROUT)$/misc$/$(TARFILE_NAME).unpack)) + cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack)) .IF "$(P_ADDITIONAL_FILES)"!="" noop $(foreach,i,$(P_ADDITIONAL_FILES) $(shell echo dummy > $i)) .ENDIF "$(P_ADDITIONAL_FILES)"!="" .IF "$(PATCH_FILES)"!="none" && "$(PATCH_FILES)"!="" .IF "$(CONVERTFILES)"!="" - $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(MISC)$/$(TARFILE_ROOTDIR)$/$i) + $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(MISC)/$(TARFILE_ROOTDIR)/$i) .ENDIF # "$(CONVERTFILES)"!="" .IF "$(GUI)"=="WNT" # hack to make 4nt version 4,01 work and still get propper # errorcodes for versions < 3,00 -.IF "$(my4ver:s/.//:s/,//)" >= "300" - cd $(MISC) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 ) -.ELSE # "$(my4ver:s/.//:s/,//)" >= "300" - cd $(MISC) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 -.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300" +#.IF "$(my4ver:s/.//:s/,//)" >= "300" +# cd $(MISC) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 ) +#.ELSE # "$(my4ver:s/.//:s/,//)" >= "300" + cd $(MISC) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 +#.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300" .ELSE # "$(GUI)"=="WNT" .IF "$(BSCLIENT)"=="TRUE" - cd $(MISC) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 + cd $(MISC) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 .ELSE # "$(BSCLIENT)"!="" - cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)$/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 + cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 .ENDIF # "$(BSCLIENT)"!="" .ENDIF # "$(GUI)"=="WNT" .IF "$(CONVERTFILES)"!="" - $(CONVERT) dos $(foreach,i,$(CONVERTFILES) $(MISC)$/$(TARFILE_ROOTDIR)$/$i) + $(CONVERT) dos $(foreach,i,$(CONVERTFILES) $(MISC)/$(TARFILE_ROOTDIR)/$i) .ENDIF # "$(CONVERTFILES)"!="" .ENDIF # "$(PATCH_FILES)"!="none" && "$(PATCH_FILES)"!=" .IF "$(GUI)"=="UNX" @@ -346,7 +335,7 @@ $(MISC)$/$(TARFILE_ROOTDIR).done : $(MISC)$/$(TARFILE_NAME).unpack $(PATCH_FILES .ENDIF # "$(GUI)"=="UNX" .IF "$(T_ADDITIONAL_FILES)"!="" -$(T_ADDITIONAL_FILES:+".dummy") : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) +$(T_ADDITIONAL_FILES:+".dummy") : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) @-$(MKDIRHIER) $(@:d) -echo dummy > $@ -$(TOUCH) $@ @@ -354,25 +343,25 @@ $(T_ADDITIONAL_FILES:+".dummy") : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) -$(TOUCH) $(@:d)$(@:b) .ENDIF "$(T_ADDITIONAL_FILES)"!="" -create_patch : $(MISC)$/$(TARFILE_ROOTDIR).done $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) - @@-$(MKDIRHIER) $(PRJ)$/$(NEW_PATCH_FILE_NAME:d) - @@-$(RM) $(MISC)$/$(NEW_PATCH_FILE_NAME:f).tmp - @@-$(RM) $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME).bak +create_patch : $(MISC)/$(TARFILE_ROOTDIR).done $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) + @@-$(MKDIRHIER) $(PRJ)/$(NEW_PATCH_FILE_NAME:d) + @@-$(RM) $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp + @@-$(RM) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak #ignore returncode of 1 (indicates differences...) # hard coded again to get the same directory level as before. quite ugly... - -cd $(PRJ)$/$(ROUT) && diff -ru misc$/$(TARFILE_ROOTDIR) misc$/build$/$(TARFILE_ROOTDIR) | $(PERL) $(SOLARENV)$/bin$/cleandiff.pl | tr -d "\015" > misc$/$(NEW_PATCH_FILE_NAME:f).tmp - -mv $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME) $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME).bak - -$(TOUCH) $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME).bak - $(PERL) $(SOLARENV)$/bin$/patch_sanitizer.pl $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME).bak $(MISC)$/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME) - @@-$(RM) $(MISC)$/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)$/$(PATH_IN_MODULE)$/$(NEW_PATCH_FILE_NAME).bak + -cd $(PRJ)/$(ROUT) && diff -ru misc/$(TARFILE_ROOTDIR) misc/build/$(TARFILE_ROOTDIR) | $(PERL) $(SOLARENV)/bin/cleandiff.pl | tr -d "\015" > misc/$(NEW_PATCH_FILE_NAME:f).tmp + -mv $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak + -$(TOUCH) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak + $(PERL) $(SOLARENV)/bin/patch_sanitizer.pl $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME) + @@-$(RM) $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak $(MAKECMD) $(MAKEMACROS) patch @echo still some problems with win32 generated patches... @echo $(USQ)find your new changes in $(NEW_PATCH_FILE_NAME). don't forget to move/rename that patch and insert it in your makefiles PATCH_FILES to activate.$(USQ) -create_clean : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) +create_clean : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) @echo done -patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) +patch : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) @echo done .ENDIF # "$(L10N_framework)"=="" diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk index cd8211f3b399..3974f077057b 100644 --- a/solenv/inc/tg_jar.mk +++ b/solenv/inc/tg_jar.mk @@ -45,9 +45,9 @@ $(JARTARGETN) : $(JARMANIFEST) $(JAVACLASSFILES) $(JAVATARGET) .IF "$(CUSTOMMANIFESTFILE)"!="" -CUSTOMMANIFESTFILEDEP:=$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) +CUSTOMMANIFESTFILEDEP:=$(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f) -$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,$/ $(DMAKE_WORK_DIR))$/$(CUSTOMMANIFESTFILE) +$(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,/ $(DMAKE_WORK_DIR))/$(CUSTOMMANIFESTFILE) -$(RM) $@ $(COPY) $< $@ .ENDIF # "$(CUSTOMMANIFESTFILE)"!="" @@ -62,7 +62,7 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP) # $(RSCREVISION) contains chars that must be quoted (for *NIX shells) echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@ .IF "$(CUSTOMMANIFESTFILE)"!="" - $(TYPE) $(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@ + $(TYPE) $(MISC)/$(TARGET)_$(CUSTOMMANIFESTFILE:f) >> $@ .ENDIF # "$(CUSTOMMANIFESTFILE)"!="" .ENDIF # "$(JARMANIFEST)"!="" .ENDIF # "$(NEW_JAR_PACK)"!="" @@ -76,13 +76,13 @@ $(JARTARGETN) .PHONY : .ELSE # "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!="" .DIRCACHE = no $(JARTARGETN) : -#$(JARTARGETN) .SETDIR=$(CLASSDIR) .SEQUENTIAL : $(JARTARGETDEP) $(shell @-cat -s $(MISC)$/$(JARTARGETN).dep ) +#$(JARTARGETN) .SETDIR=$(CLASSDIR) .SEQUENTIAL : $(JARTARGETDEP) $(shell @-cat -s $(MISC)/$(JARTARGETN).dep ) .ENDIF # "$(NOJARDEP)"!="" || "$(NEW_JAR_PACK)"!="" .IF "$(OS)$(CPU)"=="SOLARISS" @-find . -type d -user $(USER) ! -perm -5 -print | xargs test "$$1" != "" && chmod +r $$1 .ENDIF .IF "$(JARMANIFEST)"!="" - cd $(CLASSDIR)$/$(TARGET) && zip -u -rX ..$/$(@:f) $(subst,$(CLASSDIR)$/$(TARGET)$/, $(JARMANIFEST)) $(CHECKZIPRESULT) + cd $(CLASSDIR)/$(TARGET) && zip -u -rX ../$(@:f) $(subst,$(CLASSDIR)/$(TARGET)/, $(JARMANIFEST)) $(CHECKZIPRESULT) .ENDIF # "$(JARMANIFEST)"!="" cd $(CLASSDIR) && zip -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(CHECKZIPRESULT) .ENDIF diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk index 1d6f88c539e9..eb94f83cc032 100644 --- a/solenv/inc/tg_java.mk +++ b/solenv/inc/tg_java.mk @@ -31,12 +31,12 @@ -$(CLASSDIR)$/com$/sun$/star$/upd$/$(VERSIONINFOFILE)_updversion.class .PHONY: $(MISC)$/java$/com$/sun$/star$/upd$/$(VERSIONINFOFILE)_updversion.java +$(CLASSDIR)/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.class .PHONY: $(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java -$(MISC)$/java$/com$/sun$/star$/upd$/$(VERSIONINFOFILE)_updversion.java .PHONY: +$(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java .PHONY: @echo ------------------------------ @echo Making: $@ - @-$(MKDIRHIER) $(MISC)$/java$/com$/sun$/star$/upd + @-$(MKDIRHIER) $(MISC)/java/com/sun/star/upd .IF "$(GUI)"=="UNX" @echo package com.sun.star.upd\; > $@ @echo 'public class $(VERSIONINFOFILE)_updversion { public static String Version = "$(RSCREVISION)";}' >> $@ @@ -47,11 +47,11 @@ $(MISC)$/java$/com$/sun$/star$/upd$/$(VERSIONINFOFILE)_updversion.java .PHONY: .IF "$(JAVATARGET)"!="" .IF "$(PACKAGE)"!="" -$(CLASSDIR)$/$(IDLPACKAGE)$/%.class .NOINFER .IGNORE : %.java +$(CLASSDIR)/$(IDLPACKAGE)/%.class .NOINFER .IGNORE : %.java # echo $@ @@-$(RM) $(JAVATARGET) .ELSE # "$(PACKAGE)"!="" -$(CLASSDIR)$/%.class .NOINFER .IGNORE : %.java +$(CLASSDIR)/%.class .NOINFER .IGNORE : %.java # echo $@ @@-$(RM) $(JAVATARGET) .ENDIF # "$(PACKAGE)"!="" @@ -70,15 +70,11 @@ $(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES) $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) .ELSE # "$(JAVAFILES:d)"=="" @@$(TOUCH) $(INPATH)_$(VCSID)_a_dummy.java - $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) .$/*.java $(uniq $(JAVAFILES:d:+"*.java")) + $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) ./*.java $(uniq $(JAVAFILES:d:+"*.java")) @@-$(RM) $(INPATH)_$(VCSID)_a_dummy.java .ENDIF # "$(JAVAFILES:d)"=="" .ELSE # "$(javauno)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) @$(mktmp $(strip $(JAVAFILES))) -.ELSE # "$(USE_SHELL)"=="4nt" $(JAVAC) $(JAVACPS) "$(CLASSPATH)" -d $(CLASSDIR) $(JAVAFLAGS) @$(mktmp $(strip $(JAVAFILES))) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(javauno)"!="" .ENDIF # "$(use_jdep)"!="" .ENDIF # "$(JAVARESPONSE)"!="" diff --git a/solenv/inc/tg_javav.mk b/solenv/inc/tg_javav.mk index 0f329e6076ed..e39533f9b6f6 100644 --- a/solenv/inc/tg_javav.mk +++ b/solenv/inc/tg_javav.mk @@ -29,7 +29,7 @@ # #************************************************************************* -JAVAVERMK:=$(INCCOM)$/java_ver.mk +JAVAVERMK:=$(INCCOM)/java_ver.mk .INCLUDE .IGNORE : $(JAVAVERMK) @@ -38,16 +38,16 @@ JAVAVERMK:=$(INCCOM)$/java_ver.mk .IF "$(SOLAR_JAVA)"!="" JFLAGSVERSION=-version -JFLAGSVERSION_CMD=-version $(PIPEERROR) $(AWK) -f $(SOLARENV)$/bin$/getcompver.awk -JFLAGSNUMVERSION_CMD=-version $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk +JFLAGSVERSION_CMD=-version $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk +JFLAGSNUMVERSION_CMD=-version $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk # that's the version known by the specific # java version -JAVAVER:=$(shell @-$(JAVA_HOME)$/bin$/java $(JFLAGSVERSION_CMD)) +JAVAVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSVERSION_CMD)) # and a computed integer for comparing # each point seperated token blown up to 4 digits -JAVANUMVER:=$(shell @-$(JAVA_HOME)$/bin$/java $(JFLAGSNUMVERSION_CMD)) +JAVANUMVER:=$(shell @-$(JAVA_HOME)/bin/java $(JFLAGSNUMVERSION_CMD)) .ELSE # "$(SOLAR_JAVA)"!="" JAVAVER=0.0.0 diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk index bbe5f79da6eb..bfe9d18c86a2 100644 --- a/solenv/inc/tg_lib.mk +++ b/solenv/inc/tg_lib.mk @@ -40,29 +40,29 @@ $(LIB$(TNR)ARCHIV) : $(LIB$(TNR)TARGET) @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd .IF "$(OS)" =="HPUX_FRAG_HR" - @-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd - @echo $(LINK) +inst_close -c `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd - @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd - @+source $(MISC)$/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd + @-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd + @echo $(LINK) +inst_close -c `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd + @cat $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd + @+source $(MISC)/$(LIB$(TNR)ARCHIV:b)_closetempl.cmd .ENDIF - @echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd .IF "$(OS)$(COM)"=="NETBSDGCC" - @echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd .ENDIF .IF "$(OS)" == "MACOSX" - @echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd .ENDIF - @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd - @+source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @cat $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd + @+source $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)$(COM)"=="WNTGCC" - @+-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd - @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd - @+echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd - @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd - @+source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @+-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd + @+echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd + @cat $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd + @+source $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd .ELSE @echo just a dummy > $@ .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -79,13 +79,13 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \ @echo Making: $@ @@-$(RM) $@ .IF "$(GUI)"=="UNX" - @echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ + @echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@ @cat /dev/null $(LIB$(TNR)FILES:s/.obj/.o/) | xargs -n 1 >> $@ @$(RM) $(@:d)$(@:b).dump .IF "$(OS)"=="MACOSX" - @-nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(LIB$(TNR)TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ELIF "$(GUI)"=="OS2" @@ -102,7 +102,7 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \ .ELSE # "$(GUI)"=="UNX" .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(LIB$(TNR)OBJFILES) | sed "s#$(PRJ:s/././)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + +$(ECHONL) $(LIB$(TNR)OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ @+cat /dev/null $(LIB$(TNR)FILES) | xargs -n1 >> $@ .ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES)) diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk index a1f348a5b2b3..324daba82f8b 100644 --- a/solenv/inc/tg_merge.mk +++ b/solenv/inc/tg_merge.mk @@ -35,36 +35,36 @@ MKFILENAME:=tg_merge.mk .IF "$(WITH_LANG)"!="" .IF "$(ULFFILES)"!="" -$(foreach,i,$(ULFFILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) .ENDIF # "$(ULFFILES)"!="" # *.xrb merge .IF "$(XMLPROPERTIES)"!="" -$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) .ENDIF # "$(ULFFILES)"!="" # *.xrm merge .IF "$(READMEFILES)"!="" -$(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) .ENDIF # "$(ULFFILES)"!="" # *.xrm merge #.IF "$(APOCHELPFILES)"!="" -#$(foreach,i,$(APOCHELPFILES) $(COMMONMISC)$/$(MYPATH)$/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) +#$(foreach,i,$(APOCHELPFILES) $(COMMONMISC)/$(MYPATH)/$(i:b).xrm) : $$(@:f) $(LOCALIZESDF) #.ENDIF # "$(ULFFILES)"!="" # *.xcu merge .IF "$(LOCALIZEDFILES)"!="" -$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/merge$/{$(subst,.,$/ $(PACKAGE))}$/$(i:b).xcu) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)/merge/{$(subst,.,/ $(PACKAGE))}/$(i:b).xcu) : $$(@:f) $(LOCALIZESDF) .ENDIF # "$(ULFFILES)"!="" .ENDIF # "$(WITH_LANG)"!="" # dependencies from *.ulf to par-files .IF "$(ULFPARFILES)"!="" -$(ULFPARFILES) : $(COMMONMISC)$/$(TARGET)$/$$(@:b).$(LANGFILEEXT) +$(ULFPARFILES) : $(COMMONMISC)/$(TARGET)/$$(@:b).$(LANGFILEEXT) .ENDIF # "$(ULFPARFILES)"!="" # *.xrm merge #.IF "$(READMEFILES)"!="" -#$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm)) : $$(@:f) $(LOCALIZESDF) +#$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm)) : $$(@:f) $(LOCALIZESDF) #.ENDIF # "$(ULFFILES)"!="" diff --git a/solenv/inc/tg_moz.mk b/solenv/inc/tg_moz.mk index c7d3031b1eee..cce44f8c8771 100644 --- a/solenv/inc/tg_moz.mk +++ b/solenv/inc/tg_moz.mk @@ -35,23 +35,23 @@ EXPORT_HEADER=export_mozilla_header .ENDIF .IF "$(XPIDLSRCS)"!="" -XPIDL_TYPELIB_MODULE=$(MISC)$/$(XPIDL_MODULE).xpt +XPIDL_TYPELIB_MODULE=$(MISC)/$(XPIDL_MODULE).xpt XPIDLHDR:=$(XPIDLSRCS:s/.idl/.h/) XPIDLXPT:=$(XPIDLSRCS:s/.idl/.xpt/) -EXTRA_MOZ_TARGET+= $(foreach,i,$(XPIDLHDR) $(INCCOM)$/$i) -EXTRA_MOZ_TARGET+= $(foreach,i,$(XPIDLXPT) $(MISC)$/$i) +EXTRA_MOZ_TARGET+= $(foreach,i,$(XPIDLHDR) $(INCCOM)/$i) +EXTRA_MOZ_TARGET+= $(foreach,i,$(XPIDLXPT) $(MISC)/$i) EXTRA_MOZ_TARGET+= $(XPIDL_TYPELIB_MODULE) .ENDIF ALLMOZ:=$(EXTRA_MOZ_TARGET) $(DO_XPIDL) $(GEN_PRCPUCFG) $(EXPORT_HEADER) -$(INCCOM)$/%.h : %.idl +$(INCCOM)/%.h : %.idl $(COPY) $< $(INCCOM) - $(XPIDL) -m header -w -I $(SOLARIDLDIR)$/mozilla -I$(INCCOM) -I . -o $(INCCOM)$/$* $< + $(XPIDL) -m header -w -I $(SOLARIDLDIR)/mozilla -I$(INCCOM) -I . -o $(INCCOM)/$* $< -$(MISC)$/%.xpt : %.idl - $(XPIDL) -m typelib -w -I $(SOLARIDLDIR)$/mozilla -I$(INCCOM) -I . -o $(MISC)$/$* $< +$(MISC)/%.xpt : %.idl + $(XPIDL) -m typelib -w -I $(SOLARIDLDIR)/mozilla -I$(INCCOM) -I . -o $(MISC)/$* $< .INCLUDE : target.mk @@ -76,8 +76,8 @@ CPUCFG=_netbsd.cfg .ENDIF .IF "$(GEN_PRCPUCFG)"!="" -$(GEN_PRCPUCFG): $(PRJ)$/pr$/include$/md$/$(CPUCFG) - @$(COPY) $(PRJ)$/pr$/include$/md$/$(CPUCFG) $@ +$(GEN_PRCPUCFG): $(PRJ)/pr/include/md/$(CPUCFG) + @$(COPY) $(PRJ)/pr/include/md/$(CPUCFG) $@ .ENDIF .IF "$(EXPORTS)"!="" @@ -86,8 +86,8 @@ $(EXPORT_HEADER): .ENDIF .IF "$(XPIDLSRCS)"!="" -$(XPIDL_TYPELIB_MODULE): $(foreach,i,$(XPIDLXPT) $(MISC)$/$i) - $(XPIDL_LINK) $(MISC)$/$(XPIDL_MODULE).xpt $^ - @-mkdir $(BIN)$/components - @$(COPY) $@ $(BIN)$/components +$(XPIDL_TYPELIB_MODULE): $(foreach,i,$(XPIDLXPT) $(MISC)/$i) + $(XPIDL_LINK) $(MISC)/$(XPIDL_MODULE).xpt $^ + @-mkdir $(BIN)/components + @$(COPY) $@ $(BIN)/components .ENDIF diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk index 19933fa65e71..659af6fdc735 100644 --- a/solenv/inc/tg_obj.mk +++ b/solenv/inc/tg_obj.mk @@ -44,7 +44,7 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES) .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - $(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i)) > $@ + $(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)/$(i)) > $@ .ELSE # "$(COM)"=="GCC" .IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) @@ -53,11 +53,11 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES) .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="UNX" - echo $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 > $@ + echo $(foreach,i,$(OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 > $@ .IF "$(OS)"=="MACOSX" - @-nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(OBJTARGET)"!="" @@ -78,7 +78,7 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES) .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" # $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES) - $(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i)) > $@ + $(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)/$(i)) > $@ .ELSE .IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) @@ -87,7 +87,7 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES) .ENDIF .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="UNX" - echo $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i:s/.obj/.o/)) | xargs -n1 >> $@ + echo $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 >> $@ .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$($(SECOND_BUILD)OBJTARGET)"!="" .ENDIF # "$(SECOND_BUILD)"!="" diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk index 1754c1e6a192..f5e630b812f1 100644 --- a/solenv/inc/tg_rslb.mk +++ b/solenv/inc/tg_rslb.mk @@ -35,7 +35,7 @@ .IF "$(RESLIB$(TNR)TARGETN)"!="" .IF "$(BUILDHIDS)"!="" -HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB$(TNR)NAME)_res.hid +HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB$(TNR)NAME)_res.hid #HACK cut off the dirty srs files which are included from solver RESLIB$(TNR)HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB$(TNR)SRSFILES))) @@ -44,7 +44,7 @@ $(HIDRES$(TNR)PARTICLE): $(RESLIB$(TNR)HIDFILES) @echo Making: $@ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI) # need to strip since solaris cannot handle tab-only whitespace here - $(TYPE) $(mktmp $(strip, $(subst,$/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDRES$(TNR)PARTICLE) @@ -61,12 +61,12 @@ $(RSC_MULTI$(TNR)) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$i \ + -fs={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/$(RESLIB$(TNR)NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil={$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \ -ft=$@ \ $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \ @@ -76,12 +76,12 @@ $(RSC_MULTI$(TNR)) : \ -r -p \ $(foreach,i,$(alllangiso) -lg$i \ $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \ - -fs={$(BIN)$/$(RESLIB$(TNR)NAME)$i.res} \ - $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)$/$(RSCDEFIMG)$/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}$/$i \ + -fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \ + $(foreach,j,$(subst,$(PRJ),$(SOLARSRC)/$(RSCDEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \ -lip={$j} ) \ - -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res$/$i -lip=$(SOLARSRC)$/$(RSCDEFIMG)$/res ) \ - -subMODULE=$(SOLARSRC)$/$(RSCDEFIMG) \ - -subGLOBALRES=$(SOLARSRC)$/$(RSCDEFIMG)$/res \ + -lip=$(SOLARSRC)/$(RSCDEFIMG)/res/$i -lip=$(SOLARSRC)/$(RSCDEFIMG)/res ) \ + -subMODULE=$(SOLARSRC)/$(RSCDEFIMG) \ + -subGLOBALRES=$(SOLARSRC)/$(RSCDEFIMG)/res \ -oil=$(BIN) \ -ft=$@ \ $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \ diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk index 217d0fdb70ee..5c9066c9fe63 100644 --- a/solenv/inc/tg_scp.mk +++ b/solenv/inc/tg_scp.mk @@ -36,17 +36,17 @@ .IF "$(SCP$(TNR)TARGETN)"!="" # try to get missing parfiles -$(PAR)$/%.par : $(SOLARPARDIR)$/%.par +$(PAR)/%.par : $(SOLARPARDIR)/%.par @@-$(MKDIRHIER) $(@:d:d) $(COPY) $< $@ -LOCALSCP$(TNR)FILES=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i )) +LOCALSCP$(TNR)FILES=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)/$j/$i )) $(SCP$(TNR)TARGETN): $(LOCALSCP$(TNR)FILES) @echo ------------------------------ @echo Making: $@ - @@-$(MKDIRHIER) $(BIN)$/$(SCP$(TNR)LINK_PRODUCT_TYPE) - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP$(TNR)FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@ + @@-$(MKDIRHIER) $(BIN)/$(SCP$(TNR)LINK_PRODUCT_TYPE) + $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP$(TNR)FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@ .ENDIF # Anweisungen fuer das Linken diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk index b89bf1249a8c..107ba27f60f5 100644 --- a/solenv/inc/tg_sdi.mk +++ b/solenv/inc/tg_sdi.mk @@ -38,11 +38,7 @@ $(HIDSID$(TNR)PARTICLE): $(SDI$(TNR)TARGET) @echo ------------------------------ @echo Making: $@ @-$(RM) $@.$(ROUT).tmp $@ -.IF "$(USE_SHELL)"=="4nt" - @$(TYPE) $(MISC)$/$(SDI$(TNR)NAME).sid | $(AWK) "$$1==\"#define\" { print $$2, $$3 }" > $@.$(ROUT).tmp -.ELSE - @$(TYPE) $(MISC)$/$(SDI$(TNR)NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp -.ENDIF + @$(TYPE) $(MISC)/$(SDI$(TNR)NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp @-$(RM) $@ @$(RENAME) $@.$(ROUT).tmp $@ .ENDIF # "$(HIDSID$(TNR)PARTICLE)"!="" @@ -53,12 +49,12 @@ $(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND) $(SDI$(TNR)NAME).sdi @echo Making: $@ @-$(RM) $@ $(SVIDL) @$(mktmp \ - -fs$(INCCOMX)$/$(SDI$(TNR)NAME).hxx \ - -fd$(INCCOMX)$/$(SDI$(TNR)NAME).ilb \ - -fm$(MISC)$/$(SDI$(TNR)NAME).don \ - -fl$(MISC)$/$(SDI$(TNR)NAME).lst \ + -fs$(INCCOMX)/$(SDI$(TNR)NAME).hxx \ + -fd$(INCCOMX)/$(SDI$(TNR)NAME).ilb \ + -fm$(MISC)/$(SDI$(TNR)NAME).don \ + -fl$(MISC)/$(SDI$(TNR)NAME).lst \ -fx$(SDI$(TNR)EXPORT).sdi \ - -fz$(MISC)$/$(SDI$(TNR)NAME).sid \ + -fz$(MISC)/$(SDI$(TNR)NAME).sid \ $(SDI$(TNR)NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) $(INCLUDE)) .ENDIF # "$(SDI$(TNR)TARGET)"!="" diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 3940f4e1311e..75fea561166c 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -62,7 +62,7 @@ LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH)*=/ERROR:/Bad_SHL$(TNR)RPATH_value SHL$(TNR)LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH)) .IF "$(SHL$(TNR)USE_EXPORTS)"=="" -SHL$(TNR)DEF*=$(MISC)$/$(SHL$(TNR)TARGET).def +SHL$(TNR)DEF*=$(MISC)/$(SHL$(TNR)TARGET).def .ENDIF # "$(SHL$(TNR)USE_EXPORTS)"=="" EXTRALIBPATHS$(TNR)=$(EXTRALIBPATHS) @@ -77,20 +77,22 @@ EXTRALIBPATHS$(TNR)+=-L$(SOLAR_STLLIBPATH) #+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.IF "$(L10N_framework)"=="" .IF "$(VERSIONOBJ)"!="" SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)$/$(SHL$(TNR)VERSIONOBJ:b).h +USE_VERSIONH:=$(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h .IF "$(GUI)" == "UNX" SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) .ELSE # "$(GUI)" == "UNX" SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f) .ENDIF # "$(GUI)" == "UNX" -$(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL$(TNR)VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)$/src$/version.c $@ - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@ +$(MISC)/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h +# $(COPY) $(SOLARENV)/src/version.c $@ + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@ .INIT : $(SHL$(TNR)VERSIONOBJDEP) .ENDIF # "$(VERSIONOBJ)"!="" +.ENDIF .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" || "$(GUI)" == "OS2" @@ -98,13 +100,13 @@ $(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(S SHL$(TNR)IMPLIB=i$(TARGET)_t$(TNR) .ENDIF # "$(SHL$(TNR)IMPLIB)" == "" .IF "$(COM)" != "GCC" -USE_$(TNR)IMPLIB=-implib:$(LB)$/$(SHL$(TNR)IMPLIB).lib +USE_$(TNR)IMPLIB=-implib:$(LB)/$(SHL$(TNR)IMPLIB).lib .ENDIF # "$(COM)" != "GCC" -SHL$(TNR)IMPLIBN=$(LB)$/$(SHL$(TNR)IMPLIB).lib +SHL$(TNR)IMPLIBN=$(LB)/$(SHL$(TNR)IMPLIB).lib ALLTAR : $(SHL$(TNR)IMPLIBN) .IF "$(USE_DEFFILE)"=="" -USE_$(TNR)IMPLIB_DEPS=$(LB)$/$(SHL$(TNR)IMPLIB).lib +USE_$(TNR)IMPLIB_DEPS=$(LB)/$(SHL$(TNR)IMPLIB).lib .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" || "$(GUI)" == "OS2" USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF) @@ -114,7 +116,7 @@ SHL$(TNR)DEPN+:=$(SHL$(TNR)DEPNU) .IF "$(SHL$(TNR)VERSIONMAP)"=="" # to activate vmaps remove "#" -USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)TARGET).vmap +USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)TARGET).vmap .ENDIF # "$(SHL$(TNR)VERSIONMAP)"=="" .IF "$(USE_SHL$(TNR)VERSIONMAP)"!="" @@ -122,7 +124,7 @@ USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)TARGET).vmap .IF "$(SHL$(TNR)FILTERFILE)"!="" .IF "$(SHL$(TNR)VERSIONMAP)"!="" #eine von beiden ist zuviel -USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)TARGET).vmap +USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)TARGET).vmap $(USE_SHL$(TNR)VERSIONMAP) .PHONY: @echo ----------------------------- @echo you should only use versionmap OR exportfile @@ -149,10 +151,10 @@ $(USE_SHL$(TNR)VERSIONMAP): \ .ENDIF .ENDIF # "$(SHL$(TNR)OBJS)!"="" @$(TYPE) /dev/null $(SHL$(TNR)LIBS:s/.lib/.dump/) >> $@.dump - $(PERL) $(SOLARENV)$/bin$/mapgen.pl -d $@.dump -s $(SHL$(TNR)INTERFACE) -f $(SHL$(TNR)FILTERFILE) -m $@ + $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL$(TNR)INTERFACE) -f $(SHL$(TNR)FILTERFILE) -m $@ .ELSE # "$(SHL$(TNR)FILTERFILE)"!="" -USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)TARGET).vmap +USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)TARGET).vmap $(USE_SHL$(TNR)VERSIONMAP) : @echo ----------------------------- @echo SHL$(TNR)FILTERFILE not set! @@ -165,7 +167,7 @@ $(USE_SHL$(TNR)VERSIONMAP) : #and now for the plain non-generic way... .IF "$(SHL$(TNR)VERSIONMAP)"!="" -USE_SHL$(TNR)VERSIONMAP=$(MISC)$/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e) +USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e) .IF "$(OS)"!="IRIX" SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP) .ENDIF @@ -185,7 +187,7 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP) # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what # happens if somebody will change it in the future .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .ELIF "$(COMNAME)"=="sunpro5" tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@ .ELSE # "$(COMID)"=="gcc3" @@ -195,15 +197,15 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP) # Mac OS X post-processing generate an exported symbols list from the generated map file # for details on exported symbols list see man ld on Mac OS X .IF "$(OS)"=="MACOSX" - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols - -cat $@ | $(AWK) -f $(SOLARENV)$/bin$/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols + -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS # Extract RTTI symbols from all the objects that will be used to build a shared library .IF "$(SHL$(TNR)OBJS)"!="" - -echo $(foreach,i,$(SHL$(TNR)OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -echo $(foreach,i,$(SHL$(TNR)OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF .IF "$(SHL$(TNR)LIBS)"!="" - -$(TYPE) $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)$/bin$/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols + -$(TYPE) $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols .ENDIF # overwrite the map file generate into the local output tree with the generated # exported symbols list @@ -227,15 +229,15 @@ SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\" .IF "$(SHL$(TNR)RES)"!="" SHL$(TNR)ALLRES+=$(SHL$(TNR)RES) -SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res -SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o +SHL$(TNR)LINKRES*=$(MISC)/$(SHL$(TNR)TARGET).res +SHL$(TNR)LINKRESO*=$(MISC)/$(SHL$(TNR)TARGET)_res.o .ENDIF # "$(SHL$(TNR)RES)"!="" .IF "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!="" -SHL$(TNR)DEFAULTRES*=$(MISC)$/$(SHL$(TNR)TARGET)_def.res +SHL$(TNR)DEFAULTRES*=$(MISC)/$(SHL$(TNR)TARGET)_def.res SHL$(TNR)ALLRES+=$(SHL$(TNR)DEFAULTRES) -SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res -SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o +SHL$(TNR)LINKRES*=$(MISC)/$(SHL$(TNR)TARGET).res +SHL$(TNR)LINKRESO*=$(MISC)/$(SHL$(TNR)TARGET)_res.o .ENDIF # "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!="" #.IF "$(SHL$(TNR)TARGETN)"!="" @@ -243,13 +245,13 @@ SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o .IF "$(linkinc)"!="" .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(SHL$(TNR)LIBS)"!="" -$(MISC)$/$(SHL$(TNR)TARGET)_linkinc.ls .PHONY: +$(MISC)/$(SHL$(TNR)TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL$(TNR)LIBS)"!="" .ENDIF -LINKINCTARGETS+=$(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls +LINKINCTARGETS+=$(MISC)/$(SHL$(TNR)TARGETN:b)_linkinc.ls $(SHL$(TNR)TARGETN) : $(LINKINCTARGETS) .ELSE @@ -257,17 +259,17 @@ $(SHL$(TNR)TARGETN) : $(LINKINCTARGETS) .IF "$(GUI)"=="WNT" || "$(GUI)" == "OS2" .IF "$(COM)"!="GCC" .IF "$(SHL$(TNR)LIBS)"!="" -SHL$(TNR)LINKLIST=$(MISC)$/$(SHL$(TNR)TARGET)_link.lst +SHL$(TNR)LINKLIST=$(MISC)/$(SHL$(TNR)TARGET)_link.lst SHL$(TNR)LINKLISTPARAM=@$(SHL$(TNR)LINKLIST) $(SHL$(TNR)LINKLIST) : $(SHL$(TNR)LIBS) @@-$(RM) $@ - $(SED) -f $(SOLARENV)$/bin$/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@ + $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@ .ENDIF # "$(SHL$(TNR)LIBS)"!="" .ENDIF # "$(COM)"!="GCC" .ENDIF .ENDIF # "$(SHL$(TNR)USE_EXPORTS)"=="name" -$(MISC)$/%linkinc.ls: +$(MISC)/%linkinc.ls: echo . > $@ .ENDIF # "$(linkinc)"!="" @@ -278,7 +280,7 @@ 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 = $(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 = @@ -299,54 +301,50 @@ $(SHL$(TNR)TARGETN) : \ @echo Making: $(SHL$(TNR)TARGETN) .IF "$(GUI)" == "WNT" .IF "$(SHL$(TNR)DEFAULTRES)"!="" - @@-$(RM) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc + @@-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc .IF "$(SHL$(TNR)ICON)" != "" - @echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc + @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 + @echo $(EMQ)#include $(EMQ)"$(SHL$(TNR)ADD_VERINFO)$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc .ELSE # "$(SHL$(TNR)ADD_VERINFO)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc .ENDIF # "$(SHL$(TNR)ADD_VERINFO)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc .ENDIF # "$(SHL$(TNR)DEFAULTRES)"!="" .IF "$(SHL$(TNR)ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL$(TNR)ALLRES:s/res /res+/) $(SHL$(TNR)LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES) .IF "$(COM)"=="GCC" windres $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO) .ENDIF # "$(COM)"=="GCC" -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL$(TNR)ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def @echo dlltool --input-def $(SHL$(TNR)DEF) \ --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \ - --kill-at \\ > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @noop $(assign ALL$(TNR)OBJLIST:=$(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) $(shell $(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB$(TNR)NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd -.ELSE # "$(DEFLIB$(TNR)NAME)"!="" # do not have to include objs - @echo --output-exp $(MISC)$/$(@:b)_exp.o \ - $(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \ - `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + @noop $(assign DEF$(TNR)OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) + @noop $(foreach,i,$(DEF$(TNR)OBJLIST) $(assign ALL$(TNR)OBJLIST:=$(ALL$(TNR)OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB$(TNR)NAME)"!="" + @echo --output-exp $(MISC)/$(@:b)_exp.o \ + $(ALL$(TNR)OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \ - `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ -Wl,--exclude-libs,ALL,--start-group $(SHL$(TNR)STDLIBS) -Wl,--end-group \ - $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(MISC)$/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ - -Wl,-Map,$(MISC)$/$(@:b).map >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @$(TYPE) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(MISC)/$(@:b)_exp.o $(MINGWSSTDENDOBJ) \ + -Wl,-Map,$(MISC)/$(@:b).map >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @$(TYPE) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd .ELSE .IF "$(linkinc)"=="" .IF "$(SHL$(TNR)USE_EXPORTS)"!="name" @@ -356,7 +354,7 @@ $(SHL$(TNR)TARGETN) : \ $(LINKFLAGSSHL) \ $(SHL$(TNR)STACK) $(SHL$(TNR)BASEX) \ -out:$@ \ - -map:$(MISC)$/$(@:b).map \ + -map:$(MISC)/$(@:b).map \ -def:$(SHL$(TNR)DEF) \ $(USE_$(TNR)IMPLIB) \ $(STDOBJ) \ @@ -370,7 +368,7 @@ $(SHL$(TNR)TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -381,8 +379,8 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)LINKER) @$(mktmp $(SHL$(TNR)LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \ $(SHL$(TNR)STACK) -out:$(SHL$(TNR)TARGETN) \ - -map:$(MISC)$/$(@:B).map \ - $(LB)$/$(SHL$(TNR)IMPLIB).exp \ + -map:$(MISC)/$(@:B).map \ + $(LB)/$(SHL$(TNR)IMPLIB).exp \ $(STDOBJ) \ $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \ $(SHL$(TNR)LIBS) \ @@ -394,7 +392,7 @@ $(SHL$(TNR)TARGETN) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -406,7 +404,7 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)LINKER) @$(mktmp $(SHL$(TNR)LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \ $(SHL$(TNR)STACK) -out:$(SHL$(TNR)TARGETN) \ - -map:$(MISC)$/$(@:B).map \ + -map:$(MISC)/$(@:B).map \ $(USE_$(TNR)IMPLIB) \ $(STDOBJ) \ $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ)) \ @@ -417,7 +415,7 @@ $(SHL$(TNR)TARGETN) : \ ) @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -426,25 +424,25 @@ $(SHL$(TNR)TARGETN) : \ $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI) .ENDIF # "$(SHL$(TNR)USE_EXPORTS)"!="name" .ELSE # "$(linkinc)"=="" - -$(RM) del $(MISC)$/$(SHL$(TNR)TARGET).lnk - -$(RM) $(MISC)$/$(SHL$(TNR)TARGET).lst + -$(RM) del $(MISC)/$(SHL$(TNR)TARGET).lnk + -$(RM) $(MISC)/$(SHL$(TNR)TARGET).lst $(TYPE) $(mktmp \ $(SHL$(TNR)LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \ $(SHL$(TNR)STACK) $(MAPFILE) \ -out:$@ \ - $(LB)$/$(SHL$(TNR)IMPLIB).exp \ + $(LB)/$(SHL$(TNR)IMPLIB).exp \ $(STDOBJ) \ $(SHL$(TNR)OBJS) \ $(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \ $(SHL$(TNR)LINKRES) \ - ) >> $(MISC)$/$(SHL$(TNR)TARGET).lnk - $(TYPE) $(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL$(TNR)TARGET).lnk - $(SHL$(TNR)LINKER) @$(MISC)$/$(SHL$(TNR)TARGET).lnk + ) >> $(MISC)/$(SHL$(TNR)TARGET).lnk + $(TYPE) $(MISC)/$(SHL$(TNR)TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL$(TNR)TARGET).lnk + $(SHL$(TNR)LINKER) @$(MISC)/$(SHL$(TNR)TARGET).lnk @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -456,45 +454,45 @@ $(SHL$(TNR)TARGETN) : \ .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(@:b).list - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + @-$(RM) $(MISC)/$(@:b).list + @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @echo $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \ $(SHL$(TNR)VERSIONOBJ) \ - `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list - @echo -n $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-dylib-link-list.pl \ - `cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd` \ - >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @$(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl \ + `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list + @echo -n $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ + $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ + `cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd` \ + >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL$(TNR)RPATH) $@ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL$(TNR)NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN) .ENDIF # "$(SHL$(TNR)NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)SONAME) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \ + @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)SONAME) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \ $(SHL$(TNR)VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ - $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd - @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd + `cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ + $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd .IF "$(UPDATER)"=="YES" .IF "$(SHL$(TNR)NOCHECK)"=="" -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) + $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) .ENDIF # "$(SHL$(TNR)NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" - $(RM) $(LB)$/$(SHL$(TNR)TARGETN:b) + $(RM) $(LB)/$(SHL$(TNR)TARGETN:b) cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b) .ENDIF # "$(UNIXVERSIONNAMES)"!="" @ls -l $@ @@ -503,27 +501,23 @@ $(SHL$(TNR)TARGETN) : \ .IF "$(GUI)" == "OS2" .IF "$(SHL$(TNR)DEFAULTRES)"!="" - @+-$(RM) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc >& $(NULLDEV) + @+-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc >& $(NULLDEV) .IF "$(SHL$(TNR)ICON)" != "" - @-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc + @-+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 + @-+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 + @-+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) - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc + $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc .ENDIF # "$(SHL$(TNR)DEFAULTRES)"!="" .IF "$(SHL$(TNR)ALLRES)"!="" -.IF "$(USE_SHELL)"=="4nt" - +$(COPY) $(SHL$(TNR)ALLRES:s/res /res+/) $(SHL$(TNR)LINKRES) -.ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL$(TNR)ALLRES)"!="" .IF "$(USE_DEFFILE)"!="" @@ -532,7 +526,7 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \ $(SHL$(TNR)LIBS) \ $(SHL$(TNR)STDLIBS:^"-l") \ @@ -547,7 +541,7 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)DEF) \ $(STDOBJ) \ -L$(LB) \ - -L$(SOLARVERSION)$/$(INPATH)$/lib \ + -L$(SOLARVERSION)/$(INPATH)/lib \ $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \ $(SHL$(TNR)LIBS) \ $(SHL$(TNR)STDLIBS:^"-l") \ @@ -571,7 +565,7 @@ $(SHL$(TNR)TARGETN) : \ ALLTAR : runtest_$(SHL$(TNR)TARGET) runtest_$(SHL$(TNR)TARGET) : $(SHL$(TNR)TARGETN) - testshl $(SHL$(TNR)TARGETN) sce$/$(SHL$(TNR)TARGET).sce -msg -skip + testshl $(SHL$(TNR)TARGETN) sce/$(SHL$(TNR)TARGET).sce -msg -skip .ENDIF # "$(NO_TESTS)"=="" .ENDIF # "$(TESTDIR)"!="" .ENDIF # "$(SHL$(TNR)TARGETN)"!="" diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk index dd275cf13543..cf7acfaaac1d 100644 --- a/solenv/inc/tg_slo.mk +++ b/solenv/inc/tg_slo.mk @@ -43,7 +43,7 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES) # @$(RM) $@ .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(foreach,i,$(SLOFILES:f) $(RSLO)$/$(i)) | xargs -n1 > $@ + +$(ECHONL) $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i)) | xargs -n1 > $@ .ELSE .IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) @@ -60,11 +60,11 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES) .ENDIF # "$(GUI)"=="OS2" .IF "$(GUI)"=="UNX" - echo $(foreach,i,$(SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) | xargs -n1 > $@ + echo $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@ .IF "$(OS)"=="MACOSX" - @-nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @-nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ELSE - @nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(@:d)$(@:b).dump + @nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump .ENDIF .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(SLOTARGET)"!="" @@ -80,7 +80,7 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES) @echo Making: $@ .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i)) | xargs -n1 > $@ + +$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)/$(i)) | xargs -n1 > $@ .ELSE .IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) @@ -98,7 +98,7 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES) .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="UNX" - echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) | xargs -n1 > $@ + echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@ .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$($(SECOND_BUILD)SLOTARGET)"!="" .ENDIF # "$(SECOND_BUILD)"!="" diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk index d5e757cda3ae..e7911d8e1d1b 100644 --- a/solenv/inc/tg_srs.mk +++ b/solenv/inc/tg_srs.mk @@ -34,30 +34,30 @@ .IF "$(SRS$(TNR)NAME)"!="" .IF "$(BUILDHIDS)"!="" -HID$(TNR)FILES=$(foreach,i,$(SRC$(TNR)FILES:f) $(SRS)$/$(i:s/.src/.hid/)) -HIDSRS$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS$(TNR)NAME)_srs.hid +HID$(TNR)FILES=$(foreach,i,$(SRC$(TNR)FILES:f) $(SRS)/$(i:s/.src/.hid/)) +HIDSRS$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS$(TNR)NAME)_srs.hid $(HIDSRS$(TNR)PARTICLE) : $(HID$(TNR)FILES) @echo ------------------------------ @echo Making: $@ @-$(RM) $@ - $(TYPE) $(mktmp $(subst,$/,/ $(HID$(TNR)FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp + $(TYPE) $(mktmp $(subst,/,/ $(HID$(TNR)FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp @$(RENAME) $@.$(ROUT).tmp $@ ALLTAR : $(HIDSRS$(TNR)PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST) +$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST) -$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES) +$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES) @echo ------------------------------ @echo Making: $@ - @@-$(RM) $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr - $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES) + @@-$(RM) $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr + $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES) .IF "$(WITH_LANG)"!="" -$(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) +$(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF) -$(MKDIR) $(@:d) -$(RM) $@ -$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME) @@ -65,11 +65,11 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZE $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST) +$(SRS)/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST) -$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)/$(TARGET)/$i) .ELSE # "$(WITH_LANG)"!="" -$(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES) +$(SRS)/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES) .ENDIF # "$(WITH_LANG)"!="" @echo ------------------------------ @echo Making: $@ diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk index c65ef3d09b3b..6e1d789d8845 100644 --- a/solenv/inc/tg_wntx64.mk +++ b/solenv/inc/tg_wntx64.mk @@ -71,9 +71,9 @@ SHL2LINKFLAGS_X64+=$(LINKFLAGS_X64) .IF "$(SHL1IMPLIB_X64)" == "" SHL1IMPLIB_X64=i$(TARGET)_t1 .ENDIF # "$(SHL1IMPLIB_X64)" == "" -USE_1IMPLIB_X64=-implib:$(LB_X64)$/$(SHL1IMPLIB_X64).lib +USE_1IMPLIB_X64=-implib:$(LB_X64)/$(SHL1IMPLIB_X64).lib .IF "$(SHL1TARGET_X64)"!="" -SHL1IMPLIBN_X64=$(LB_X64)$/$(SHL1IMPLIB_X64).lib +SHL1IMPLIBN_X64=$(LB_X64)/$(SHL1IMPLIB_X64).lib .ENDIF # "$(SLOFILES_X64)$(OBJFILES_X64)"!="" make_x64_dirs : @@ -146,16 +146,16 @@ $(DEF1TARGETN_X64) : \ @echo GetVersionInfo >>$@.tmpfile .IF "$(DEFLIB1NAME_X64)"!="" .IF "$(SHL1USE_EXPORTS_X64)"=="" - @-$(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)$/$(SHL1TARGET_X64).exp - @$(EXPORT1_PROTECT) $(LIBMGR_X64) -EXTRACT:/ /OUT:$(MISC_X64)$/$(SHL1TARGET_X64).exp $(SLB_X64)$/$(DEFLIB1NAME_X64).lib - @$(EXPORT1_PROTECT) $(LDUMP2) -E 20 -F $(MISC_X64)$/$(SHL1TARGET_X64).flt $(MISC_X64)$/$(SHL1TARGET_X64).exp >>$@.tmpfile - $(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)$/$(SHL1TARGET_X64).exp + @-$(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL1TARGET_X64).exp + @$(EXPORT1_PROTECT) $(LIBMGR_X64) -EXTRACT:/ /OUT:$(MISC_X64)/$(SHL1TARGET_X64).exp $(SLB_X64)/$(DEFLIB1NAME_X64).lib + @$(EXPORT1_PROTECT) $(LDUMP2) -E 20 -F $(MISC_X64)/$(SHL1TARGET_X64).flt $(MISC_X64)/$(SHL1TARGET_X64).exp >>$@.tmpfile + $(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL1TARGET_X64).exp .ELSE # "$(SHL1USE_EXPORTS_X64)"=="" - @$(EXPORT1_PROTECT) $(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB1NAME_X64) $(SLB_X64)$/$(i).lib) | $(GREP) EXPORT: > $(MISC_X64)$/$(SHL1TARGET_X64).direct + @$(EXPORT1_PROTECT) $(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB1NAME_X64) $(SLB_X64)/$(i).lib) | $(GREP) EXPORT: > $(MISC_X64)/$(SHL1TARGET_X64).direct .IF "$(SHL1USE_EXPORTS_X64)"!="name" - @$(EXPORT1_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF1FILTER_X64) $(MISC_X64)$/$(SHL1TARGET_X64).direct >>$@.tmpfile + @$(EXPORT1_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF1FILTER_X64) $(MISC_X64)/$(SHL1TARGET_X64).direct >>$@.tmpfile .ELSE # "$(SHL1USE_EXPORTS_X64)"!="name" - @$(EXPORT1_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF1FILTER_X64) $(MISC_X64)$/$(SHL1TARGET_X64).direct >>$@.tmpfile + @$(EXPORT1_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF1FILTER_X64) $(MISC_X64)/$(SHL1TARGET_X64).direct >>$@.tmpfile .ENDIF # "$(SHL1USE_EXPORTS_X64)"!="name" .ENDIF # "$(SHL1USE_EXPORTS)"=="" .ENDIF # "$(DEFLIB1NAME)"!="" @@ -184,16 +184,16 @@ $(DEF2TARGETN_X64) : \ @echo GetVersionInfo >>$@.tmpfile .IF "$(DEFLIB2NAME_X64)"!="" .IF "$(SHL2USE_EXPORTS_X64)"=="" - @-$(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)$/$(SHL2TARGET_X64).exp - @$(EXPORT2_PROTECT) $(LIBMGR_X64) -EXTRACT:/ /OUT:$(MISC_X64)$/$(SHL2TARGET_X64).exp $(SLB_X64)$/$(DEFLIB2NAME_X64).lib - @$(EXPORT2_PROTECT) $(LDUMP2) -E 20 -F $(MISC_X64)$/$(SHL2TARGET_X64).flt $(MISC_X64)$/$(SHL2TARGET_X64).exp >>$@.tmpfile - $(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)$/$(SHL2TARGET_X64).exp + @-$(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL2TARGET_X64).exp + @$(EXPORT2_PROTECT) $(LIBMGR_X64) -EXTRACT:/ /OUT:$(MISC_X64)/$(SHL2TARGET_X64).exp $(SLB_X64)/$(DEFLIB2NAME_X64).lib + @$(EXPORT2_PROTECT) $(LDUMP2) -E 20 -F $(MISC_X64)/$(SHL2TARGET_X64).flt $(MISC_X64)/$(SHL2TARGET_X64).exp >>$@.tmpfile + $(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL2TARGET_X64).exp .ELSE # "$(SHL2USE_EXPORTS_X64)"=="" - @$(EXPORT2_PROTECT) $(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB2NAME_X64) $(SLB_X64)$/$(i).lib) | $(GREP) EXPORT: > $(MISC_X64)$/$(SHL2TARGET_X64).direct + @$(EXPORT2_PROTECT) $(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB2NAME_X64) $(SLB_X64)/$(i).lib) | $(GREP) EXPORT: > $(MISC_X64)/$(SHL2TARGET_X64).direct .IF "$(SHL2USE_EXPORTS_X64)"!="name" - @$(EXPORT2_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF2FILTER_X64) $(MISC_X64)$/$(SHL2TARGET_X64).direct >>$@.tmpfile + @$(EXPORT2_PROTECT) $(LDUMP2) -D -E 20 -F $(DEF2FILTER_X64) $(MISC_X64)/$(SHL2TARGET_X64).direct >>$@.tmpfile .ELSE # "$(SHL2USE_EXPORTS_X64)"!="name" - @$(EXPORT2_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF2FILTER_X64) $(MISC_X64)$/$(SHL2TARGET_X64).direct >>$@.tmpfile + @$(EXPORT2_PROTECT) $(LDUMP2) -N -D -E 20 -F $(DEF2FILTER_X64) $(MISC_X64)/$(SHL2TARGET_X64).direct >>$@.tmpfile .ENDIF # "$(SHL2USE_EXPORTS_X64)"!="name" .ENDIF # "$(SHL2USE_EXPORTS)"=="" .ENDIF # "$(DEFLIB1NAME)"!="" @@ -213,28 +213,28 @@ $(DEF2TARGETN_X64) : \ .IF "$(SHL1TARGET_X64)"!="" .IF "$(VERSIONOBJ_X64)"!="" SHL1VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET_X64))}$(VERSIONOBJ_X64:f) -USE_VERSIONH_X64:=$(INCCOM)$/$(SHL1VERSIONOBJ_X64:b).h +USE_VERSIONH_X64:=$(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h SHL1VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET_X64))}$(VERSIONOBJ_X64:f) -$(MISC_X64)$/$(SHL1VERSIONOBJ_X64:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL1VERSIONOBJ_X64:b).h - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ_X64:b).h/ > $@ +$(MISC_X64)/$(SHL1VERSIONOBJ_X64:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ_X64:b).h/ > $@ .INIT : $(SHL1VERSIONOBJDEP_X64) .ENDIF .IF "$(USE_DEFFILE_X64)"=="" -USE_1IMPLIB_DEPS_X64=$(LB_X64)$/$(SHL1IMPLIB_X64).lib +USE_1IMPLIB_DEPS_X64=$(LB_X64)/$(SHL1IMPLIB_X64).lib .ENDIF # "$(USE_DEFFILE_X64)"=="" .IF "$(SHL1RES_X64)"!="" SHL1ALLRES_X64+=$(SHL1RES_X64) -SHL1LINKRES_X64*=$(MISC_X64)$/$(SHL1TARGET_X64).res -SHL1LINKRESO_X64*=$(MISC_X64)$/$(SHL1TARGET_X64)_res.o +SHL1LINKRES_X64*=$(MISC_X64)/$(SHL1TARGET_X64).res +SHL1LINKRESO_X64*=$(MISC_X64)/$(SHL1TARGET_X64)_res.o .ENDIF # "$(SHL1RES_X64)"!="" .IF "$(SHL1DEFAULTRES_X64)$(use_shl_versions)"!="" -SHL1DEFAULTRES_X64*=$(MISC_X64)$/$(SHL1TARGET_X64)_def.res +SHL1DEFAULTRES_X64*=$(MISC_X64)/$(SHL1TARGET_X64)_def.res SHL1ALLRES_X64+=$(SHL1DEFAULTRES_X64) -SHL1LINKRES_X64*=$(MISC_X64)$/$(SHL1TARGET_X64).res -SHL1LINKRESO_X64*=$(MISC_X64)$/$(SHL1TARGET_X64)_res.o +SHL1LINKRES_X64*=$(MISC_X64)/$(SHL1TARGET_X64).res +SHL1LINKRESO_X64*=$(MISC_X64)/$(SHL1TARGET_X64)_res.o .ENDIF # "$(SHL1DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL1TARGET_X64)"=!"" @@ -252,28 +252,24 @@ $(SHL1TARGETN_X64) : \ @echo ------------------------------ @echo Making: $(SHL1TARGETN_X64) .IF "$(SHL1DEFAULTRES_X64)"!="" - @@-$(RM) $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc + @@-$(RM) $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc .IF "$(use_shl_versions)" != "" .IF "$(SHL1ADD_VERINFO_X64)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL1ADD_VERINFO)$(EMQ)" >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc .ELSE # "$(SHL1ADD_VERINFO_X64)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc .ENDIF # "$(SHL1ADD_VERINFO_X64)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL1TARGET_X64)$(DLLPOST) >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL1TARGET_X64)$(DLLPOST) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)$/$(SHL1DEFAULTRES_X64:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc .ENDIF # "$(SHL1DEFAULTRES_X64)"!="" .IF "$(SHL1ALLRES_X64)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL1ALLRES_X64:s/res /res+/) $(SHL1LINKRES_X64) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL1ALLRES_X64) > $(SHL1LINKRES_X64) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL1ALLRES)"!="" .IF "$(USE_DEFFILE_X64)"!="" $(LINK_X64) @$(mktmp \ @@ -281,7 +277,7 @@ $(SHL1TARGETN_X64) : \ $(LINKFLAGSSHL_X64) \ $(SHL1STACK_X64) $(SHL1BASEX_X64) \ -out:$@ \ - -map:$(MISC_X64)$/$(@:b).map \ + -map:$(MISC_X64)/$(@:b).map \ -def:$(SHL1DEF_X64) \ $(USE_1IMPLIB_X64) \ $(STDOBJ_X64) \ @@ -295,7 +291,7 @@ $(SHL1TARGETN_X64) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -306,8 +302,8 @@ $(SHL1TARGETN_X64) : \ $(LINK_X64) @$(mktmp $(SHL1LINKFLAGS_X64) \ $(LINKFLAGSSHL_X64) $(SHL1BASEX_X64) \ $(SHL1STACK_X64) -out:$(SHL1TARGETN_X64) \ - -map:$(MISC_X64)$/$(@:B).map \ - $(LB_X64)$/$(SHL1IMPLIB_X64).exp \ + -map:$(MISC_X64)/$(@:B).map \ + $(LB_X64)/$(SHL1IMPLIB_X64).exp \ $(STDOBJ_X64) \ $(SHL1OBJS_X64) $(SHL1VERSIONOBJ_X64) \ $(SHL1LIBS_X64) \ @@ -319,7 +315,7 @@ $(SHL1TARGETN_X64) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -350,10 +346,10 @@ $(SHL1IMPLIBN_X64): \ SHL2IMPLIB_X64=i$(TARGET)_t2 .ENDIF # "$(SHL2IMPLIB_X64)" == "" .IF "$(COM)" != "GCC" -USE_2IMPLIB_X64=-implib:$(LB_X64)$/$(SHL2IMPLIB_X64).lib +USE_2IMPLIB_X64=-implib:$(LB_X64)/$(SHL2IMPLIB_X64).lib .ENDIF # "$(COM)" != "GCC" .IF "$(SHL2TARGET_X64)"!="" -SHL2IMPLIBN_X64=$(LB_X64)$/$(SHL2IMPLIB_X64).lib +SHL2IMPLIBN_X64=$(LB_X64)/$(SHL2IMPLIB_X64).lib .ENDIF # "$(SLOFILES_X64)$(OBJFILES_X64)"!="" .IF "$(LIBTARGET)" == "" @@ -363,28 +359,28 @@ ALLTAR : $(SHL2IMPLIBN_X64) .IF "$(SHL2TARGET_X64)"!="" .IF "$(VERSIONOBJ_X64)"!="" SHL2VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET_X64))}$(VERSIONOBJ_X64:f) -USE_VERSIONH_X64:=$(INCCOM)$/$(SHL2VERSIONOBJ_X64:b).h +USE_VERSIONH_X64:=$(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h SHL2VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET_X64))}$(VERSIONOBJ_X64:f) -$(MISC_X64)$/$(SHL2VERSIONOBJ_X64:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL2VERSIONOBJ_X64:b).h - $(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ_X64:b).h/ > $@ +$(MISC_X64)/$(SHL2VERSIONOBJ_X64:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h + $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ_X64:b).h/ > $@ .INIT : $(SHL2VERSIONOBJDEP_X64) .ENDIF .IF "$(USE_DEFFILE_X64)"=="" -USE_2IMPLIB_DEPS_X64=$(LB_X64)$/$(SHL2IMPLIB_X64).lib +USE_2IMPLIB_DEPS_X64=$(LB_X64)/$(SHL2IMPLIB_X64).lib .ENDIF # "$(USE_DEFFILE_X64)"=="" .IF "$(SHL2RES_X64)"!="" SHL2ALLRES_X64+=$(SHL2RES_X64) -SHL2LINKRES_X64*=$(MISC_X64)$/$(SHL2TARGET_X64).res -SHL2LINKRESO_X64*=$(MISC_X64)$/$(SHL2TARGET_X64)_res.o +SHL2LINKRES_X64*=$(MISC_X64)/$(SHL2TARGET_X64).res +SHL2LINKRESO_X64*=$(MISC_X64)/$(SHL2TARGET_X64)_res.o .ENDIF # "$(SHL2RES_X64)"!="" .IF "$(SHL2DEFAULTRES_X64)$(use_shl_versions)"!="" -SHL2DEFAULTRES_X64*=$(MISC_X64)$/$(SHL2TARGET_X64)_def.res +SHL2DEFAULTRES_X64*=$(MISC_X64)/$(SHL2TARGET_X64)_def.res SHL2ALLRES_X64+=$(SHL2DEFAULTRES_X64) -SHL2LINKRES_X64*=$(MISC_X64)$/$(SHL2TARGET_X64).res -SHL2LINKRESO_X64*=$(MISC_X64)$/$(SHL2TARGET_X64)_res.o +SHL2LINKRES_X64*=$(MISC_X64)/$(SHL2TARGET_X64).res +SHL2LINKRESO_X64*=$(MISC_X64)/$(SHL2TARGET_X64)_res.o .ENDIF # "$(SHL2DEFAULTRES)$(use_shl_versions)"!="" .ENDIF # "$(SHL2TARGET_X64)"=!"" @@ -402,28 +398,24 @@ $(SHL2TARGETN_X64) : \ @echo ------------------------------ @echo Making: $(SHL2TARGETN_X64) .IF "$(SHL2DEFAULTRES_X64)"!="" - @@-$(RM) $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc + @@-$(RM) $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc .IF "$(use_shl_versions)" != "" .IF "$(SHL2ADD_VERINFO_X64)"!="" - @echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc + @echo $(EMQ)#include $(EMQ)"$(SHL2ADD_VERINFO)$(EMQ)" >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc .ELSE # "$(SHL2ADD_VERINFO_X64)"!="" - @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc - @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO1 >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO2 >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc + @echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc .ENDIF # "$(SHL1ADD_VERINFO_X64)"!="" - @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc - @echo $(EMQ)#define ORG_NAME $(SHL2TARGET_X64)$(DLLPOST) >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc - @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc - @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc + @echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc + @echo $(EMQ)#define ORG_NAME $(SHL2TARGET_X64)$(DLLPOST) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc + @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc + @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)$/$(SHL2DEFAULTRES_X64:b).rc + $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc .ENDIF # "$(SHL2DEFAULTRES_X64)"!="" .IF "$(SHL2ALLRES_X64)"!="" -.IF "$(USE_SHELL)"=="4nt" - $(COPY) /b $(SHL2ALLRES_X64:s/res /res+/) $(SHL2LINKRES_X64) -.ELSE # "$(USE_SHELL)"=="4nt" $(TYPE) $(SHL2ALLRES_X64) > $(SHL2LINKRES_X64) -.ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL2ALLRES)"!="" .IF "$(USE_DEFFILE_X64)"!="" $(LINK_X64) @$(mktmp \ @@ -431,7 +423,7 @@ $(SHL2TARGETN_X64) : \ $(LINKFLAGSSHL_X64) \ $(SHL2STACK_X64) $(SHL2BASEX_X64) \ -out:$@ \ - -map:$(MISC_X64)$/$(@:b).map \ + -map:$(MISC_X64)/$(@:b).map \ -def:$(SHL2DEF_X64) \ $(USE_2IMPLIB_X64) \ $(STDOBJ_X64) \ @@ -445,7 +437,7 @@ $(SHL2TARGETN_X64) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -456,8 +448,8 @@ $(SHL2TARGETN_X64) : \ $(LINK_X64) @$(mktmp $(SHL2LINKFLAGS_X64) \ $(LINKFLAGSSHL_X64) $(SHL2BASEX_X64) \ $(SHL2STACK_X64) -out:$(SHL2TARGETN_X64) \ - -map:$(MISC_X64)$/$(@:B).map \ - $(LB_X64)$/$(SHL2IMPLIB_X64).exp \ + -map:$(MISC_X64)/$(@:B).map \ + $(LB_X64)/$(SHL2IMPLIB_X64).exp \ $(STDOBJ_X64) \ $(SHL2OBJS_X64) $(SHL2VERSIONOBJ_X64) \ $(SHL2LIBS_X64) \ @@ -469,7 +461,7 @@ $(SHL2TARGETN_X64) : \ @@$(LS) $@ @echo linking $@.manifest ... .IF "$(VISTA_MANIFEST)"!="" - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)$/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) + $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI) $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI) .ELSE $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI) @@ -498,28 +490,28 @@ $(SHL2IMPLIBN_X64): \ -$(SLO_X64)$/%.obj : %.cxx +$(SLO_X64)/%.obj : %.cxx @echo ------------------------------ @echo Making: $@ @@-$(RM) $@ >& $(NULLDEV) -$(MKDIR) $(@:d) - $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT) + $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT) -$(SLO_X64)$/%.obj : $(MISC)$/%.c +$(SLO_X64)/%.obj : $(MISC)/%.c @echo ------------------------------ @echo Making: $@ -$(MKDIR) $(@:d) @@-$(RM) $@ - @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $(MISC)$/$*.c ) + @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c ) @$(ECHONL) - $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $(MISC)$/$*.c ) + $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c ) -$(SLO_X64)$/%.obj : %.c +$(SLO_X64)/%.obj : %.c @echo ------------------------------ @echo Making: $@ -$(MKDIR) $(@:d) @@-$(RM) $@ - $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)$/$*.obj $*.c ) + $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $*.c ) .ENDIF # "$(BUILD_X64)"!="" diff --git a/solenv/inc/tg_yxx.mk b/solenv/inc/tg_yxx.mk index 671a9a935102..a214ef86c16c 100644 --- a/solenv/inc/tg_yxx.mk +++ b/solenv/inc/tg_yxx.mk @@ -30,33 +30,25 @@ #************************************************************************* -$(MISC)$/%.cxx : %.y +$(MISC)/%.cxx : %.y @echo ------------------------------ @echo Making: $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt" - tr -d "\015" < $< > $(MISC)$/stripped_$< -.ELSE - cat $< > $(MISC)$/stripped_$< -.ENDIF - $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)$/stripped_$< + tr -d "\015" < $< > $(MISC)/stripped_$< + $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)/stripped_$< # removing -f switch - avoid getting nothing when copying a file to itself - @@-$(COPY:s/-f//) $@.h $(INCCOM)$/$(@:b).hxx - @@-$(COPY:s/-f//) $(@:d)$/$(@:b).hxx $(INCCOM)$/$(@:b).hxx + @@-$(COPY:s/-f//) $@.h $(INCCOM)/$(@:b).hxx + @@-$(COPY:s/-f//) $(@:d)/$(@:b).hxx $(INCCOM)/$(@:b).hxx # fail on not existing .hxx - $(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) + $(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV) -$(INCCOM)$/yy%.cxx : %.y +$(INCCOM)/yy%.cxx : %.y @echo ------------------------------ @echo Making: $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt" - tr -d "\015" < $< > $(MISC)$/stripped_$< -.ELSE - cat $< > $(MISC)$/stripped_$< -.ENDIF - $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)$/stripped_$< + tr -d "\015" < $< > $(MISC)/stripped_$< + $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)/stripped_$< # removing -f switch - avoid getting nothing when copying a file to itself - @@-$(COPY:s/-f//) $@.h $(INCCOM)$/$(@:b).hxx - @@-$(COPY:s/-f//) $(@:d)$/$(@:b).hxx $(INCCOM)$/$(@:b).hxx + @@-$(COPY:s/-f//) $@.h $(INCCOM)/$(@:b).hxx + @@-$(COPY:s/-f//) $(@:d)/$(@:b).hxx $(INCCOM)/$(@:b).hxx # fail on not existing .hxx - $(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV) + $(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV) diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk index 43ddc9d71281..8ac7bb107f71 100644 --- a/solenv/inc/tg_zip.mk +++ b/solenv/inc/tg_zip.mk @@ -49,18 +49,18 @@ avoid_cvs_dir=-x "*CVS*" -x "*.svn*" ZIP$(TNR)EXT*=.zip .IF "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)LIST:s/LANGDIR//)" == "$(ZIP$(TNR)LIST)" -ZIP$(TNR)TARGETN=$(COMMONBIN)$/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT) +ZIP$(TNR)TARGETN=$(COMMONBIN)/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT) .ELSE -ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(COMMONBIN)$/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) ) +ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(COMMONBIN)/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) ) .ENDIF .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)LIST:s/LANGDIR//)" == "$(ZIP$(TNR)LIST)" -ZIP$(TNR)TARGETN=$(BIN)$/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT) +ZIP$(TNR)TARGETN=$(BIN)/$(ZIP$(TNR)TARGET)$(ZIP$(TNR)EXT) .ELSE -ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(BIN)$/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) ) +ZIP$(TNR)TARGETN=$(foreach,i,$(zip$(TNR)alllangiso) $(BIN)/$(ZIP$(TNR)TARGET)_$i$(ZIP$(TNR)EXT) ) .ENDIF .ENDIF # "$(common_build_zip)"!="" -ZIP$(TNR)DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,$/bin$/,$/misc$/ $(ZIP$(TNR)TARGETN:s/$(ZIP$(TNR)EXT)/.dpzz/))) +ZIP$(TNR)DEPFILE=$(subst,$(COMMON_OUTDIR),$(OUTPATH) $(subst,/bin/,/misc/ $(ZIP$(TNR)TARGETN:s/$(ZIP$(TNR)EXT)/.dpzz/))) ZIPDEPFILES+=$(ZIP$(TNR)DEPFILE) ZIP$(TNR)DIR*=$(ZIPDIR) @@ -68,11 +68,7 @@ ZIP$(TNR)FLAGS*=$(ZIPFLAGS) .IF "$(zip$(TNR)generatedlangs)"!="" zip$(TNR)langdirs*=$(alllangiso) .ELSE # "$(zip$(TNR)generatedlangs)"!="" -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip$(TNR)langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) -.ELSE # "$(GUI)"=="UNX" -zip$(TNR)langdirs:=$(subst,.svn, $(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP$(TNR)DIR))} /ba:d ))) -.ENDIF # "$(GUI)"=="UNX" +zip$(TNR)langdirs:=$(shell @-test -d {$(subst,/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ && find {$(subst,/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ -type d ! -name CVS ! -name ".svn" ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ENDIF # "$(zip$(TNR)generatedlangs)"!="" .IF "$(ZIP$(TNR)FORCEALLLANG)"!="" zip$(TNR)alllangiso:=$(foreach,i,$(completelangiso) $(foreach,j,$(zip$(TNR)langdirs) $(eq,$i,$j $i $(NULL)))) @@ -85,36 +81,36 @@ zip$(TNR)alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(zip$(TNR)langdirs) ZIP$(TNR)TMP:=$(mktmp iii) -$(MISC)$/$(TARGET).$(PWD:f).$(ZIP$(TNR)TARGET).dpzz : $(ZIP$(TNR)TARGETN) +$(MISC)/$(TARGET).$(PWD:f).$(ZIP$(TNR)TARGET).dpzz : $(ZIP$(TNR)TARGETN) .IF "$(common_build_zip)"!="" -ZIP$(TNR)HELPVAR=$(COMMONBIN)$/$(ZIP$(TNR)TARGET) +ZIP$(TNR)HELPVAR=$(COMMONBIN)/$(ZIP$(TNR)TARGET) .ELSE # "$(common_build_zip)"!="" -ZIP$(TNR)HELPVAR=$(BIN)$/$(ZIP$(TNR)TARGET) +ZIP$(TNR)HELPVAR=$(BIN)/$(ZIP$(TNR)TARGET) .ENDIF # "$(common_build_zip)"!="" $(ZIP$(TNR)DEPFILE) : - echo # > $(MISC)$/$(@:f) + echo # > $(MISC)/$(@:f) .IF "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)DIR)" != "" @echo type 1 -$(MKDIRHIER) $(ZIP$(TNR)DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR)))$/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP$(TNR)DIR)" != "" @echo type 2 - -$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP$(TNR)DIR)" != "" .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)DIR)" != "" @echo type 3 -$(MKDIRHIER) $(ZIP$(TNR)DIR) - $(CDD) $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,$/LANGDIR, $(ZIP$(TNR)DIR)))$/ $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)$/$(PRJ)$/$(ROUT)$/misc$/$(@:f) + $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f) .ELSE # "$(ZIP$(TNR)DIR)" != "" @echo type 4 - -$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$/misc$/,$/bin$/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET)_, $(subst,$/misc$/,$/bin$/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(@:f) + -$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f) .ENDIF # "$(ZIP$(TNR)DIR)" != "" .ENDIF # "$(common_build_zip)"!="" - @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)$/$(@:f) + @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f) $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS) @@ -126,22 +122,18 @@ $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS) .IF "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away$/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@.$(INPATH) $(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) .ELSE # "$(ZIP$(TNR)DIR)" != "" @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) zip $(ZIP$(TNR)FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH) @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) .ENDIF # "$(ZIP$(TNR)DIR)" != "" @@ -151,21 +143,17 @@ $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS) .ELSE # "$(common_build_zip)"!="" .IF "$(ZIP$(TNR)DIR)" != "" @@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away$/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" $(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@ $(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) .ELSE # "$(ZIP$(TNR)DIR)" != "" - zip $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(BIN)$/$(ZIP$(TNR)TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" + zip $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT) $(IFEXIST) $@ $(THEN) \ - $(PERL) -w $(SOLARENV)$/bin/cleanzip.pl $@ \ + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \ $(FI) -.ENDIF # "$(USE_SHELL)"!="4nt" .ENDIF # "$(ZIP$(TNR)DIR)" != "" .ENDIF # "$(common_build_zip)"!="" .ENDIF diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 1a684330aa54..6166161348e6 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -30,29 +30,27 @@ #************************************************************************* # Common tools - move this to the end / consolidate -TRANSEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/transex3 -ULFEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/ulfex -XMLEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xmlex -XRMEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xrmex -CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cfgex -AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/autodoc -LOCALIZE_SL*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/localize_sl -GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/gsicheck +TRANSEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/transex3 +ULFEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfex +XMLEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xmlex +XRMEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xrmex +CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cfgex +AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc +LOCALIZE_SL*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/localize_sl +GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gsicheck .IF "$(SYSTEM_LIBXSLT)"!="YES" -XSLTPROC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xsltproc +XSLTPROC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xsltproc .ELSE # "$(SYSTEM_LIBXSLT)"!="YES" XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc .ENDIF # "$(SYSTEM_LIBXSLT)"!="YES" -ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/ulfconv +ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv -MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/makedepend +MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/makedepend SCP_CHECK_TOOL:=checkscp$E -# Not 4nt means $(GUI)==UNX or $(GUI)==WNT with tcsh -.IF "$(USE_SHELL)"!="4nt" # iz32110: Calling a cygwin application from a non-cygwin shell requires # backslashes to be escaped by another backslash: EES .. extra escape slash EES:= @@ -89,40 +87,12 @@ CHECKZIPRESULT:=|| ret=$$?; if [[ "$$ret" != "12" && "$$ret" != "1" ]] ; then ex CHECKZIPRESULT:=|| if ("$$status" != "12" && "$$status" != "1") exit $$status && echo "Nothing to update for zip" .ENDIF -.ELSE # "$(USE_SHELL)"!="4nt" -# (\\ at line end is \) -EES:=\\ - -EMQ:= -USQ:= - -NULLDEV:=nul - -# iz29609 helpmacro to check if file exists 4nt style -IFEXIST:=+if exist -IFNOTEXIST:=+if not exist -THEN:= -FI:= -PIPEERROR=|& - -# iz31658 -CHECKZIPRESULT:=^ iff errorlevel == 12 .and. errorlevel == 12 then ( echo Nothing to update for zip ^ set somedummyvar=%somedummyvar) - -# try the same for 4nt "copy /u" -CHECKCOPYURESULT:=^ iff errorlevel == 2 then ( echo Nothing to update for copy ^ set somedummyvar=%somedummyvar) - -# tell makedepend to write windows native format -#MKDEPFLAGS=-n - -.ENDIF # "$(USE_SHELL)"!="4nt" - # Platform specific .IF "$(GUI)"=="WNT" AWK*=awk SORT*=sort SED*=sed GNUPATCH*=patch -.IF "$(USE_SHELL)"!="4nt" # change drive and directory CDD=cd # expect cygwin tools to exist @@ -143,33 +113,6 @@ PERL*:=perl RENAME*=mv TOUCH*=touch TYPE*=cat -.ELSE # "$(USE_SHELL)"!="4nt" -CDD=+cdd -COPY*=+copy -COPYRECURSE=/s -COPYUPDATE=/u -DELAY*=+delay -ECHON*=+echos -ECHONL=+echo. -FIND*=$(BUILD_TOOLS)$/find.exe -.IF "$(use_cygcp)"!="" -GNUCOPY=$(BUILD_TOOLS)$/gnucp.exe -.ENDIF # "$(use_cygcp)"!="" -GNUCOPY*=$(BUILD_TOOLS)$/cp.exe -GNUMAKE*=$(BUILD_TOOLS)$/gnumake.exe -GREP*=$(BUILD_TOOLS)$/grep.exe -LS*=$(BUILD_TOOLS)$/ls.exe -MKDIRHIER=+mkdir /sn -#wraper for solenv\bin\mkdir.pl to fix mkdir /p problem -PERL*:=+call perl5.btm -.EXPORT : PERL -RENAME*=+ren -RMDIR:=$(PERL) $(SOLARENV)$/bin$/rmdir.pl -TOUCH*=$(PERL) $(SOLARENV)$/bin$/touch.pl -TYPE*=+type -XARGS*=tr -d "\015" | xargs -4nt_force_shell:=+ -.ENDIF "$(USE_SHELL)"!="4nt" DUMPBIN*=dumpbin .ELIF "$(GUI)"=="UNX" # "$(GUI)"=="WNT" @@ -189,7 +132,7 @@ COPYRECURSE=-r AWK*=nawk GNUCOPY*=gnucp GNUPATCH*=gnupatch -GNUTAR*=gtar +GNUTAR*=/usr/sfw/bin/gtar DEREFERENCE= .ELSE # "$(OS)"=="SOLARIS" AWK*=awk @@ -235,6 +178,7 @@ FIND=find LS=ls DUMPBIN=echo 4nt_force_shell:=+ + .ENDIF # "$(GUI)"=="UNX" # (Global) Set if not set before @@ -247,10 +191,10 @@ GNUTAR*:=tar TAR*:=tar RM+=$(RMFLAGS) -ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/adjustvisibility -CONVERT*:=$(PERL) $(SOLARENV)$/bin$/leconvert.pl -EXECTEST := $(PERL) -w $(SOLARENV)$/bin$/exectest.pl -GCCINSTLIB:=$(PERL) -w $(SOLARENV)$/bin$/gccinstlib.pl +ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility +CONVERT*:=$(PERL) $(SOLARENV)/bin/leconvert.pl +EXECTEST := $(PERL) -w $(SOLARENV)/bin/exectest.pl +GCCINSTLIB:=$(PERL) -w $(SOLARENV)/bin/gccinstlib.pl # The dmake $(PWD) variable and the tcsh pwd command both apparantly produce # paths with symlinks resolved, while the bash pwd command by default produces diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 414b646c01bb..ff5349f62496 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -232,9 +232,9 @@ DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR) # enable building/linking KDE-dependent code in both OOo and SO build environment .IF "$(ENABLE_KDE)" != "" .IF "$(KDE_ROOT)"!="" -KDE_CFLAGS:=-I$(KDE_ROOT)$/include -DQT_CLEAN_NAMESPACE +KDE_CFLAGS:=-I$(KDE_ROOT)/include -DQT_CLEAN_NAMESPACE KDE_LIBS:=-lkdeui -lkdecore -lqt-mt -SOLARLIB+=-L$(KDE_ROOT)$/lib +SOLARLIB+=-L$(KDE_ROOT)/lib .ENDIF # "$(KDE_ROOT)"!="" .ENDIF # "$(ENABLE_KDE)" != "" diff --git a/solenv/inc/unxbsdi.mk b/solenv/inc/unxbsdi.mk index 4c56c9046ee3..44942a34f11d 100644 --- a/solenv/inc/unxbsdi.mk +++ b/solenv/inc/unxbsdi.mk @@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk index c2ea1cf349c4..dd579f0caa9e 100644 --- a/solenv/inc/unxbsdi2.mk +++ b/solenv/inc/unxbsdi2.mk @@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk index dc472b70ebaa..698764f2801e 100644 --- a/solenv/inc/unxbsds.mk +++ b/solenv/inc/unxbsds.mk @@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DOSL_USE_SYS_V_SEMAPHORE diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk index dd62c11da826..dbf23846b3e8 100644 --- a/solenv/inc/unxfbsd.mk +++ b/solenv/inc/unxfbsd.mk @@ -47,7 +47,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 @@ -72,7 +72,7 @@ CXX*=g++ # name of C Compiler CC*=gcc .IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include +CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include CXX+:=$(CFLAGS_SYSBASE) CC+:=$(CFLAGS_SYSBASE) .ENDIF # "$(SYSBASE)"!="" @@ -176,7 +176,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk index 9598ad9188cc..a777c2a1bd67 100644 --- a/solenv/inc/unxlnga.mk +++ b/solenv/inc/unxlnga.mk @@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DIA64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 @@ -67,7 +67,7 @@ CXX*=g++ # name of C Compiler CC*=gcc .IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include +CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include CXX+:=$(CFLAGS_SYSBASE) CC+:=$(CFLAGS_SYSBASE) .ENDIF # "$(SYSBASE)"!="" @@ -190,7 +190,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxlngi4.mk b/solenv/inc/unxlngi4.mk index 3036c224c5aa..6b192b84fb74 100644 --- a/solenv/inc/unxlngi4.mk +++ b/solenv/inc/unxlngi4.mk @@ -37,7 +37,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) @@ -167,7 +167,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxlngi6.mk b/solenv/inc/unxlngi6.mk index 3cc514c8b9a0..be55ef608a33 100644 --- a/solenv/inc/unxlngi6.mk +++ b/solenv/inc/unxlngi6.mk @@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) @@ -67,7 +67,7 @@ CXX*=g++ # name of C Compiler CC*=gcc .IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include +CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include CXX+:=$(CFLAGS_SYSBASE) CC+:=$(CFLAGS_SYSBASE) .ENDIF # "$(SYSBASE)"!="" @@ -96,8 +96,8 @@ CFLAGSCXX += -fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS -CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch -CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch +CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch +CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch # Compiler flags for compiling static object in multi threaded environment with graphical user interface CFLAGSOBJGUIMT= @@ -188,7 +188,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= @@ -207,12 +207,14 @@ LINKFLAGS += -Wl,-zdynsort .ENDIF # libraries for linking applications -STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed +STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed # libraries for linking shared libraries -STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed +STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed +X11LINK_DYNAMIC = -lX11 -lXext + LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive .IF "$(USE_STLP_DEBUG)" != "" diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk index 7f969040a170..91c0a24c2304 100644 --- a/solenv/inc/unxlngm68k.mk +++ b/solenv/inc/unxlngm68k.mk @@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DM68K -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) @@ -67,7 +67,7 @@ CXX*=g++ # name of C Compiler CC*=gcc .IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include +CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include CXX+:=$(CFLAGS_SYSBASE) CC+:=$(CFLAGS_SYSBASE) .ENDIF # "$(SYSBASE)"!="" @@ -169,7 +169,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk index 668579f2ee87..258d0677267c 100644 --- a/solenv/inc/unxlngmips.mk +++ b/solenv/inc/unxlngmips.mk @@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DMIPS -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 @@ -67,7 +67,7 @@ CXX*=g++ # name of C Compiler CC*=gcc .IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include +CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include CXX+:=$(CFLAGS_SYSBASE) CC+:=$(CFLAGS_SYSBASE) .ENDIF # "$(SYSBASE)"!="" @@ -201,7 +201,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxlngp.mk b/solenv/inc/unxlngp.mk index 1b71d9f0eb4e..9ab0dbab9944 100644 --- a/solenv/inc/unxlngp.mk +++ b/solenv/inc/unxlngp.mk @@ -64,7 +64,7 @@ CFLAGSCXX= -pipe -fguiding-decls -fno-rtti -fno-exceptions $(ARCH_FLAGS) CFLAGSCXX += -fexceptions .ENDIF PICSWITCH:=-fPIC -#STDOBJVCL=$(L)$/salmain.o +#STDOBJVCL=$(L)/salmain.o CFLAGSOBJGUIMT= CFLAGSOBJCUIMT= CFLAGSSLOGUIMT=$(PICSWITCH) diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk index 068b6fe69c1c..b1ec2b7ae33a 100644 --- a/solenv/inc/unxlngppc.mk +++ b/solenv/inc/unxlngppc.mk @@ -39,7 +39,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DPOWERPC -DPPC diff --git a/solenv/inc/unxlngppc4.mk b/solenv/inc/unxlngppc4.mk index 369c0d6e838f..a9788c75aba5 100644 --- a/solenv/inc/unxlngppc4.mk +++ b/solenv/inc/unxlngppc4.mk @@ -37,7 +37,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DPOWERPC -DPPC @@ -168,7 +168,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk index 2054feefc1f1..0022f36f3027 100644 --- a/solenv/inc/unxlngr.mk +++ b/solenv/inc/unxlngr.mk @@ -40,7 +40,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DARM32 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) @@ -69,7 +69,7 @@ CXX*=g++ # name of C Compiler CC*=gcc .IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include +CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include CXX+:=$(CFLAGS_SYSBASE) CC+:=$(CFLAGS_SYSBASE) .ENDIF # "$(SYSBASE)"!="" @@ -170,7 +170,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk index ce9bb52ba3dd..96c64b20632b 100644 --- a/solenv/inc/unxlngs.mk +++ b/solenv/inc/unxlngs.mk @@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DSPARC -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) @@ -170,7 +170,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxlngs3904.mk b/solenv/inc/unxlngs3904.mk index ab919c89118b..d23b23c4a546 100644 --- a/solenv/inc/unxlngs3904.mk +++ b/solenv/inc/unxlngs3904.mk @@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DS390 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) @@ -67,7 +67,7 @@ CXX*=g++ # name of C Compiler CC*=gcc .IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include +CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include CXX+:=$(CFLAGS_SYSBASE) CC+:=$(CFLAGS_SYSBASE) .ENDIF # "$(SYSBASE)"!="" @@ -168,7 +168,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxlngx6.mk b/solenv/inc/unxlngx6.mk index 073293c33652..c49e1c4526c5 100644 --- a/solenv/inc/unxlngx6.mk +++ b/solenv/inc/unxlngx6.mk @@ -38,7 +38,7 @@ JAVAFLAGSDEBUG=-g # filter for supressing verbose messages from linker #not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" +#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86_64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) @@ -67,7 +67,7 @@ CXX*=g++ # name of C Compiler CC*=gcc .IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include +CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include CXX+:=$(CFLAGS_SYSBASE) CC+:=$(CFLAGS_SYSBASE) .ENDIF # "$(SYSBASE)"!="" @@ -192,19 +192,21 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ # default objectfilenames to link -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= STDSLOCUI= # libraries for linking applications -STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed +STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed # libraries for linking shared libraries -STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed +STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed +X11LINK_DYNAMIC = -lX11 + LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive .IF "$(USE_STLP_DEBUG)" != "" diff --git a/solenv/inc/unxlnxi.mk b/solenv/inc/unxlnxi.mk index a8f6d0f6fb81..07b136fde663 100644 --- a/solenv/inc/unxlnxi.mk +++ b/solenv/inc/unxlnxi.mk @@ -62,7 +62,7 @@ CFLAGS=-c -I. -I/usr/solar/inc/pthread_provenzano -I$(INC) -I$(INCLOCAL) -I$(INC CFLAGSCC=-pipe -fguiding-decls $(ARCH_FLAGS) CFLAGSCXX=-pipe -fguiding-decls $(ARCH_FLAGS) PICSWITCH:=-fpic -#STDOBJVCL=$(L)$/salmain.o +#STDOBJVCL=$(L)/salmain.o CFLAGSOBJGUIMT= CFLAGSOBJCUIMT= CFLAGSSLOGUIMT=$(PICSWITCH) diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 2c23ad3190ef..6cb113e7918b 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -35,11 +35,6 @@ # PROCESSOR_DEFINES and DLLPOSTFIX are defined in the particular platform file -# DARWIN_VERSION holds the Darwin version in the format: 000000. For example, -# if the Darwin version is 1.3.7, DARWIN_VERSION will be set to 010307. -# Not used now, comment it out. Remove it after some time. -# DARWIN_VERSION=$(shell -/bin/sh -c "uname -r | sed 's/\./ /g' | xargs printf %2.2i%2.2i%2.2i") - ASM= AFLAGS= LINKOUTPUT_FILTER= @@ -52,8 +47,15 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI CDEFS+=-DX_LOCALE .ENDIF .IF "$(GUIBASE)"=="aqua" -# TODO: use MACOSX_DEPLOYMENT_TARGET instead of MAC_OS_X_VERSION_MIN_REQUIRED? -CDEFS+=-DQUARTZ -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 +# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build, +# build can assume functions/libraries of that version to be available +# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk +# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro) +# http://developer.apple.com/technotes/tn2002/tn2064.html +MACOSX_DEPLOYMENT_TARGET=10.4 +.EXPORT: MACOSX_DEPLOYMENT_TARGET +CDEFS+=-DQUARTZ +EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk .ENDIF # Name of library where static data members are initialized @@ -104,7 +106,10 @@ CFLAGSCC=-pipe -fsigned-char -malign-natural $(ARCH_FLAGS) # Normal Objective C compilation flags #OBJCFLAGS=-no-precomp OBJCFLAGS=-fobjc-exceptions -OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions +# -x options generally ignored by ccache, tell it that it can cache +# the result nevertheless +CCACHE_SKIP:=$(eq,$(USE_CCACHE),YES --ccache-skip $(NULL)) +OBJCXXFLAGS:=$(CCACHE_SKIP) -x $(CCACHE_SKIP) objective-c++ -fobjc-exceptions # Comp Flags for files that need exceptions enabled (C and C++) CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs @@ -133,8 +138,8 @@ CFLAGSOUTOBJ=-o # Flags to enable precompiled headers CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS -CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch -CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch +CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch +CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch # --------------------------------- # Optimization flags @@ -172,7 +177,7 @@ LIBSTLPORT=-lstlportstlg LIBSTLPORTST=$(STATIC) -lstlportstlg .ELSE LIBSTLPORT=-lstlport_gcc_stldebug -LIBSTLPORTST=$(SOLARVERSION)$/$(INPATH)$/lib$/libstlport_gcc_stldebug.a +LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc_stldebug.a .ENDIF .ELSE # "$(USE_STLP_DEBUG" != "" .IF "$(STLPORT_VER)" >= "500" @@ -180,7 +185,7 @@ LIBSTLPORT=-lstlport LIBSTLPORTST=$(STATIC) -lstlport .ELSE LIBSTLPORT=-lstlport_gcc -LIBSTLPORTST=$(SOLARVERSION)$/$(INPATH)$/lib$/libstlport_gcc.a +LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc.a .ENDIF .ENDIF # "$(USE_STLP_DEBUG" != "" @@ -195,11 +200,13 @@ LINK*=$(CXX) LINKC*=$(CC) LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress +# assure backwards-compatibility +EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk # Very long install_names are needed so that install_name_tool -change later on # does not complain that "larger updated load commands do not fit:" -LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB$/$(@:f)' +LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)' LINKFLAGSRUNPATH_UREBIN= -LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO$/$(@:f)' +LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO/$(@:f)' LINKFLAGSRUNPATH_SDK= LINKFLAGSRUNPATH_BRAND= LINKFLAGSRUNPATH_OXT= @@ -211,7 +218,7 @@ LINKFLAGS=$(LINKFLAGSDEFS) LINKFLAGS+=-lobjc # Sometimes we still use files that would be in a GUIBASE="unx" specific directory # because they really aren't GUIBASE specific, so we've got to account for that here. - INCGUI+= -I$(PRJ)$/unx/inc + INCGUI+= -I$(PRJ)/unx/inc .ENDIF #special settings form environment @@ -249,7 +256,7 @@ SONAME_SWITCH=-Wl,-h STDLIBCPP=-lstdc++ -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk index e38cb79b7341..c4559e44c4f2 100644 --- a/solenv/inc/unxsogi.mk +++ b/solenv/inc/unxsogi.mk @@ -102,7 +102,7 @@ CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE STDLIBCPP=-lstdc++ -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk index d8101a006a5d..6b052c33f50b 100644 --- a/solenv/inc/unxsogs.mk +++ b/solenv/inc/unxsogs.mk @@ -101,7 +101,7 @@ CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE STDLIBCPP=-lstdc++ -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk index 979a2c82671f..afcea59a9971 100644 --- a/solenv/inc/unxsoli4.mk +++ b/solenv/inc/unxsoli4.mk @@ -114,7 +114,7 @@ CFLAGSWERRCXX=-xwe MODULES_WITH_WARNINGS := \ soldep -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o THREADLIB= .IF "$(PURIFY)"!="" @@ -127,7 +127,7 @@ LINKC=$(CC) # link against set of baseline libraries .IF "$(SYSBASE)"!="" C_RESTRICTIONFLAGS*=-xc99=none -#LD_OPTIONS+:=-L$(SYSBASE)$/usr$/lib +#LD_OPTIONS+:=-L$(SYSBASE)/usr/lib CDEFS+=-DSYSBASE="$(SYSBASE)" CFLAGSCC+=$(C_RESTRICTIONFLAGS) #.EXPORT : LD_OPTIONS @@ -197,8 +197,9 @@ STDSHLGUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc # libdl.so - no really an GUI library but required in this context -STDLIBGUIMT+=-lX11 -ldl -STDSHLGUIMT+=-lX11 -ldl +STDLIBGUIMT+=-ldl +STDSHLGUIMT+=-ldl +X11LINK_DYNAMIC = -lX11 # @@@ interposer needed for -Bdirect @@@ # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk index c9c81dad2fb4..a28b097e13b4 100644 --- a/solenv/inc/unxsols4.mk +++ b/solenv/inc/unxsols4.mk @@ -120,7 +120,7 @@ CFLAGSWERRCXX=-xwe MODULES_WITH_WARNINGS := \ soldep -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o THREADLIB= .IF "$(PURIFY)"!="" @@ -133,7 +133,7 @@ LINKC=$(CC) # link against set of baseline libraries .IF "$(SYSBASE)"!="" C_RESTRICTIONFLAGS*=-xc99=none -#LD_OPTIONS+:=-L$(SYSBASE)$/usr$/lib +#LD_OPTIONS+:=-L$(SYSBASE)/usr/lib CDEFS+=-DSYSBASE="$(SYSBASE)" CFLAGSCC+=$(C_RESTRICTIONFLAGS) #.EXPORT : LD_OPTIONS @@ -203,8 +203,9 @@ STDSHLGUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc # libdl.so - no really an GUI library but required in this context -STDLIBGUIMT+=-lX11 -ldl -STDSHLGUIMT+=-lX11 -ldl +STDLIBGUIMT+=-ldl +STDSHLGUIMT+=-ldl +X11LINK_DYNAMIC = -lX11 # @@@ interposer needed for -Bdirect @@@ # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk index 8ff063f46a97..af4b7d41c393 100644 --- a/solenv/inc/unxsolu4.mk +++ b/solenv/inc/unxsolu4.mk @@ -118,7 +118,7 @@ CFLAGSWERRCXX=-xwe MODULES_WITH_WARNINGS := \ soldep -STDOBJVCL=$(L)$/salmain.o +STDOBJVCL=$(L)/salmain.o THREADLIB= LINK=$(CXX) @@ -127,7 +127,7 @@ LINKC=$(CC) # link against set of baseline libraries .IF "$(SYSBASE)"!="" C_RESTRICTIONFLAGS*=-xc99=none -LD_OPTIONS+=-L$(SYSBASE)$/usr$/lib +LD_OPTIONS+=-L$(SYSBASE)/usr/lib CDEFS+=-DSYSBASE="$(SYSBASE)" CFLAGSCC+=$(C_RESTRICTIONFLAGS) .EXPORT : LD_OPTIONS diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index e4a7fb8f5427..b56cfc7c2f8a 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -48,14 +48,10 @@ .ENDIF # --- changes for W32-tcsh - should move into settings.mk --- -.IF "$(USE_SHELL)"!="4nt" JAVAC=javac JAVA=java JAVAI!:=java PATH_SEPERATOR*=: -.ELSE # "$(USE_SHELL)"!="4nt" -PATH_SEPERATOR*=; -.ENDIF # "$(USE_SHELL)"!="4nt" # --- general WNT settings --- diff --git a/solenv/inc/wntgcci6.mk b/solenv/inc/wntgcci6.mk index 9186ea9cc826..a46c9a0a3916 100644 --- a/solenv/inc/wntgcci6.mk +++ b/solenv/inc/wntgcci6.mk @@ -59,8 +59,8 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions PICSWITCH:= CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS -CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch -CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch +CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch +CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch CFLAGSOBJGUIST= CFLAGSOBJCUIST= @@ -116,16 +116,16 @@ LINKC*=$(CC) CYGLIB=$(LIB:s/;/ -L/) LINKFLAGS=-nostdlib -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc -L$(CYGLIB) .IF "$(USE_MINGW)"=="cygwin" -MINGWLIBDIR=$(COMPATH)$/lib$/mingw +MINGWLIBDIR=$(COMPATH)/lib/mingw .ELSE -MINGWLIBDIR=$(COMPATH)$/lib +MINGWLIBDIR=$(COMPATH)/lib .ENDIF -MINGWSSTDOBJ=$(MINGW_CLIB_DIR)$/crtbegin.o -MINGWSSTDENDOBJ=$(MINGW_CLIB_DIR)$/crtend.o -LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)$/crt2.o -LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)$/dllcrt2.o -LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)$/crt2.o -LINKFLAGSSHLCUI=--warn-once -mconsole -shared $(MINGWLIBDIR)$/dllcrt2.o +MINGWSSTDOBJ=$(MINGW_CLIB_DIR)/crtbegin.o +MINGWSSTDENDOBJ=$(MINGW_CLIB_DIR)/crtend.o +LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)/crt2.o +LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)/dllcrt2.o +LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)/crt2.o +LINKFLAGSSHLCUI=--warn-once -mconsole -shared $(MINGWLIBDIR)/dllcrt2.o LINKFLAGSTACK= LINKFLAGSPROF= LINKFLAGSDEBUG=-g @@ -148,7 +148,7 @@ MINGW_LIBGCC=-lgcc_eh -lgcc MINGW_LIBGCC=-lgcc .ENDIF .ENDIF -STDOBJVCL=$(L)$/salmain.obj +STDOBJVCL=$(L)/salmain.obj STDOBJGUI= STDSLOGUI= STDOBJCUI= @@ -194,7 +194,7 @@ SHELL32LIB=-lshell32 GDI32LIB=-lgdi32 OLE32LIB=-lole32 OLEAUT32LIB=-loleaut32 -UUIDLIB=$(PSDK_HOME)$/lib$/uuid.lib +UUIDLIB=$(PSDK_HOME)/lib/uuid.lib WINSPOOLLIB=-lwinspool IMM32LIB=-limm32 VERSIONLIB=-lversion @@ -207,14 +207,14 @@ USER32LIB=-luser32 LIBCMT=-lmsvcrt COMDLG32LIB=-lcomdlg32 COMCTL32LIB=-lcomctl32 -CRYPT32LIB=$(PSDK_HOME)$/lib$/crypt32.lib -GDIPLUSLIB=$(PSDK_HOME)$/lib$/gdiplus.lib -DBGHELPLIB=$(PSDK_HOME)$/lib$/dbghelp.lib -MSILIB=$(PSDK_HOME)$/lib$/msi.lib +CRYPT32LIB=$(PSDK_HOME)/lib/crypt32.lib +GDIPLUSLIB=$(PSDK_HOME)/lib/gdiplus.lib +DBGHELPLIB=$(PSDK_HOME)/lib/dbghelp.lib +MSILIB=$(PSDK_HOME)/lib/msi.lib DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib -SHLWAPILIB=$(PSDK_HOME)$/lib$/shlwapi.lib -URLMONLIB=$(PSDK_HOME)$/lib$/urlmon.lib -UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib +SHLWAPILIB=$(PSDK_HOME)/lib/shlwapi.lib +URLMONLIB=$(PSDK_HOME)/lib/urlmon.lib +UNICOWSLIB=$(PSDK_HOME)/lib/unicows.lib WININETLIB=-lwininet OLDNAMESLIB=-lmoldname -MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib +MSIMG32LIB=$(PSDK_HOME)/lib/msimg32.lib diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk index b3a96cc4acae..09ec567fbd62 100644 --- a/solenv/inc/wntmsci10.mk +++ b/solenv/inc/wntmsci10.mk @@ -89,7 +89,7 @@ CFLAGS+= -Ob1 .ENDIF # flags to enable build with symbols; required for crashdump feature -#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)$/_ooo_st_$(TARGET).PDB +#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB # full debug for RE builds only due to size concerns .IF "$(UPDATER)"!="" CFLAGSENABLESYMBOLS=-Z7 -Yd @@ -120,9 +120,9 @@ RSCDEFS+=-DFULL_DESK CFLAGSEXCEPTIONS=-GX CFLAGS_NO_EXCEPTIONS= -CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)$/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS -CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS -CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS +CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS +CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS +CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS .IF "$(CALL_CDECL)"=="TRUE" CFLAGSCALL=-Gd .ELSE # "$(CALL_CDECL)"=="TRUE" @@ -146,7 +146,7 @@ CDEFSSLOMT+=-DWIN32 -D_MT CDEFSOBJMT+=-DWIN32 -D_MT CDEFSOBJMT+=-DWIN32 -D_MT .ENDIF -CFLAGSPROF=-Gh -Fd$(MISC)$/$(@:b).pdb +CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb CFLAGSDEBUG=-Zi -Fd$(MISC)\_ooo_st_$(TARGET).PDB CFLAGSDBGUTIL= .IF "$(VC_STANDARD)"=="" @@ -272,7 +272,7 @@ LIBCMT=libcmt.lib .ENDIF # "$(USE_STLP_DEBUG)" != "" .ENDIF # "$(DYNAMIC_CRT)"!="" -STDOBJVCL=$(L)$/salmain.obj +STDOBJVCL=$(L)/salmain.obj STDOBJGUI= STDSLOGUI= STDOBJCUI= @@ -292,8 +292,8 @@ LIBSTLPORT=stlport_vc71.lib LIBSTLPORTST=stlport_vc71_static.lib .ENDIF -ATL_INCLUDE*=$(COMPATH)$/atlmfc$/include -ATL_LIB*=$(COMPATH)$/atlmfc$/lib +ATL_INCLUDE*=$(COMPATH)/atlmfc/include +ATL_LIB*=$(COMPATH)/atlmfc/lib LIBMGR=lib $(NOLOGO) IMPLIB=lib diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk index 6eac576a91b3..35fd293d6df6 100644 --- a/solenv/inc/wntmsci11.mk +++ b/solenv/inc/wntmsci11.mk @@ -92,7 +92,7 @@ CFLAGS+= -Ob1 .ENDIF # flags to enable build with symbols; required for crashdump feature -#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)$/_ooo_st_$(TARGET).PDB +#CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB CFLAGSENABLESYMBOLS=-Z7 -Yd .IF "$(bndchk)" != "" @@ -115,6 +115,9 @@ RSCDEFS+=-DFULL_DESK CFLAGSEXCEPTIONS=-EHa CFLAGS_NO_EXCEPTIONS= +# enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods +CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL + # with the current debug switches PCH won't work # anyway. so keep the existing .pch intact and don't # touch it @@ -122,9 +125,9 @@ CFLAGS_NO_EXCEPTIONS= ENABLE_PCH:= .ENDIF "$(debug)"!="" -CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)$/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS -CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS -CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)$/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS +CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS +CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS +CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS .IF "$(CALL_CDECL)"=="TRUE" CFLAGSCALL=-Gd .ELSE # "$(CALL_CDECL)"=="TRUE" @@ -149,8 +152,8 @@ CDEFSOBJMT+=-DWIN32 -D_MT CDEFSOBJMT+=-DWIN32 -D_MT .ENDIF # "$(DYNAMIC_CRT)"!="" -CFLAGSPROF=-Gh -Fd$(MISC)$/$(@:b).pdb -CFLAGSDEBUG=-Zi -Fd$(MISC)$/$(@:b).pdb +CFLAGSPROF=-Gh -Fd$(MISC)/$(@:b).pdb +CFLAGSDEBUG=-Zi -Fd$(MISC)/$(@:b).pdb CFLAGSDBGUTIL= .IF "$(VC_STANDARD)"=="" CFLAGSOPT=-Oxs -Oy- @@ -186,6 +189,8 @@ CFLAGSOUTOBJ=-Fo # - "warning C4820: padding added after member". # - "warning C4503: 'identifier' : decorated name length exceeded, name was truncated" # (http://msdn2.microsoft.com/en-us/library/074af4b6.aspx) +# - "warning C4180: qualifier applied to function type has no meaning; ignored" +# (frequently seen with a recent boost) # For C, certain warnings from system headers (stdlib.h etc.) have to be # disabled globally (for C++, this is not necessary, as the system headers are # wrapped by STLport): @@ -196,7 +201,8 @@ CFLAGSOUTOBJ=-Fo CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4250 -wd4251 -wd4275 \ -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4611 -wd4625 -wd4626 \ -wd4640 -wd4675 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \ - -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 + -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \ + -wd4180 CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255 CFLAGSWALLCC=$(CFLAGSWARNCC) CFLAGSWALLCXX=$(CFLAGSWARNCXX) @@ -206,7 +212,6 @@ CFLAGSWERRCC=-WX # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): MODULES_WITH_WARNINGS := \ - fpicker \ soldep CDEFS+=-DSTLPORT_VERSION=400 -D_MT @@ -280,7 +285,7 @@ LIBCMT=libcmt.lib .ENDIF # "$(USE_STLP_DEBUG)" != "" .ENDIF # "$(DYNAMIC_CRT)"!="" -STDOBJVCL=$(L)$/salmain.obj +STDOBJVCL=$(L)/salmain.obj STDOBJGUI= STDSLOGUI= STDOBJCUI= @@ -300,15 +305,15 @@ LIBSTLPORTST=stlport_vc71_static.lib .ENDIF .IF "$(PROF_EDITION)" == "" -ATL_INCLUDE*=$(COMPATH)$/PlatformSDK$/include$/atl -ATL_LIB*=$(COMPATH)$/atlmfc$/lib -MFC_INCLUDE*=$(COMPATH)$/PlatformSDK$/include$/mfc -MFC_LIB*=$(COMPATH)$/atlmfc$/lib +ATL_INCLUDE*=$(COMPATH)/PlatformSDK/include/atl +ATL_LIB*=$(COMPATH)/atlmfc/lib +MFC_INCLUDE*=$(COMPATH)/PlatformSDK/include/mfc +MFC_LIB*=$(COMPATH)/atlmfc/lib .ELSE -ATL_INCLUDE*=$(COMPATH)$/atlmfc$/include -ATL_LIB*=$(COMPATH)$/atlmfc$/lib -MFC_INCLUDE*=$(COMPATH)$/atlmfc$/include -MFC_LIB*=$(COMPATH)$/atlmfc$/lib +ATL_INCLUDE*=$(COMPATH)/atlmfc/include +ATL_LIB*=$(COMPATH)/atlmfc/lib +MFC_INCLUDE*=$(COMPATH)/atlmfc/include +MFC_LIB*=$(COMPATH)/atlmfc/lib .ENDIF LIBMGR=lib $(NOLOGO) diff --git a/soltools/cpp/_getopt.c b/soltools/cpp/_getopt.c index 5217c21ce0f0..589638936efb 100644 --- a/soltools/cpp/_getopt.c +++ b/soltools/cpp/_getopt.c @@ -21,12 +21,16 @@ int if (optind >= argc || argv[optind][0] != '-' || argv[optind][1] == '\0') return -1; - else - if (strcmp(argv[optind], "--") == 0) + else if (strcmp(argv[optind], "--") == 0) { optind++; return -1; } + else if (strcmp(argv[optind], "-isysroot") == 0) + { + // skip Mac OS X SDK selection flags + optind++; optind++; + } } optopt = c = argv[optind][sp]; if (c == ':' || (cp = strchr(opts, c)) == 0) |