From: Hans-Bernhard B. <br...@us...> - 2001-06-27 16:42:29
|
Update of /cvsroot/cscope/cscope/src In directory usw-pr-cvs1:/tmp/cvs-serv11781/src Modified Files: Makefile.in Log Message: Autoconf/Automake files regenerated Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/src/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile.in 2000/05/04 22:46:01 1.3 --- Makefile.in 2001/06/27 16:42:25 1.4 *************** *** 71,78 **** bin_PROGRAMS = cscope ! cscope_SOURCES = scanner.l egrep.y alloc.c basename.c command.c compath.c constants.h crossref.c dir.c display.c edit.c exec.c find.c global.h help.c history.c input.c invlib.c invlib.h library.h logdir.c lookup.c main.c mouse.c mygetenv.c mypopen.c version.h vp.h vpaccess.c vpfopen.c vpinit.c vpopen.c LEXLIB = @LEXLIB@ --- 71,82 ---- bin_PROGRAMS = cscope + @USING_LEX_TRUE@LEXER_SOURCE = scanner.l + @USING_LEX_FALSE@LEXER_SOURCE = fscanner.l ! cscope_SOURCES = $(LEXER_SOURCE) egrep.y alloc.c basename.c command.c compath.c constants.h crossref.c dir.c display.c edit.c exec.c find.c global.h help.c history.c input.c invlib.c invlib.h library.h logdir.c lookup.c lookup.h main.c mouse.c mygetenv.c mypopen.c scanner.h version.h vp.h vpaccess.c vpfopen.c vpinit.c vpopen.c + EXTRA_cscope_SOURCES = scanner.l fscanner.l + LEXLIB = @LEXLIB@ *************** *** 81,86 **** INCLUDES = $(CURSES_INCLUDEDIR) ! BUILT_SOURCES = scanner.c egrep.c ! CLEANFILES = scanner.c egrep.c EXTRA_DIST = emacs.e gmacs.ml --- 85,89 ---- INCLUDES = $(CURSES_INCLUDEDIR) ! CLEANFILES = scanner.c fscanner.c egrep.c EXTRA_DIST = emacs.e gmacs.ml *************** *** 95,109 **** LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! cscope_OBJECTS = scanner.o egrep.o alloc.o basename.o command.o \ ! compath.o crossref.o dir.o display.o edit.o exec.o find.o help.o \ ! history.o input.o invlib.o logdir.o lookup.o main.o mouse.o mygetenv.o \ ! mypopen.o vpaccess.o vpfopen.o vpinit.o vpopen.o cscope_DEPENDENCIES = cscope_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = Makefile.am Makefile.in egrep.c scanner.c --- 98,120 ---- LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! @USING_LEX_FALSE@cscope_OBJECTS = fscanner.o egrep.o alloc.o basename.o \ ! @USING_LEX_FALSE@command.o compath.o crossref.o dir.o display.o edit.o \ ! @USING_LEX_FALSE@exec.o find.o help.o history.o input.o invlib.o \ ! @USING_LEX_FALSE@logdir.o lookup.o main.o mouse.o mygetenv.o mypopen.o \ ! @USING_LEX_FALSE@vpaccess.o vpfopen.o vpinit.o vpopen.o ! @USING_LEX_TRUE@cscope_OBJECTS = scanner.o egrep.o alloc.o basename.o \ ! @USING_LEX_TRUE@command.o compath.o crossref.o dir.o display.o edit.o \ ! @USING_LEX_TRUE@exec.o find.o help.o history.o input.o invlib.o \ ! @USING_LEX_TRUE@logdir.o lookup.o main.o mouse.o mygetenv.o mypopen.o \ ! @USING_LEX_TRUE@vpaccess.o vpfopen.o vpinit.o vpopen.o cscope_DEPENDENCIES = cscope_LDFLAGS = + YLWRAP = $(srcdir)/ylwrap CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = Makefile.am Makefile.in egrep.c fscanner.c scanner.c \ ! ylwrap *************** *** 112,116 **** TAR = gtar GZIP_ENV = --best ! SOURCES = $(cscope_SOURCES) OBJECTS = $(cscope_OBJECTS) --- 123,134 ---- TAR = gtar GZIP_ENV = --best ! DEP_FILES = .deps/alloc.P .deps/basename.P .deps/command.P \ ! .deps/compath.P .deps/crossref.P .deps/dir.P .deps/display.P \ ! .deps/edit.P .deps/egrep.P .deps/exec.P .deps/find.P .deps/fscanner.P \ ! .deps/help.P .deps/history.P .deps/input.P .deps/invlib.P \ ! .deps/logdir.P .deps/lookup.P .deps/main.P .deps/mouse.P \ ! .deps/mygetenv.P .deps/mypopen.P .deps/scanner.P .deps/vpaccess.P \ ! .deps/vpfopen.P .deps/vpinit.P .deps/vpopen.P ! SOURCES = $(cscope_SOURCES) $(EXTRA_cscope_SOURCES) OBJECTS = $(cscope_OBJECTS) *************** *** 119,125 **** .SUFFIXES: .S .c .l .o .s .y $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status --- 137,143 ---- .SUFFIXES: .S .c .l .o .s .y $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status *************** *** 151,157 **** done - .c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< --- 169,172 ---- *************** *** 174,178 **** $(LINK) $(cscope_LDFLAGS) $(cscope_OBJECTS) $(cscope_LDADD) $(LIBS) .l.c: ! $(LEX) $(AM_LFLAGS) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@ .y.c: $(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c --- 189,193 ---- $(LINK) $(cscope_LDFLAGS) $(cscope_OBJECTS) $(cscope_LDADD) $(LIBS) .l.c: ! $(SHELL) $(YLWRAP) "$(LEX)" $< $(LEX_OUTPUT_ROOT).c $@ -- $(AM_LFLAGS) $(LFLAGS) .y.c: $(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c *************** *** 217,224 **** distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ --- 232,244 ---- distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ *************** *** 228,231 **** --- 248,283 ---- done $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook + + DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + + -include $(DEP_FILES) + + mostlyclean-depend: + + clean-depend: + + distclean-depend: + -rm -rf .deps + + maintainer-clean-depend: + + %.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + + %.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-am *************** *** 265,281 **** maintainer-clean-generic: ! -test -z "scannerlegrephegrepc$(BUILT_SOURCES)" || rm -f scannerl egreph egrepc $(BUILT_SOURCES) mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ! mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-am ! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-generic \ ! mostlyclean-am clean: clean-am distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ ! distclean-generic clean-am distclean: distclean-am --- 317,333 ---- maintainer-clean-generic: ! -test -z "fscannerlscannerlegrephegrepc" || rm -f fscannerl scannerl egreph egrepc mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ! mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-am ! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ ! clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ ! distclean-depend distclean-generic clean-am distclean: distclean-am *************** *** 283,287 **** maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ ! maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." --- 335,340 ---- maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ ! maintainer-clean-depend maintainer-clean-generic \ ! distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." *************** *** 293,305 **** mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ ! check-am installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean dist-hook: ! rm -f $(distdir)/scanner.c $(distdir)/egrep.c # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 346,359 ---- mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir mostlyclean-depend \ ! distclean-depend clean-depend maintainer-clean-depend info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean dist-hook: ! rm -f $(distdir)/scanner.c $(distdir)/fscanner.c $(distdir)/egrep.c # Tell versions [3.59,3.63) of GNU make to not export all variables. |