mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-30 11:56:04 +02:00
Code

29214: use -I rather than explicit path to find headers

This commit is contained in:
Peter Stephenson 2011-05-10 16:40:27 +00:00
parent c59e19cd77
commit de06c83334
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,10 @@
2011-05-10 Peter Stephenson <pws@csr.com>
* 29214: Src/Makemod.in.in, Src/mkmakemod.sh, Src/zsh.mdd: use
-I to find headers in order to allow #include'ing generated
headers from non-generated headers when the build tree is
separate from the source tree.
* 29191 (Danek) and 29203 (with fixes): Doc/Zsh/params.yo,
Src/params.c: make TERMINFO variable special.
@ -14637,5 +14642,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5287 $
* $Revision: 1.5288 $
*****************************************************

4
Src/Makemod.in.in
View File

@ -47,8 +47,8 @@ dir_src = $(dir_top)/Src
DNCFLAGS =
COMPILE = $(CC) -c -I. $(CPPFLAGS) $(DEFS) $(CFLAGS) $(D@L@CFLAGS)
DLCOMPILE = $(CC) -c -I. $(CPPFLAGS) $(DEFS) -DMODULE $(CFLAGS) $(DLCFLAGS)
COMPILE = $(CC) -c -I. -I$(dir_top)/Src -I$(sdir_top)/Src -I$(sdir_top)/Src/Zle -I$(sdir) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(D@L@CFLAGS)
DLCOMPILE = $(CC) -c -I. -I$(dir_top)/Src -I$(sdir_top)/Src -I$(sdir_top)/Src/Zle -I$(sdir) $(CPPFLAGS) $(DEFS) -DMODULE $(CFLAGS) $(DLCFLAGS)
LINK = $(CC) $(LDFLAGS) $(EXELDFLAGS) $(EXTRA_LDFLAGS) -o $@
DLLINK = $(DLLD) $(LDFLAGS) $(LIBLDFLAGS) $(DLLDFLAGS) -o $@

6
Src/mkmakemod.sh
View File

@ -383,11 +383,7 @@ if $first_stage; then
if test -n "$headers"; then
echo " echo '/* Extra headers for this module */'; \\"
echo " for hdr in $headers; do \\"
echo " if test -f \$\$hdr; then \\"
echo " echo '# include \"'\$\$hdr'\"'; \\"
echo " else \\"
echo " echo '# include \"\$(sdir)/'\$\$hdr'\"'; \\"
echo " fi; \\"
echo " echo '# include \"'\$\$hdr'\"'; \\"
echo " done; \\"
echo " echo; \\"
fi

2
Src/zsh.mdd
View File

@ -127,7 +127,7 @@ clean.zsh:
# This is not properly part of this module, but it is built as if it were.
main.o: main.c zsh.mdh main.epro
$(CC) -c -I. $(CPPFLAGS) $(DEFS) $(CFLAGS) -o $@ $(sdir)/main.c
$(CC) -c -I. -I$(sdir_top)/Src $(CPPFLAGS) $(DEFS) $(CFLAGS) -o $@ $(sdir)/main.c
main.syms: $(PROTODEPS)
proto.zsh: main.epro