Makefile.in (top_builddir): Set to `.'.
2004-12-18 H.J. Lu <hongjiu.lu@intel.com> * Makefile.in (top_builddir): Set to `.'. (OUTPUT_OPTION): Removed. (LIBTOOL): New. (LTLIBOBJS): New. (EXTRA_LTOFILES): New. (FLAGS_TO_PASS): Add EXTRA_LTOFILES. (all): Remove stamp-picdir. (LTCOMPILE): New. (.c.lo): New rule. (REQUIRED_LTOFILES): New. (CONFIGURED_LTOFILES): New. ($(TARGETLIB)): Check .libs for PIC object files. Depend on $(REQUIRED_LTOFILES) $(EXTRA_LTOFILES) $(LTLIBOBJS). (stamp-picdir): Completely removed. (maint-missing): Pass $(REQUIRED_LTOFILES) $(CONFIGURED_LTOFILES) instead of (REQUIRED_OFILES) $(CONFIGURED_OFILES) (maint-buildall): Depend on $(REQUIRED_LTOFILES) $(CONFIGURED_LTOFILES). (mostlyclean): Also remove *.lo .libs. Run "make maint-deps". * aclocal.m4: Include ../libtool.m4. * config.table: Don't check --enable-shared. * configure.ac (AC_PROG_LIBTOOL): Add. (AC_PROG_CC_C_O): Removed. (OUTPUT_OPTION): Removed. (NO_MINUS_C_MINUS_O): Removed. (ltpexecute): New substitute. (LIBOBJS): Cleanup. * configure: Regenerated. * maint-tool: Updated for .lo/libtool. From-SVN: r92353
This commit is contained in:
H.J. Lu
H.J. Lu
parent
4fb735e4bf
commit
207db768e9
@ -1,3 +1,41 @@
|
||||
2004-12-18 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
* Makefile.in (top_builddir): Set to `.'.
|
||||
(OUTPUT_OPTION): Removed.
|
||||
(LIBTOOL): New.
|
||||
(LTLIBOBJS): New.
|
||||
(EXTRA_LTOFILES): New.
|
||||
(FLAGS_TO_PASS): Add EXTRA_LTOFILES.
|
||||
(all): Remove stamp-picdir.
|
||||
(LTCOMPILE): New.
|
||||
(.c.lo): New rule.
|
||||
(REQUIRED_LTOFILES): New.
|
||||
(CONFIGURED_LTOFILES): New.
|
||||
($(TARGETLIB)): Check .libs for PIC object files. Depend on
|
||||
$(REQUIRED_LTOFILES) $(EXTRA_LTOFILES) $(LTLIBOBJS).
|
||||
(stamp-picdir): Completely removed.
|
||||
(maint-missing): Pass $(REQUIRED_LTOFILES)
|
||||
$(CONFIGURED_LTOFILES) instead of (REQUIRED_OFILES)
|
||||
$(CONFIGURED_OFILES)
|
||||
(maint-buildall): Depend on $(REQUIRED_LTOFILES)
|
||||
$(CONFIGURED_LTOFILES).
|
||||
(mostlyclean): Also remove *.lo .libs.
|
||||
Run "make maint-deps".
|
||||
|
||||
* aclocal.m4: Include ../libtool.m4.
|
||||
|
||||
* config.table: Don't check --enable-shared.
|
||||
|
||||
* configure.ac (AC_PROG_LIBTOOL): Add.
|
||||
(AC_PROG_CC_C_O): Removed.
|
||||
(OUTPUT_OPTION): Removed.
|
||||
(NO_MINUS_C_MINUS_O): Removed.
|
||||
(ltpexecute): New substitute.
|
||||
(LIBOBJS): Cleanup.
|
||||
* configure: Regenerated.
|
||||
|
||||
* maint-tool: Updated for .lo/libtool.
|
||||
|
||||
2004-12-11 Ben Elliston <bje@au.ibm.com>
|
||||
|
||||
* configure.ac: Invoke AC_CHECK_SIZEOF for sizeof (int).
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
1
libiberty/aclocal.m4
vendored
1
libiberty/aclocal.m4
vendored
@ -1,6 +1,7 @@
|
||||
sinclude(../config/accross.m4)
|
||||
sinclude(../config/acx.m4)
|
||||
sinclude(../config/no-executables.m4)
|
||||
sinclude(../libtool.m4)
|
||||
|
||||
dnl See whether strncmp reads past the end of its string parameters.
|
||||
dnl On some versions of SunOS4 at least, strncmp reads a word at a time
|
||||
|
||||
@ -20,33 +20,6 @@ else
|
||||
frags=
|
||||
fi
|
||||
|
||||
# If they didn't specify --enable-shared, don't generate shared libs.
|
||||
case "${enable_shared}" in
|
||||
yes) shared=yes ;;
|
||||
no) shared=no ;;
|
||||
"") shared=no ;;
|
||||
*) shared=yes ;;
|
||||
esac
|
||||
if [ "${shared}" = "yes" ]; then
|
||||
frag=
|
||||
case "${host}" in
|
||||
*-*-cygwin*) ;;
|
||||
alpha*-*-linux*) frag=mh-elfalphapic ;;
|
||||
arm*-*-*) frag=mh-armpic ;;
|
||||
hppa*-*-*) frag=mh-papic ;;
|
||||
i[34567]86-*-* | x86_64-*-*)
|
||||
frag=mh-x86pic ;;
|
||||
powerpc*-*-aix*) ;;
|
||||
powerpc*-*-*) frag=mh-ppcpic ;;
|
||||
sparc*-*-*) frag=mh-sparcpic ;;
|
||||
s390*-*-*) frag=mh-s390pic ;;
|
||||
*) frag=mh-${host_cpu}pic ;;
|
||||
esac
|
||||
if [ -n "${frag}" ]; then
|
||||
frags="${frags} ${libiberty_topdir}/config/${frag}"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "# Warning: this fragment is automatically generated" > temp-frag
|
||||
|
||||
for frag in ${frags}; do
|
||||
|
||||
1224
libiberty/configure
vendored
1224
libiberty/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -113,21 +113,13 @@ GCC_NO_EXECUTABLES
|
||||
AC_PROG_CC
|
||||
AC_PROG_CPP_WERROR
|
||||
|
||||
AC_PROG_LIBTOOL
|
||||
|
||||
if test x$GCC = xyes; then
|
||||
ac_libiberty_warn_cflags='-W -Wall -Wtraditional -pedantic'
|
||||
fi
|
||||
AC_SUBST(ac_libiberty_warn_cflags)
|
||||
|
||||
AC_PROG_CC_C_O
|
||||
# autoconf is lame and doesn't give us any substitution variable for this.
|
||||
if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
|
||||
NO_MINUS_C_MINUS_O=yes
|
||||
else
|
||||
OUTPUT_OPTION='-o $@'
|
||||
fi
|
||||
AC_SUBST(NO_MINUS_C_MINUS_O)
|
||||
AC_SUBST(OUTPUT_OPTION)
|
||||
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
AC_C_BIGENDIAN_CROSS
|
||||
@ -515,13 +507,16 @@ fi
|
||||
|
||||
# Figure out which version of pexecute to use.
|
||||
case "${host}" in
|
||||
*-*-mingw* | *-*-winnt*) pexecute=./pex-win32.o ;;
|
||||
*-*-msdosdjgpp*) pexecute=./pex-djgpp.o ;;
|
||||
*-*-msdos*) pexecute=./pex-msdos.o ;;
|
||||
*-*-os2-emx*) pexecute=./pex-os2.o ;;
|
||||
*) pexecute=./pex-unix.o ;;
|
||||
*-*-mingw* | *-*-winnt*) pex=./pex-win32 ;;
|
||||
*-*-msdosdjgpp*) pex=./pex-djgpp ;;
|
||||
*-*-msdos*) pex=./pex-msdos ;;
|
||||
*-*-os2-emx*) pex=./pex-os2 ;;
|
||||
*) pex=./pex-unix ;;
|
||||
esac
|
||||
pexecute=${pex}.o
|
||||
ltpexecute=${pex}.lo
|
||||
AC_SUBST(pexecute)
|
||||
AC_SUBST(ltpexecute)
|
||||
|
||||
libiberty_AC_FUNC_STRNCMP
|
||||
|
||||
@ -534,16 +529,6 @@ else
|
||||
fi
|
||||
AC_SUBST(INSTALL_DEST)
|
||||
|
||||
m4_pattern_allow(LIBOBJS)
|
||||
L=""
|
||||
for l in x $LIBOBJS; do
|
||||
case $l in
|
||||
x) ;;
|
||||
*) L="$L ./$l" ;;
|
||||
esac
|
||||
done
|
||||
LIBOBJS="$L"
|
||||
|
||||
# We need multilib support, but only if configuring for the target.
|
||||
AC_CONFIG_FILES([Makefile testsuite/Makefile])
|
||||
AC_CONFIG_COMMANDS([default],
|
||||
|
||||
@ -76,7 +76,7 @@ sub missing {
|
||||
for $f (sort keys %listed) {
|
||||
if ($f =~ /(.*)\.c$/) {
|
||||
$base = $1;
|
||||
if (! $listed{"$base.o"}) {
|
||||
if (! $listed{"$base.lo"}) {
|
||||
print "O $f\n";
|
||||
}
|
||||
}
|
||||
@ -213,10 +213,7 @@ sub locals_first {
|
||||
|
||||
sub deps {
|
||||
|
||||
$crule = "\tif [ x\"\$(PICFLAG)\" != x ]; then \\\n";
|
||||
$crule .= "\t \$(COMPILE.c) \$(PICFLAG) \$< -o pic/\$@; \\\n";
|
||||
$crule .= "\telse true; fi\n";
|
||||
$crule .= "\t\$(COMPILE.c) \$< \$(OUTPUT_OPTION)\n";
|
||||
$crule .= "\t\$(LTCOMPILE) -c -o \$@ \$<\n";
|
||||
$crule .= "\n";
|
||||
|
||||
$incdir = shift @ARGV;
|
||||
@ -265,7 +262,7 @@ sub deps {
|
||||
}
|
||||
@deps = sort { &locals_first($a,$b) } keys %scanned;
|
||||
$obj = $f;
|
||||
$obj =~ s/\.c$/.o/;
|
||||
$obj =~ s/\.c$/.lo/;
|
||||
$obj = "./$obj:";
|
||||
if ($#deps >= 0) {
|
||||
print OUT "$obj \$(srcdir)/$f";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user