* Makefile.in: Replace libgdb.a with libgdb-files. Make "all"

	build it.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2aae816a369bdfd96c40196a1ce085948c6026b7..72eca926ef84828dddc9e20d7f71caca2c877cb4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 25 17:06:15 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+       * Makefile.in: Replace libgdb.a with libgdb-files.  Make "all"
+       build it.
+
 Thu May 19 09:56:20 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
        * target.c, target.h: New variables target_activity_function and

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b01a8e87b2202f91c50e5d2f49e95a3c40d1d9e4..1842d5283972df4ae5fe8d09c167b87d4c6a4847 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -449,7 +449,7 @@ COMMON_OBS = version.o blockframe.o breakpoint.o findvar.o stack.o thread.o \
 
 OBS = $(COMMON_OBS) main.o utils.o annotate.o
 
-LIBGDB_OBS = $(COMMON_OBS) libmain.o libutils.o
+LIBGDB_OBS = libmain.o libutils.o
 
 TSOBS = inflow.o
 
@@ -468,7 +468,7 @@ YYOBJ = c-exp.tab.o m2-exp.tab.o ch-exp.tab.o
 .c.o:
        $(CC) -c $(INTERNAL_CFLAGS) $<
 
-all: gdb
+all: gdb libgdb-files $(LIBGDB_OBS)
        @$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do
 
 installcheck:
@@ -549,28 +549,19 @@ init.c: $(OBS) $(TSOBS)
 
 .PRECIOUS: init.c
 
-# The gdb target has two dependencies that aren't really
-# used when linking gdb.  They are built for the sake of cyscm.
-
 # Removing the old gdb first works better if it is running, at least on SunOS.
-gdb: $(OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o libmain.o libutils.o
+gdb: $(OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o
        rm -f gdb
        $(CC-LD) $(INTERNAL_LDFLAGS) -o gdb \
          init.o $(OBS) $(TSOBS) $(ADD_FILES) $(CLIBS) $(LOADLIBES)
 
-LIBGDBFILES=$(LIBGDB_OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o
-LIBGDBPREFIX=.
-libgdb-files: force_update
+LIBGDBFILES=$(COMMON_OBS) $(LIBGDB_OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o
+libgdb-files: $(LIBGDBFILES) Makefile.in
        -rm -f libgdb-files
        for i in $(LIBGDBFILES); do\
-               echo ${LIBGDBPREFIX}/$$i >> libgdb-files;\
+               echo $$i >> libgdb-files;\
        done
 
-libgdb.a: $(LIBGDB_OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o
-       rm -f libgdb.a
-       $(AR) $(AR_FLAGS) libgdb.a $(LIBGDB_OBS) $(TSOBS) $(ADD_FILES) init.o
-       $(RANLIB) libgdb.a
-
 libmain.o: main.c
        $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/main.c -DMAIN_OVERRIDE \
          -o libmain.o