ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fix the handling of relative include/library paths 

- In interactive mode, print "./" for the top level directory rather
  than an empty string
- We don't need to force a space before assignments
- Align TOPSRCDIR & co like all the other assignements
- Compile Dlls first (dependencies would do it more or less anyway)
- Wording change in the usage
This commit is contained in:
Francois Gouget 2000-11-30 20:34:39 +00:00 committed by Alexandre Julliard
parent 5ce2329a95
commit fb5b590ed1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/winemaker
View File

@ -610,7 +610,7 @@ sub source_scan_directory
# Ask confirmation to the user if he wishes so # Ask confirmation to the user if he wishes so
if ($opt_is_interactive == $OPT_ASK_YES) { if ($opt_is_interactive == $OPT_ASK_YES) {
my $target_list=join " ",keys %targets; my $target_list=join " ",keys %targets;
print "\n*** In $path\n"; print "\n*** In ",($path?$path:"./"),"\n";
print "* winemaker found the following list of (potential) targets\n"; print "* winemaker found the following list of (potential) targets\n";
print "* $target_list\n"; print "* $target_list\n";
print "* Type enter to use it as is, your own comma-separated list of\n"; print "* Type enter to use it as is, your own comma-separated list of\n";
@ -1481,7 +1481,7 @@ sub generate_list
my $first=$name; my $first=$name;
if ($name) { if ($name) {
printf FILEO "%-21s =",$name; printf FILEO "%-22s=",$name;
} }
if (defined $list) { if (defined $list) {
foreach $item (@$list) { foreach $item (@$list) {
@ -1537,10 +1537,10 @@ sub generate_project_files
print FILEO "\n\n"; print FILEO "\n\n";
print FILEO "### Generic autoconf variables\n\n"; print FILEO "### Generic autoconf variables\n\n";
print FILEO "TOPSRCDIR = \@top_srcdir\@\n"; generate_list("TOPSRCDIR",1,[ "\@top_srcdir\@" ]);
print FILEO "TOPOBJDIR = .\n"; generate_list("TOPOBJDIR",1,[ "." ]);
print FILEO "SRCDIR = \@srcdir\@\n"; generate_list("SRCDIR",1,[ "\@srcdir\@" ]);
print FILEO "VPATH = \@srcdir\@\n"; generate_list("VPATH",1,[ "\@srcdir\@" ]);
print FILEO "\n"; print FILEO "\n";
if (@$project[$P_PATH] eq "") { if (@$project[$P_PATH] eq "") {
# This is the main project. It is also responsible for recursively # This is the main project. It is also responsible for recursively
@ -1588,7 +1588,7 @@ sub generate_project_files
if (is_absolute($')) { if (is_absolute($')) {
return "$_[0]"; return "$_[0]";
} }
return "\$(TOPSRCDIR)/$_[0]"; return "-I\$(TOPSRCDIR)/$'";
}); });
generate_list("LIBRARY_PATH",$no_extra,@$project_settings[$T_LIBRARY_PATH],sub generate_list("LIBRARY_PATH",$no_extra,@$project_settings[$T_LIBRARY_PATH],sub
{ {
@ -1602,7 +1602,7 @@ sub generate_project_files
if (is_absolute($')) { if (is_absolute($')) {
return "$_[0]"; return "$_[0]";
} }
return "\$(TOPSRCDIR)/$_[0]"; return "-L\$(TOPSRCDIR)/$'";
}); });
generate_list("LIBRARIES",$no_extra,@$project_settings[$T_LIBRARIES],sub generate_list("LIBRARIES",$no_extra,@$project_settings[$T_LIBRARIES],sub
{ {
@ -1703,7 +1703,7 @@ sub generate_project_files
print FILEO "\$(SUBDIRS)"; print FILEO "\$(SUBDIRS)";
} }
if (@{@$project[$P_TARGETS]} > 0) { if (@{@$project[$P_TARGETS]} > 0) {
print FILEO "\$(EXES:%=%.so) \$(DLLS)"; print FILEO "\$(DLLS) \$(EXES:%=%.so)";
} }
print FILEO "\n\n"; print FILEO "\n\n";
print FILEO "\@MAKE_RULES\@\n"; print FILEO "\@MAKE_RULES\@\n";
@ -2018,7 +2018,7 @@ if (defined $usage) {
print STDERR " [--lower-include|--nolower-include]\n"; print STDERR " [--lower-include|--nolower-include]\n";
print STDERR " [--guiexe|--windows|--cuiexe|--console|--dll]\n"; print STDERR " [--guiexe|--windows|--cuiexe|--console|--dll]\n";
print STDERR " [--wrap|--nowrap] [--mfc|--nomfc]\n"; print STDERR " [--wrap|--nowrap] [--mfc|--nomfc]\n";
print STDERR " [-Dmacro[=defn]] [-Idir] [-Ldir] [-iimport] [-llibrary]\n"; print STDERR " [-Dmacro[=defn]] [-Idir] [-Ldir] [-idll] [-llibrary]\n";
print STDERR " [--interactive] [--single-target name]\n"; print STDERR " [--interactive] [--single-target name]\n";
print STDERR " [--generated-files|--nogenerated-files]\n"; print STDERR " [--generated-files|--nogenerated-files]\n";
exit (2); exit (2);