diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 129 |
1 files changed, 72 insertions, 57 deletions
diff --git a/Makefile.in b/Makefile.in index 5462426e..8f288bbe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile for bash-2.02, version 2.84 +# Makefile for bash-2.03, version 2.103 # # Make sure the first target in the makefile is the right one all: .made @@ -29,15 +29,17 @@ VPATH = .:@srcdir@ CC = @CC@ CC_FOR_BUILD = @CC_FOR_BUILD@ YACC = @YACC@ -SHELL=/bin/sh +SHELL = @MAKE_SHELL@ CP = cp RM = rm -f AR = @AR@ +ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +INSTALLMODE= -m 0755 COMPRESS = gzip COMPRESS_EXT = .gz @@ -63,6 +65,7 @@ RELSTATUS = release Machine = @host_cpu@ OS = @host_os@ +VENDOR = @host_vendor@ MACHTYPE = @host@ THIS_SH = $(BUILD_DIR)/$(Program) @@ -80,20 +83,21 @@ LOCAL_CFLAGS = @LOCAL_CFLAGS@ DEFS = @DEFS@ LOCAL_DEFS = @LOCAL_DEFS@ LOCAL_LIBS = @LOCAL_LIBS@ -LIBS = $(BUILTINS_LIB) $(LIBRARIES) $(LOCAL_LIBS) @LIBS@ -LDFLAGS = @LDFLAGS@ $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS) +LIBS = $(BUILTINS_LIB) $(LIBRARIES) @LIBS@ +LDFLAGS = @LDFLAGS@ $(STATIC_LD) $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS) +STATIC_LD = @STATIC_LD@ LOCAL_LDFLAGS = @LOCAL_LDFLAGS@ -SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DHOSTTYPE='"$(Machine)"' -DOSTYPE='"$(OS)"' -DMACHTYPE='"$(MACHTYPE)"' +SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \ $(DEFS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(CFLAGS) -INCLUDES = -I. -I$(srcdir) -I$(LIBSRC) +INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(LIBSRC) -I$(includedir) GCC_LINT_FLAGS = -ansi -Wall -Wshadow -Wpointer-arith -Wcast-qual \ -Wwrite-strings -Werror -Wstrict-prototypes \ - -Wmissing-prototypes + -Wmissing-prototypes -Wno-implicit GCC_LINT_CFLAGS = $(CCFLAGS) $(GCC_LINT_FLAGS) # @@ -105,7 +109,7 @@ dot = . LIBSUBDIR = lib LIBSRC = $(srcdir)/$(LIBSUBDIR) -SUBDIR_INCLUDES = -I. -I$(topdir) -I$(topdir)/$(LIBSUBDIR) -I$(includedir) +SUBDIR_INCLUDES = -I. @RL_INCLUDE@ -I$(topdir) -I$(topdir)/$(LIBSUBDIR) -I$(includedir) # the bash library # the library is a mix of functions that the C library does not provide on @@ -120,7 +124,7 @@ SHLIB_SOURCE = ${SH_LIBSRC}/clktck.c ${SH_LIBSRC}/getcwd.c \ ${SH_LIBSRC}/strcasecmp.c ${SH_LIBSRC}/strerror.c \ ${SH_LIBSRC}/strtod.c ${SH_LIBSRC}/strtol.c \ ${SH_LIBSRC}/strtoul.c ${SH_LIBSRC}/vprint.c \ - ${SH_LIBSRC}/itos.c + ${SH_LIBSRC}/itos.c ${SH_LIBSRC}/rename.c SHLIB_LIB = -lsh SHLIB_LIBNAME = libsh.a @@ -131,7 +135,7 @@ SHLIB_DEP = ${SHLIB_LIBRARY} # we assume for now that readline source is being shipped with bash RL_LIBSRC = $(LIBSRC)/readline RL_LIBDOC = $(RL_LIBSRC)/doc -RL_LIBDIR = $(dot)/$(LIBSUBDIR)/readline +RL_LIBDIR = @RL_LIBDIR@ RL_ABSSRC = ${topdir}/$(RL_LIBDIR) READLINE_LIB = @READLINE_LIB@ @@ -145,6 +149,7 @@ READLINE_SOURCE = $(RL_LIBSRC)/rldefs.h $(RL_LIBSRC)/rlconf.h \ $(RL_LIBSRC)/chardefs.h $(RL_LIBSRC)/keymaps.h \ $(RL_LIBSRC)/history.h $(RL_LIBSRC)/histlib.h \ $(RL_LIBSRC)/posixstat.h $(RL_LIBSRC)/tilde.h \ + $(RL_LIBSRC)/rlstdc.h \ $(RL_LIBSRC)/funmap.c $(RL_LIBSRC)/emacs_keymap.c \ $(RL_LIBSRC)/search.c $(RL_LIBSRC)/vi_keymap.c \ $(RL_LIBSRC)/keymaps.c $(RL_LIBSRC)/parens.c \ @@ -157,7 +162,7 @@ READLINE_SOURCE = $(RL_LIBSRC)/rldefs.h $(RL_LIBSRC)/rlconf.h \ $(RL_LIBSRC)/undo.c $(RL_LIBSRC)/macro.c \ $(RL_LIBSRC)/terminal.c $(RL_LIBSRC)/nls.c \ $(RL_LIBSRC)/input.c $(RL_LIBSRC)/xmalloc.c \ - $(RL_LIBSRC)/shell.c \ + $(RL_LIBSRC)/shell.c $(RL_LIBSRC)/savestring.c \ $(RL_LIBSRC)/histexpand.c $(RL_LIBSRC)/history.c \ $(RL_LIBSRC)/histsearch.c $(RL_LIBSRC)/histfile.c @@ -171,12 +176,12 @@ READLINE_OBJ = $(RL_LIBDIR)/readline.o $(RL_LIBDIR)/funmap.o \ $(RL_LIBDIR)/kill.o $(RL_LIBDIR)/undo.o $(RL_LIBDIR)/nls.o \ $(RL_LIBDIR)/macro.o $(RL_LIBDIR)/input.o \ $(RL_LIBDIR)/terminal.o $(RL_LIBDIR)/callback.o \ - $(RL_LIBDIR)/shell.o \ + $(RL_LIBDIR)/shell.o $(RL_LIBDIR)/savestring.o \ $(RL_LIBDIR)/history.o $(RL_LIBDIR)/histexpand.o \ $(RL_LIBDIR)/histsearch.o $(RL_LIBDIR)/histfile.o HIST_LIBSRC = $(LIBSRC)/readline -HIST_LIBDIR = $(dot)/$(LIBSUBDIR)/readline +HIST_LIBDIR = @HIST_LIBDIR@ HIST_ABSSRC = ${topdir}/$(HIST_LIBDIR) HISTORY_LIB = @HISTORY_LIB@ @@ -265,11 +270,11 @@ BASHPOSIX_SUPPORT = $(BASHPOSIX_LIB)/posixstat.h $(BASHPOSIX_LIB)/ansi_stdlib.h LIBRARIES = $(READLINE_LIB) $(HISTORY_LIB) $(TERMCAP_LIB) $(GLOB_LIB) \ $(TILDE_LIB) $(MALLOC_LIB) $(SHLIB_LIB) $(LOCAL_LIBS) -LIBDEP = $(READLINE_DEP) $(TERMCAP_DEP) $(GLOB_DEP) $(HISTORY_DEP) \ +LIBDEP = $(READLINE_DEP) $(HISTORY_DEP) $(TERMCAP_DEP) $(GLOB_DEP) \ $(TILDE_DEP) $(MALLOC_DEP) $(SHLIB_DEP) -LIBRARY_LDFLAGS = $(READLINE_LDFLAGS) $(HISTORY_LDFLAGS) $(TILDE_LDFLAGS) \ - $(GLOB_LDFLAGS) $(MALLOC_LDFLAGS) $(SHLIB_LDFLAGS) +LIBRARY_LDFLAGS = $(READLINE_LDFLAGS) $(HISTORY_LDFLAGS) $(GLOB_LDFLAGS) \ + $(TILDE_LDFLAGS) $(MALLOC_LDFLAGS) $(SHLIB_LDFLAGS) # # The shell itself @@ -411,8 +416,8 @@ strip: $(Program) .made size $(Program) version.h: $(SOURCES) config.h Makefile - if $(SHELL) $(SUPPORT_SRC)mkversion.sh -b -s $(RELSTATUS) -d $(Version) -p $(PatchLevel) -o newversion.h; \ - then mv newversion.h version.h; fi; + $(SHELL) $(SUPPORT_SRC)mkversion.sh -b -s $(RELSTATUS) -d $(Version) -p $(PatchLevel) -o newversion.h \ + && mv newversion.h version.h # old rules GRAM_H = parser-built @@ -435,13 +440,13 @@ y.tab.c y.tab.h: parse.y $(READLINE_LIBRARY): config.h $(READLINE_SOURCE) @echo making $@ in ${RL_LIBDIR} - @(cd ${RL_LIBDIR} && \ - $(MAKE) $(MFLAGS) libreadline.a) || exit 1 + @( { test "${RL_LIBDIR}" = "${libdir}" && exit 0; } || \ + cd ${RL_LIBDIR} && $(MAKE) $(MFLAGS) libreadline.a) || exit 1 $(HISTORY_LIBRARY): config.h $(HISTORY_SOURCE) @echo making $@ in ${HIST_LIBDIR} - @(cd ${HIST_LIBDIR} && \ - $(MAKE) $(MFLAGS) libhistory.a) || exit 1 + @( { test "${HIST_LIBDIR}" = "${libdir}" && exit 0; } || \ + cd ${HIST_LIBDIR} && $(MAKE) $(MFLAGS) libhistory.a) || exit 1 $(GLOB_LIBRARY): config.h $(GLOB_SOURCE) @echo making $@ in ${GLOB_LIBDIR} @@ -464,7 +469,7 @@ $(SHLIB_LIBRARY): config.h ${SHLIB_SOURCE} $(MAKE) $(MFLAGS) ${SHLIB_LIBNAME}) || exit 1 mksignames: $(SUPPORT_SRC)mksignames.c - $(CC) $(CCFLAGS) $(CPPFLAGS) -o $@ $(SUPPORT_SRC)mksignames.c + $(CC_FOR_BUILD) $(CCFLAGS) $(CPPFLAGS) -o $@ $(SUPPORT_SRC)mksignames.c # make a list of signals for the local system -- this is done when we're # *not* cross-compiling @@ -502,15 +507,19 @@ Makefiles makefiles: config.status $(srcdir)/Makefile.in config.h: stamp-h -stamp-h: config.status $(srcdir)/config.h.in $(srcdir)/config.h.top $(srcdir)/config.h.bot +stamp-h: config.status $(srcdir)/config.h.in $(srcdir)/config-top.h $(srcdir)/config-bot.h CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck # comment out for distribution -#$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 -# cd $(srcdir) && autoconf +$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in + cd $(srcdir) && autoconf + +# for chet +reconfig: force + sh $(srcdir)/configure #newversion: mkversion # $(RM) .build @@ -540,8 +549,8 @@ installdirs: @${SHELL} $(SUPPORT_SRC)mkdirs $(infodir) install: .made installdirs - $(INSTALL_PROGRAM) $(Program) $(bindir)/$(Program) - $(INSTALL_PROGRAM) bashbug $(bindir)/bashbug + $(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(bindir)/$(Program) + $(INSTALL_PROGRAM) $(INSTALLMODE) bashbug $(bindir)/bashbug -( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \ man1dir=$(man1dir) man1ext=$(man1ext) \ man3dir=$(man3dir) man3ext=$(man3ext) \ @@ -572,6 +581,7 @@ clean: basic-clean -(cd $(GLOB_LIBDIR) && $(MAKE) $(MFLAGS) $@) -(cd $(TILDE_LIBDIR) && $(MAKE) $(MFLAGS) $@) -(cd $(ALLOC_LIBDIR) && $(MAKE) $(MFLAGS) $@) + -(cd $(SH_LIBDIR) && $(MAKE) $(MFLAGS) $@) $(RM) $(CREATED_SUPPORT) mostlyclean: basic-clean @@ -583,6 +593,7 @@ mostlyclean: basic-clean -(cd $(GLOB_LIBDIR) && $(MAKE) $(MFLAGS) $@) -(cd $(TILDE_LIBDIR) && $(MAKE) $(MFLAGS) $@) -(cd $(ALLOC_LIBDIR) && $(MAKE) $(MFLAGS) $@) + -(cd $(SH_LIBDIR) && $(MAKE) $(MFLAGS) $@) distclean: basic-clean ( cd $(DOCDIR) && $(MAKE) $(MFLAGS) $@ ) @@ -593,6 +604,7 @@ distclean: basic-clean -(cd $(GLOB_LIBDIR) && $(MAKE) $(MFLAGS) $@) -(cd $(TILDE_LIBDIR) && $(MAKE) $(MFLAGS) $@) -(cd $(ALLOC_LIBDIR) && $(MAKE) $(MFLAGS) $@) + -(cd $(SH_LIBDIR) && $(MAKE) $(MFLAGS) $@) $(RM) $(CREATED_CONFIGURE) tags TAGS $(RM) $(CREATED_SUPPORT) Makefile $(CREATED_MAKEFILES) @@ -608,6 +620,7 @@ maintainer-clean: basic-clean -(cd $(GLOB_LIBDIR) && $(MAKE) $(MFLAGS) $@) -(cd $(TILDE_LIBDIR) && $(MAKE) $(MFLAGS) $@) -(cd $(ALLOC_LIBDIR) && $(MAKE) $(MFLAGS) $@) + -(cd $(SH_LIBDIR) && $(MAKE) $(MFLAGS) $@) $(RM) $(CREATED_CONFIGURE) $(CREATED_MAKEFILES) $(RM) $(CREATED_SUPPORT) Makefile @@ -643,22 +656,22 @@ sdepend: force ############################ DEPENDENCIES ############################### -# Files that depend on the definitions in config.h.top, which are not meant +# Files that depend on the definitions in config-top.h, which are not meant # to be changed -shell.o: config.h.top -input.o: config.h.top -y.tab.o: config.h.top -jobs.o: config.h.top -nojobs.o: config.h.top -execute_cmd.o: config.h.top -variables.o: config.h.top -builtins/command.o: config.h.top -builtins/common.o: config.h.top -builtins/break.o: config.h.top -builtins/echo.o: config.h.top -builtins/evalstring.o: config.h.top -builtins/exit.o: config.h.top -builtins/kill.o: config.h.top +shell.o: config-top.h +input.o: config-top.h +y.tab.o: config-top.h +jobs.o: config-top.h +nojobs.o: config-top.h +execute_cmd.o: config-top.h +variables.o: config-top.h +builtins/command.o: config-top.h +builtins/common.o: config-top.h +builtins/break.o: config-top.h +builtins/echo.o: config-top.h +builtins/evalstring.o: config-top.h +builtins/exit.o: config-top.h +builtins/kill.o: config-top.h # shell basics copy_cmd.o: shell.h config.h bashjmp.h posixjmp.h command.h stdc.h error.h @@ -872,18 +885,20 @@ bracecomp.o: dispose_cmd.h make_cmd.h subst.h externs.h stdc.h # library dependencies bashline.o: $(RL_LIBSRC)/rlconf.h -bashline.o: $(RL_LIBSRC)/keymaps.h +bashline.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/rlstdc.h bashline.o: $(RL_LIBSRC)/chardefs.h $(RL_LIBSRC)/readline.h bracecomp.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/chardefs.h -bracecomp.o: $(RL_LIBSRC)/readline.h -y.tab.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/chardefs.h $(RL_LIBSRC)/readline.h -subst.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/chardefs.h $(RL_LIBSRC)/readline.h - -shell.o: $(HIST_LIBSRC)/history.h -subst.o: $(HIST_LIBSRC)/history.h -bashline.o: $(HIST_LIBSRC)/history.h -bashhist.o: $(HIST_LIBSRC)/history.h -y.tab.o: $(HIST_LIBSRC)/history.h +bracecomp.o: $(RL_LIBSRC)/readline.h $(RL_LIBSRC)/rlstdc.h +y.tab.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/chardefs.h +y.tab.o: $(RL_LIBSRC)/readline.h $(RL_LIBSRC)/rlstdc.h +subst.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/chardefs.h +subst.o: $(RL_LIBSRC)/readline.h $(RL_LIBSRC)/rlstdc.h + +shell.o: $(HIST_LIBSRC)/history.h $(HIST_LIBSRC)/rlstdc.h +subst.o: $(HIST_LIBSRC)/history.h $(HIST_LIBSRC)/rlstdc.h +bashline.o: $(HIST_LIBSRC)/history.h $(HIST_LIBSRC)/rlstdc.h +bashhist.o: $(HIST_LIBSRC)/history.h $(HIST_LIBSRC)/rlstdc.h +y.tab.o: $(HIST_LIBSRC)/history.h $(HIST_LIBSRC)/rlstdc.h execute_cmd.o: $(TILDE_LIBSRC)/tilde.h general.o: $(TILDE_LIBSRC)/tilde.h @@ -1075,11 +1090,11 @@ builtins/wait.o: shell.h bashjmp.h posixjmp.h sig.h unwind_prot.h variables.h # builtin library dependencies builtins/bind.o: $(RL_LIBSRC)/chardefs.h $(RL_LIBSRC)/readline.h -builtins/bind.o: $(RL_LIBSRC)/keymaps.h +builtins/bind.o: $(RL_LIBSRC)/keymaps.h $(RL_LIBSRC)/rlstdc.h -builtins/bind.o: $(HIST_LIBSRC)/history.h -builtins/fc.o: $(HIST_LIBSRC)/history.h -builtins/history.o: $(HIST_LIBSRC)/history.h +builtins/bind.o: $(HIST_LIBSRC)/history.h $(RL_LIBSRC)/rlstdc.h +builtins/fc.o: $(HIST_LIBSRC)/history.h $(RL_LIBSRC)/rlstdc.h +builtins/history.o: $(HIST_LIBSRC)/history.h $(RL_LIBSRC)/rlstdc.h builtins/common.o: $(TILDE_LIBSRC)/tilde.h builtins/cd.o: $(TILDE_LIBSRC)/tilde.h |