first stab at getting execve.c only compiled when needed

1 files changed, 5 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index 302beb3..7a9f2e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,29 +8,20 @@ HISTBIN =
 HISTMAN =
 endif
 
-# Pick correct version of rdwr.c, depending on whether we have restartable
-# system calls or not.
-
-# Include execve.c only if kernel doesn't handle `#!' magic numbers.
-
 if H_R_S
-if N_H_B
-OPT_SRC = execve.c rdwr-bsd.c
+RDWR = rdwr-bsd.c
 else
-OPT_SRC = rdwr-bsd.c
+RDWR = rdwr.c
 endif
-else
+
 if N_H_B
-OPT_SRC = execve.c rdwr.c
-else
-OPT_SRC = rdwr.c
-endif
+EXECVE = execve.c
 endif
 
 bin_PROGRAMS = rc
 noinst_PROGRAMS = $(HISTBIN)
 
-rc_SOURCES = @ADDON@ builtins.c except.c exec.c fn.c footobar.c getopt.c glob.c glom.c hash.c heredoc.c input.c lex.c list.c main.c match.c nalloc.c open.c print.c redir.c sigmsgs.c signal.c status.c tree.c utils.c var.c wait.c walk.c which.c y.tab.c $(OPT_SRC)
+rc_SOURCES = @ADDON@ builtins.c except.c exec.c fn.c footobar.c getopt.c glob.c glom.c hash.c heredoc.c input.c lex.c list.c main.c match.c nalloc.c open.c print.c redir.c sigmsgs.c signal.c status.c tree.c utils.c var.c wait.c walk.c which.c y.tab.c $(RDWR) $(EXECVE)
 
 EXTRA_rc_SOURCES = execve.c rdwr.c rdwr-bsd.c