Fix various small issues with the makefiles and autoconf script
generated by Winemaker.
Changelog:
Francois Gouget <fgouget@codeweavers.com>
* tools/winemaker
Fix detection of 'ln -s'
Fix computation of TOPOBJDIR
Install exes and dlls in $(libdir)
-Wl,-rpath is not relevant for dlls
Notes:
* I can't remember if AC_PROG_LN_S requires autoconf 2.5x or not.
Anyway I'm about to send another patch that will move from configure.in
(2.13) to configure.ac (2.5x).
* The exes and dlls should be installed in dlldir but we don't have
any such thing yet. Will be for the next batch of patches...
--
Francois Gouget
fgouget@codeweavers.com
Index: tools/winemaker
===================================================================
RCS file: /home/wine/wine/tools/winemaker,v
retrieving revision 1.44
diff -u -r1.44 winemaker
--- tools/winemaker 6 Sep 2002 18:36:19 -0000 1.44
+++ tools/winemaker 9 Sep 2002 07:40:53 -0000
@@ -2316,6 +2241,7 @@
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
+AC_PROG_LN_S
dnl **** Check for some libraries ****
@@ -1738,7 +1697,11 @@
print FILEO "### Generic autoconf variables\n\n";
generate_list("TOPSRCDIR",1,[ "\@top_srcdir\@" ]);
- generate_list("TOPOBJDIR",1,[ "." ]);
+ my $dotdotpath=@$project[$P_PATH];
+ $dotdotpath =~ s%[^/]+%..%g;
+ $dotdotpath =~ s%/$%%;
+ $dotdotpath = "." if ($dotdotpath eq "");
+ generate_list("TOPOBJDIR",1,[ $dotdotpath ]);
generate_list("SRCDIR",1,[ "\@srcdir\@" ]);
generate_list("VPATH",1,[ "\@srcdir\@" ]);
print FILEO "\n";
@@ -1903,7 +1826,7 @@
print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) install) || exit 1; done\n";
}
if (@{@$project[$P_TARGETS]} > 0) {
- print FILEO "\t_list=\"\$(EXES:%=%.so)\"; for i in \$\$_list; do \$(INSTALL_PROGRAM) \$\$i \$(bindir); done\n";
+ print FILEO "\t_list=\"\$(EXES:%=%.so)\"; for i in \$\$_list; do \$(INSTALL_PROGRAM) \$\$i \$(libdir); done\n";
print FILEO "\t_list=\"\$(EXES)\"; for i in \$\$_list; do \$(INSTALL_SCRIPT) \$\$i \$(bindir); done\n";
print FILEO "\t_list=\"\$(DLLS)\"; for i in \$\$_list; do \$(INSTALL_PROGRAM) \$\$i \$(libdir); done\n";
}
@@ -1915,7 +1838,7 @@
print FILEO "\t_list=\"\$(SUBDIRS)\"; for i in \$\$_list; do (cd \$\$i; \$(MAKE) uninstall) || exit 1; done\n";
}
if (@{@$project[$P_TARGETS]} > 0) {
- print FILEO "\t_list=\"\$(EXES) \$(EXES:%=%.so)\"; for i in \$\$_list; do \$(RM) \$(bindir)/\$\$i;done\n";
+ print FILEO "\t_list=\"\$(EXES) \$(EXES:%=%.so)\"; for i in \$\$_list; do \$(RM) \$(libdir)/\$\$i;done\n";
print FILEO "\t_list=\"\$(EXES)\"; for i in \$\$_list; do \$(RM) \$(bindir)/\$\$i;done\n";
print FILEO "\t_list=\"\$(DLLS)\"; for i in \$\$_list; do \$(RM) \$(libdir)/\$\$i;done\n";
}
@@ -2383,8 +2320,8 @@
])
if test "$ac_cv_c_dll_linux" = "yes"
then
- LDSHARED="\$(CC) -shared -Wl,-rpath,\$(libdir)"
- LDXXSHARED="\$(CXX) -shared -Wl,-rpath,\$(libdir)"
+ LDSHARED="\$(CC) -shared"
+ LDXXSHARED="\$(CXX) -shared"
LDDLLFLAGS="-Wl,-Bsymbolic"
else
AC_CACHE_CHECK(whether we can build a UnixWare (Solaris) dll,
@@ -2995,6 +2999,7 @@
LDDLLFLAGS= @LDDLLFLAGS@
STRIP = strip
STRIPFLAGS= --strip-unneeded
+LN_S = @LN_S@
RM = rm -f
MV = mv
MKDIR = mkdir -p
@@ -3061,7 +3066,7 @@
# Rules for makefile
Makefile: Makefile.in $(TOPSRCDIR)/configure
- @echo Makefile is older than $?, please rerun $(TOPSRCDIR)/configure
+ @echo $@ is older than $?, please rerun $(TOPSRCDIR)/configure
@exit 1
# Rules for cleaning
