summary refs log tree commit diff
path: root/bin/cash
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-01-10 23:24:31 -0500
committerJune McEnroe <june@causal.agency>2019-01-10 23:24:31 -0500
commit54292651057096055e41cee807342b4f07fa708b (patch)
tree92165b459b4fedc26024b7571ae14c2cecbdd401 /bin/cash
parentClean up cash Makefile (diff)
downloadsrc-54292651057096055e41cee807342b4f07fa708b.tar.gz
src-54292651057096055e41cee807342b4f07fa708b.zip
Fix header dependencies in cash Makefile
Diffstat (limited to '')
-rw-r--r--bin/cash/.gitignore1
-rw-r--r--bin/cash/Makefile74
2 files changed, 43 insertions, 32 deletions
diff --git a/bin/cash/.gitignore b/bin/cash/.gitignore
index 674a2ed5..ed57be1a 100644
--- a/bin/cash/.gitignore
+++ b/bin/cash/.gitignore
@@ -1,4 +1,5 @@
 *.o
+.depend
 builtins.c
 builtins.h
 cash
diff --git a/bin/cash/Makefile b/bin/cash/Makefile
index 8d032dea..13c965f2 100644
--- a/bin/cash/Makefile
+++ b/bin/cash/Makefile
@@ -3,42 +3,55 @@ LDLIBS = -ledit
 
 -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
+SRCS += alias.c
+SRCS += arith_yacc.c
+SRCS += arith_yylex.c
+SRCS += cd.c
+SRCS += echo.c
+SRCS += error.c
+SRCS += eval.c
+SRCS += exec.c
+SRCS += expand.c
+SRCS += histedit.c
+SRCS += input.c
+SRCS += jobs.c
+SRCS += kill.c
+SRCS += mail.c
+SRCS += main.c
+SRCS += memalloc.c
+SRCS += miscbltin.c
+SRCS += mystring.c
+SRCS += options.c
+SRCS += output.c
+SRCS += parser.c
+SRCS += printf.c
+SRCS += redir.c
+SRCS += show.c
+SRCS += test.c
+SRCS += trap.c
+SRCS += var.c
 
 GENSRCS = builtins.c nodes.c syntax.c
 GENHDRS = builtins.h nodes.h syntax.h token.h
 
-OBJS += $(GENSRCS:.c=.o)
+SRCS += $(GENSRCS)
+OBJS = $(SRCS:.c=.o)
+
+all: tags cash .depend
 
 cash: $(OBJS)
 	$(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
 
+tags: *.h *.c
+	ctags -w *.h *.c
+
+.depend: $(SRCS) $(GENHDRS)
+	$(CC) $(CFLAGS) -MM $(SRCS) > .depend
+
+-include .depend
+
+$(OBJS): $(GENHDRS)
+
 builtins.c builtins.h: mkbuiltins builtins.def
 	sh mkbuiltins .
 
@@ -51,8 +64,5 @@ syntax.c syntax.h: mksyntax
 token.h: mktokens
 	sh mktokens
 
-# FIXME
-$(OBJS): *.h $(GENHDRS)
-
 clean:
-	rm -f cash $(OBJS) mknodes mksyntax $(GENSRCS) $(GENHDRS)
+	rm -f cash $(OBJS) mknodes mksyntax $(GENSRCS) $(GENHDRS) tags .depend
ad of as part of the struct. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-10parsing: fix header typoJason A. Donenfeld 2014-01-10cgit.c: Fix comment on bit mask hackLukas Fleischer * Formatting and spelling fixes. * A bit mask with the size of one byte only allows for storing 8 (not 255!) different flags. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10cgit.c: Use "else" for mutually exclusive branchesLukas Fleischer When parsing command line arguments, no pair of command line options can ever match simultaneously. Use "else if" blocks to reflect this. This change improves both readability and speed. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10ui-snapshot.c: Do not reinvent suffixcmp()Lukas Fleischer Use suffixcmp() from Git instead of reimplementing it. This is a preparation for moving to ends_with() in Git 1.8.6. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Refactor cgit_parse_snapshots_mask()Lukas Fleischer Use Git string lists instead of str{spn,cspn,ncmp}() magic. This significantly improves readability. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Disallow use of undocumented snapshot delimitersLukas Fleischer Since the introduction of selective snapshot format configuration in dc3c9b5 (allow selective enabling of snapshots, 2007-07-21), we allowed seven different delimiters for snapshot formats, while the documentation has always been clear about spaces being the only valid delimiter: The value is a space-separated list of zero or more of the values "tar", "tar.gz", "tar.bz2", "tar.xz" and "zip". Supporting the undocumented delimiters makes the code unnecessarily complex. Remove them. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Replace most uses of strncmp() with prefixcmp()Lukas Fleischer This is a preparation for replacing all prefix checks with either strip_prefix() or starts_with() when Git 1.8.6 is released. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-09README: Fix dependenciesLukas Fleischer * Remove the dependency on Git (which can be obtained automatically when building, using either the Git submodule or `make get-git`). * Use proper upstream names of dependencies. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-08README: Spelling and formatting fixesLukas Fleischer * Several small spelling and capitalization fixes. * Use consistent and better-looking formatting that is compatible with AsciiDoc (and partly compatible with RST). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-08Fix UTF-8 with syntax-highlighting.pyPřemysl Janouch Previously the script tried to encode output from Pygments with the ASCII codec, which failed. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Add a suggestion to the manpagePřemysl Janouch So that people wishing to use "enable-http-clone" don't have to find out the correct settings on their own. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix the example configurationPřemysl Janouch "enable-git-clone" doesn't exist, replaced with "enable-http-clone". Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix about-formatting.shPřemysl Janouch dash failed to parse the script. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix some spelling errorsPřemysl Janouch Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08filters: highlight.sh: add css comments for highlight 2.6 and 3.8Ferry Huberts