diff options
author | DJ Delorie <dj@delorie.com> | 2001-10-21 00:08:22 +0000 |
---|---|---|
committer | DJ Delorie <dj@delorie.com> | 2001-10-21 00:08:22 +0000 |
commit | 9d309b1c3ce4b8d0eb242b261adfe0ccd7bfc11a (patch) | |
tree | eada0cda6c76033fe3625c17993cd1af62b9eab8 /libiberty | |
parent | b0a029b8987cacd43d2940e19322b2fdbb7e564f (diff) | |
download | gdb-9d309b1c3ce4b8d0eb242b261adfe0ccd7bfc11a.tar.gz |
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r-- | libiberty/ChangeLog | 5 | ||||
-rw-r--r-- | libiberty/Makefile.in | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 52eb093bcc7..29777fec7c4 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2001-10-19 H.J. Lu <hjl@gnu.org> + + * Makefile.in ($(TARGETLIB)): Also generate pic/$(TARGETLIB) if + necessary. + 2001-10-17 DJ Delorie <dj@redhat.com> * argv.c, asprintf.c, choose-temp.c, concat.c, cplus-dem.c, diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index f5499029696..877e0a9279f 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -154,10 +154,17 @@ CONFIGURED_OFILES = asprintf.o atexit.o basename.o bcmp.o bcopy.o \ vsprintf.o waitpid.o $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) - -rm -f $(TARGETLIB) + -rm -f $(TARGETLIB) pic/$(TARGETLIB) $(AR) $(AR_FLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(RANLIB) $(TARGETLIB) + if [ x"$(PICFLAG)" != x ]; then \ + cd pic; \ + $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ + $(RANLIB) $(TARGETLIB); \ + cd ..; \ + else true; fi info: libiberty.info info-subdir install-info: install-info-subdir |