mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Port ctags+etags build to Sun C 5.12.

Browse Source 
* .bzrignore: Remove lib-src/ctags.c.
* lib-src/Makefile.in (etags_args): Remove, replacing with ...
(etags_cflags, etags_libs): New macros.  All uses changed.
(ctags${EXEEXT}): Don't compile etags.c, as compiling etags.c in
parallel (once for ctags, once for etags) breaks parallel makes
with compilers that use the source file name to name temporaries,
such as Sun C 5.12.  Instead, compile ctags.c.
* lib-src/ctags.c: New file.
This commit is contained in:
Paul Eggert 2014-05-18 11:57:04 -07:00
parent 0d1b87f90e
commit 5eda3a7516
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2014-05-18 Paul Eggert <eggert@cs.ucla.edu>
Port ctags+etags build to Sun C 5.12.
* .bzrignore: Remove lib-src/ctags.c.
Port recent libpng changes to hosts with missing png.h.
* configure.ac (HAVE_PNG): Port to platforms where libpng-config
succeeds but png.h is absent, by testing libpng-config's output

11
lib-src/ChangeLog
View File

@ -1,3 +1,14 @@
2014-05-18 Paul Eggert <eggert@cs.ucla.edu>
Port ctags+etags build to Sun C 5.12.
* Makefile.in (etags_args): Remove, replacing with ...
(etags_cflags, etags_libs): New macros. All uses changed.
(ctags${EXEEXT}): Don't compile etags.c, as compiling etags.c in
parallel (once for ctags, once for etags) breaks parallel makes
with compilers that use the source file name to name temporaries,
such as Sun C 5.12. Instead, compile ctags.c.
* ctags.c: New file.
2014-05-04 Paul Eggert <eggert@cs.ucla.edu>
Handle systems without WCONTINUED consistently. (Bug#15110, 17339)

16
lib-src/Makefile.in
View File

@ -311,18 +311,18 @@ regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
etags_deps = ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
etags_args = -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" \
${srcdir}/etags.c regex.o $(LOADLIBES) $(NTLIB) -o $@
etags_cflags = -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" -o $@
etags_libs = regex.o $(LOADLIBES) $(NTLIB)
etags${EXEEXT}: ${etags_deps}
$(CC) ${ALL_CFLAGS} ${etags_args}
$(CC) ${ALL_CFLAGS} $(etags_cflags) $(srcdir)/etags.c $(etags_libs)
## ctags.c is distinct from etags.c so that parallel makes do not write two
## etags.o files on top of each other.
## FIXME?
## Can't we use a symlink ctags -> etags, and make etags check for argv[0]?
## Or a wrapper script that calls etags --ctags?
ctags${EXEEXT}: ${etags_deps}
$(CC) ${ALL_CFLAGS} -DCTAGS ${etags_args}
## Can't we use a wrapper that calls 'etags --ctags'?
ctags${EXEEXT}: ctags.c ${etags_deps}
$(CC) ${ALL_CFLAGS} $(etags_cflags) $(srcdir)/ctags.c $(etags_libs)
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
$(config_h)

2
lib-src/ctags.c Normal file
View File

@ -0,0 +1,2 @@
#define CTAGS 1
#include "etags.c"