From 0fbf892195537bfe297135ccee6814dd2c948f37 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 10 Jan 2019 22:53:33 -0500 Subject: Clean up cash Makefile --- bin/cash/.gitignore | 1 + bin/cash/Makefile | 59 +++++++++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/bin/cash/.gitignore b/bin/cash/.gitignore index dc34782b..674a2ed5 100644 --- a/bin/cash/.gitignore +++ b/bin/cash/.gitignore @@ -2,6 +2,7 @@ builtins.c builtins.h cash +config.mk mknodes mksyntax nodes.c diff --git a/bin/cash/Makefile b/bin/cash/Makefile index 30a3d22d..8d032dea 100644 --- a/bin/cash/Makefile +++ b/bin/cash/Makefile @@ -1,39 +1,40 @@ CFLAGS += -std=c99 -Wall -Wextra -DSHELL LDLIBS = -ledit -SHSRCS += alias.c -SHSRCS += arith_yacc.c -SHSRCS += arith_yylex.c -SHSRCS += cd.c -SHSRCS += echo.c -SHSRCS += error.c -SHSRCS += eval.c -SHSRCS += exec.c -SHSRCS += expand.c -SHSRCS += histedit.c -SHSRCS += input.c -SHSRCS += jobs.c -SHSRCS += kill.c -SHSRCS += mail.c -SHSRCS += main.c -SHSRCS += memalloc.c -SHSRCS += miscbltin.c -SHSRCS += mystring.c -SHSRCS += options.c -SHSRCS += output.c -SHSRCS += parser.c -SHSRCS += printf.c -SHSRCS += redir.c -SHSRCS += show.c -SHSRCS += test.c -SHSRCS += trap.c -SHSRCS += var.c +-include config.mk + +OBJS += alias.o +OBJS += arith_yacc.o +OBJS += arith_yylex.o +OBJS += cd.o +OBJS += echo.o +OBJS += error.o +OBJS += eval.o +OBJS += exec.o +OBJS += expand.o +OBJS += histedit.o +OBJS += input.o +OBJS += jobs.o +OBJS += kill.o +OBJS += mail.o +OBJS += main.o +OBJS += memalloc.o +OBJS += miscbltin.o +OBJS += mystring.o +OBJS += options.o +OBJS += output.o +OBJS += parser.o +OBJS += printf.o +OBJS += redir.o +OBJS += show.o +OBJS += test.o +OBJS += trap.o +OBJS += var.o GENSRCS = builtins.c nodes.c syntax.c GENHDRS = builtins.h nodes.h syntax.h token.h -SRCS = $(SHSRCS) $(GENSRCS) -OBJS = $(SRCS:.c=.o) +OBJS += $(GENSRCS:.c=.o) cash: $(OBJS) $(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@ -- cgit 1.4.1