diff options
| author | Fernando Nasser <fnasser@redhat.com> | 2000-12-11 22:36:26 +0000 |
|---|---|---|
| committer | Fernando Nasser <fnasser@redhat.com> | 2000-12-11 22:36:26 +0000 |
| commit | b46cd1657c4f7808aa9df8bd1504a0939de61482 (patch) | |
| tree | 8b6eb854d86eb737e3fa0db8ca014ca11224497f /gdb/Makefile.in | |
| parent | 4819127ae0dce301dc0e7fd275a33bcc60588d5d (diff) | |
| download | gdb-b46cd1657c4f7808aa9df8bd1504a0939de61482.zip gdb-b46cd1657c4f7808aa9df8bd1504a0939de61482.tar.gz gdb-b46cd1657c4f7808aa9df8bd1504a0939de61482.tar.bz2 | |
2000-12-11 Fernando Nasser <fnasser@redhat.com>
* Makefile.in (CONFIG_LOBS): New macro. Configured to the files
that must be added to the gdblib itself.
(DEPFILES): Use CONFIG_LOBS, not CONFIG_OBS.
(INIT_FILES): Include CONFIG_OBS.
(gdb$(EXEEXT)): Depend on CONFIG_OBS and link with it.
(kdb): Ditto.
* configure.in (CONFIG_LOBS): New variable. Object files that must
be added to gdblib for the specific configuration.
* configure: Regenerate.
Diffstat (limited to 'gdb/Makefile.in')
| -rw-r--r-- | gdb/Makefile.in | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in index c192c52..e660103 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -277,6 +277,7 @@ SUBDIR_GDBTK_INSTALL= install-gdbtk SUBDIR_GDBTK_UNINSTALL= CONFIG_OBS= @CONFIG_OBS@ +CONFIG_LOBS= @CONFIG_LOBS@ CONFIG_SRCS= @CONFIG_SRCS@ CONFIG_DEPS= @CONFIG_DEPS@ CONFIG_INITS= @CONFIG_INITS@ @@ -643,7 +644,7 @@ POSSLIBS = gnu-regex.c gnu-regex.h # Makefile.in DEPFILES = $(TDEPFILES) $(XDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) \ - $(REMOTE_OBS) $(SIM_OBS) $(CONFIG_OBS) + $(REMOTE_OBS) $(SIM_OBS) $(CONFIG_LOBS) SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) $(CONFIG_SRCS) # Don't include YYFILES (*.tab.c) because we already include *.y in SFILES, @@ -775,7 +776,7 @@ uninstall: force $(CONFIG_UNINSTALL) # tui-file.c. # -INIT_FILES = $(OBS) $(TSOBS) $(CONFIG_INITS) +INIT_FILES = $(OBS) $(TSOBS) $(CONFIG_OBS) $(CONFIG_INITS) init.c: $(INIT_FILES) @echo Making init.c @rm -f init.c-tmp init.l-tmp @@ -816,9 +817,11 @@ init.c: $(INIT_FILES) init.o: init.c $(defs_h) $(call_cmds_h) # Removing the old gdb first works better if it is running, at least on SunOS. -gdb$(EXEEXT): main.o libgdb.a $(ADD_DEPS) $(CDEPS) $(TDEPLIBS) +gdb$(EXEEXT): main.o libgdb.a $(CONFIG_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS) rm -f gdb$(EXEEXT) - $(HLDENV) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) -o gdb$(EXEEXT) main.o libgdb.a $(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES) + $(HLDENV) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) -o gdb$(EXEEXT) \ + main.o libgdb.a $(CONFIG_OBS) $(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS)\ + $(LOADLIBES) nlm: force rootme=`pwd`; export rootme; $(MAKE) $(TARGET_FLAGS_TO_PASS) DO=all DODIRS=nlm subdir_do @@ -887,9 +890,9 @@ tm-sun4os4.h: tm-sparc.h xm-vaxult.h: xm-vax.h xm-vaxbsd.h: xm-vax.h -kdb: $(NTSSTART) $(OBS) $(NTSOBS) $(ADD_DEPS) $(CDEPS) - ld -o kdb $(NTSSTART) $(OBS) $(NTSOBS) init.o $(ADD_FILES) \ - -lc $(CLIBS) +kdb: $(NTSSTART) $(OBS) $(CONFIG_OBS) $(NTSOBS) $(ADD_DEPS) $(CDEPS) + ld -o kdb $(NTSSTART) $(OBS) $(CONFIG_OBS) $(NTSOBS) init.o \ + $(ADD_FILES) -lc $(CLIBS) # Put the proper machine-specific files first, so M-. on a machine # specific routine gets the one for the correct machine. (FIXME: those |