From 88869883b040ed3adf52f15509c5efab2e631fc3 Mon Sep 17 00:00:00 2001
From: Stephen Heumann <heumann1@illinois.edu>
Date: Sat, 27 Dec 2014 11:33:31 -0600
Subject: [PATCH] Update makefile, adding in functionality that was in extra
 scripts

---
 .indent.pro | 33 ---------------------------------
 Makefile    | 19 +++++++++++++++++++
 Makefile.mk | 34 +++++++++++++++++++++++++++++++++-
 build.gs    |  1 -
 texttogs    |  1 -
 5 files changed, 52 insertions(+), 36 deletions(-)
 delete mode 100644 .indent.pro
 delete mode 100755 build.gs
 delete mode 100644 texttogs

diff --git a/.indent.pro b/.indent.pro
deleted file mode 100644
index 492ecf1c7..000000000
--- a/.indent.pro
+++ /dev/null
@@ -1,33 +0,0 @@
---blank-lines-after-declarations
---blank-lines-after-procedures
---break-before-boolean-operator
---no-blank-lines-after-commas
---braces-on-if-line
---braces-on-struct-decl-line
---comment-indentation25
---declaration-comment-column25
---no-comment-delimiters-on-blank-lines
---cuddle-else
---continuation-indentation4
---case-indentation0
---else-endif-column33
---space-after-cast
---line-comments-indentation0
---declaration-indentation1
---dont-format-first-column-comments
---dont-format-comments
---honour-newlines
---indent-level4
-/* changed from 0 to 4 */
---parameter-indentation4
---line-length78 /* changed from 75 */
---continue-at-parentheses
---no-space-after-function-call-names
---dont-break-procedure-type
---dont-star-comments
---leave-optional-blank-lines
---dont-space-special-semicolon
---tab-size4
-/* additions by Mark */
---case-brace-indentation0
---leave-preprocessor-space
diff --git a/Makefile b/Makefile
index 87242b718..b1aaa87be 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,24 @@ SRCS = \
 	libbb/get.exec.path.c \
 	libbb/pgrp.c \
 	libbb/qsort.c
+
+HEADERS = \
+	include/NUM.APPLETS.h \
+	include/appltmetadata.h \
+	include/autoconf.h \
+	include/busybox.h \
+	include/libbb.h \
+	include/platform.h \
+	include/poll.h \
+	include/unicode.h \
+	include/xatonum.h \
+	shell/glob.h \
+	shell/match.h \
+	shell/math.h \
+	shell/random.h \
+	shell/shell.common.h \
+	libbb/xatonum.tmplt.c
+
 OBJS = $(SRCS:.c=.o)
 
 INCLUDES = -I include -I shell -I libbb
@@ -68,6 +86,7 @@ PROG = hush
 $(PROG): $(OBJS)
 	$(CC) $(LIBS) $(OBJS) -o $@
 
+$(OBJS): $(HEADERS)
 %.o: %.c
 	$(CC) $(INCLUDES) $(DEFINES) $(CFLAGS) -c $< -o $@
 
diff --git a/Makefile.mk b/Makefile.mk
index 527f798ed..4dc3bbb8f 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -70,7 +70,24 @@ LIBBB_D_SRC = \
 	libbb/unicode.c \
 	libbb/vfork.and.run.c \
 	libbb/waitpid.emul.c
-	
+
+HEADERS = \
+	include/NUM.APPLETS.h \
+	include/appltmetadata.h \
+	include/autoconf.h \
+	include/busybox.h \
+	include/libbb.h \
+	include/platform.h \
+	include/poll.h \
+	include/unicode.h \
+	include/xatonum.h \
+	shell/glob.h \
+	shell/match.h \
+	shell/math.h \
+	shell/random.h \
+	shell/shell.common.h \
+	libbb/xatonum.tmplt.c
+
 SRCS = $(MAIN_SRC) $(SHELL_OTHER_SRC) $(COREUTILS_SRC) $(LIBBB_A_SRC) \
 	$(LIBBB_B_SRC) $(LIBBB_C_SRC) $(LIBBB_D_SRC)
 OBJS = $(SRCS:.c=.o)
@@ -114,6 +131,7 @@ PROG = hush
 $(PROG): $(OBJS)
 	$(CC) $(LIBS) $(OBJS) -o $@
 
+$(OBJS): $(HEADERS)
 %.o: %.c
 	$(CC) $(INCLUDES) $(DEFINES) $(CFLAGS) -c $< -o $@ \
 		$(eq,$<,$(MAIN_SRC) -s$(STACKSIZE) -r) \
@@ -127,3 +145,17 @@ $(PROG): $(OBJS)
 .PHONY: clean
 clean:
 	$(RM) $(OBJS) $(ROOT) $(PROG)
+
+.PHONY: chtyp
+chtyp:
+	chtyp -l cc include/*.h coreutils/*.c libbb/*.c shell/*.c shell/*.h
+	chtyp -t txt LICENSE README* Makefile* notes/*
+
+.PHONY: build
+.SEQUENTIAL: build
+build: chtyp $(PROG)
+
+.PHONY: texttogs
+texttogs:
+	udl -g include/*.h coreutils/*.c libbb/*.c shell/*.c shell/*.h \
+		LICENSE README* Makefile* notes/*
diff --git a/build.gs b/build.gs
deleted file mode 100755
index bbaff8676..000000000
--- a/build.gs
+++ /dev/null
@@ -1 +0,0 @@
-chtyp -l cc include/*.h coreutils/*.c libbb/*.c shell/*.c shell/*.h; make $1
\ No newline at end of file
diff --git a/texttogs b/texttogs
deleted file mode 100644
index 9c78f306b..000000000
--- a/texttogs
+++ /dev/null
@@ -1 +0,0 @@
-udl -g include/*.h coreutils/*.c libbb/*.c shell/*.c shell/*.h Makefile
\ No newline at end of file