diff options
| author | Richard M. Stallman <rms@gnu.org> | 1998-05-03 08:24:10 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1998-05-03 08:24:10 +0000 |
| commit | ae3ed72aa34488b154244c2169d87fd45695d78d (patch) | |
| tree | 54e6e575e896d5e55b68952b67d35ab70dd5ddae /src/Makefile.in | |
| parent | ea873c6a7470b8557cada34e2f43f53f9b0da717 (diff) | |
| download | emacs-ae3ed72aa34488b154244c2169d87fd45695d78d.tar.gz | |
(TAGS-LISP): New target.
(${lispsource}TAGS): Target deleted.
(tags): Depend on TAGS-LISP.
(TAGS): Generate the TAGS file in the build dir.
(lisptagsfiles): Variable deleted.
(shortnamesdir, cppdir): Vars deleted.
(shortnames): Target deleted.
(temacs): Don't use $(SHORT).
(SHORT): Var deleted.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 9e8ddd06b7e..55e3304d445 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -37,8 +37,6 @@ dotdot = ${dot}${dot} lispsource = ${srcdir}/$(dot)$(dot)/lisp/ libsrc = $(dot)$(dot)/lib-src/ etc = $(dot)$(dot)/etc/ -shortnamesdir = $(dot)$(dot)/shortnames/ -cppdir = $(dot)$(dot)/cpp/ oldXMenudir = $(dot)$(dot)/oldXMenu/ lwlibdir = $(dot)$(dot)/lwlib/ @@ -254,10 +252,6 @@ MYCPPFLAG= -Blocal LOCALCPP= localcpp #endif /* ! defined (LONGNAMEBBBARFOOX) */ -#ifdef SHORTNAMES -SHORT= shortnames -#endif - #ifdef USE_X_TOOLKIT #define USE_@X_TOOLKIT_TYPE@ TOOLKIT_DEFINES = -DUSE_@X_TOOLKIT_TYPE@ @@ -845,7 +839,7 @@ ${libsrc}make-docfile: #define MAKE_PARALLEL #endif -temacs: MAKE_PARALLEL $(LOCALCPP) $(SHORT) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args +temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \ -o temacs ${STARTFILES} ${obj} ${otherobj} \ OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES} @@ -875,11 +869,6 @@ localcpp: CPP = $(CC) -E #endif /* ! defined (NEED_CPP) */ -#ifdef SHORTNAMES -shortnames: - cd ${shortnamesdir}; ${MAKE} ${MFLAGS} -#endif - /* Don't lose if this was not defined. */ #ifndef OLDXMENU_OPTIONS #define OLDXMENU_OPTIONS @@ -1168,16 +1157,15 @@ relock: chmod -w $(SOURCES) chmod +w paths.h -/* Arrange to make a tags table in ../lisp, and another in this dir - which includes ../lisp/TAGS by reference. */ +/* Arrange to make a tags table TAGS-LISP for ../lisp, + plus TAGS for the C files, which includes ../lisp/TAGS by reference. */ ctagsfiles = [a-zA-Z]*.[hc] -lisptagsfiles = ../lisp/[a-zA-Z]*.el TAGS: $(srcdir)/$(ctagsfiles) - export DIR; DIR=`pwd`; cd ${srcdir}; \ - $$DIR/../lib-src/etags --include=../lisp/TAGS \ + ../lib-src/etags --include=TAGS-LISP \ --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' $(ctagsfiles) -${lispsource}TAGS: ${lispsource}$(lisptagsfiles) - export DIR; DIR=`pwd`; cd ${lispsource}; \ - $(MAKE) TAGS ETAGS=$$DIR/../lib-src/etags -tags: TAGS ${lispsource}TAGS +frc: +TAGS-LISP: frc + $(MAKE) -f ${lispsource}Makefile TAGS-LISP ETAGS=../lib-src/etags \ + lispsource=${lispsource} +tags: TAGS TAGS-LISP .PHONY: tags |