diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2004-12-18 16:46:03 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2004-12-18 16:46:03 +0000 |
| commit | 96e00b336afe993141a4ed66db7554468e2506cd (patch) | |
| tree | 0d6a25a13813fcfe8ddde81c906cca328da2b0d1 /libiberty/maint-tool | |
| parent | 70d1ae419fd08ca43ee1ce63100ced8c11d7d325 (diff) | |
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.
Diffstat (limited to 'libiberty/maint-tool')
| -rw-r--r-- | libiberty/maint-tool | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libiberty/maint-tool b/libiberty/maint-tool index bfc5304224..5e35027712 100644 --- a/libiberty/maint-tool +++ b/libiberty/maint-tool @@ -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"; |