Commit 5eda3a75 authored by Paul Eggert's avatar Paul Eggert

Port ctags+etags build to Sun C 5.12.

* .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.
parent 0d1b87f9
2014-05-18 Paul Eggert <eggert@cs.ucla.edu> 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. Port recent libpng changes to hosts with missing png.h.
* configure.ac (HAVE_PNG): Port to platforms where libpng-config * configure.ac (HAVE_PNG): Port to platforms where libpng-config
succeeds but png.h is absent, by testing libpng-config's output succeeds but png.h is absent, by testing libpng-config's output
......
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> 2014-05-04 Paul Eggert <eggert@cs.ucla.edu>
Handle systems without WCONTINUED consistently. (Bug#15110, 17339) Handle systems without WCONTINUED consistently. (Bug#15110, 17339)
......
...@@ -311,18 +311,18 @@ regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h) ...@@ -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_deps = ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
etags_args = -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" \ etags_cflags = -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" -o $@
${srcdir}/etags.c regex.o $(LOADLIBES) $(NTLIB) -o $@ etags_libs = regex.o $(LOADLIBES) $(NTLIB)
etags${EXEEXT}: ${etags_deps} 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? ## FIXME?
## Can't we use a symlink ctags -> etags, and make etags check for argv[0]? ## Can't we use a wrapper that calls 'etags --ctags'?
## Or a wrapper script that calls etags --ctags? ctags${EXEEXT}: ctags.c ${etags_deps}
ctags${EXEEXT}: ${etags_deps} $(CC) ${ALL_CFLAGS} $(etags_cflags) $(srcdir)/ctags.c $(etags_libs)
$(CC) ${ALL_CFLAGS} -DCTAGS ${etags_args}
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
$(config_h) $(config_h)
......
#define CTAGS 1
#include "etags.c"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment