GNO Makefile updates

1) Rename to Makefile.mk
2) Use *.o rather than *.a for object files
3) Reduce stack size to 4096 (may reduce further later)
This commit is contained in:
Stephen Heumann 2014-12-15 16:35:18 -06:00
parent d0dd867542
commit 12d172a1d9
2 changed files with 6 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# The *_SRC variables are used to define segments; see the "%.a" recipe. # The *_SRC variables are used to define segments; see the "%.o" recipe.
# shell/hush.c is divided into segments as specified within the file itself. # shell/hush.c is divided into segments as specified within the file itself.
MAIN_SRC = shell/hush.c MAIN_SRC = shell/hush.c
@ -73,7 +73,7 @@ LIBBB_D_SRC = \
SRCS = $(MAIN_SRC) $(SHELL_OTHER_SRC) $(COREUTILS_SRC) $(LIBBB_A_SRC) \ SRCS = $(MAIN_SRC) $(SHELL_OTHER_SRC) $(COREUTILS_SRC) $(LIBBB_A_SRC) \
$(LIBBB_B_SRC) $(LIBBB_C_SRC) $(LIBBB_D_SRC) $(LIBBB_B_SRC) $(LIBBB_C_SRC) $(LIBBB_D_SRC)
OBJS = $(SRCS:.c=.a) OBJS = $(SRCS:.c=.o)
ROOT = $(MAIN_SRC:.c=.root) ROOT = $(MAIN_SRC:.c=.root)
SHELL_OTHER_SEG = -SSHELLOTHER SHELL_OTHER_SEG = -SSHELLOTHER
@ -102,8 +102,8 @@ LIBS = -l/usr/lib/libtermcap.204
# optimize bit 3 set (no stack repair code). # optimize bit 3 set (no stack repair code).
# Optimize bit 6 breaks some standard-compliant varargs code, # Optimize bit 6 breaks some standard-compliant varargs code,
# and bits 0, 4, and 5 have known bugs. Disable for now. # and bits 0, 4, and 5 have known bugs. Disable for now.
CFLAGS = -i -w -a0 -O8 CFLAGS = -i -w -a1 -O8
STACKSIZE = 8192 STACKSIZE = 4096
.IF $(DEBUG) .IF $(DEBUG)
CFLAGS += -g -DDEBUG CFLAGS += -g -DDEBUG
@ -114,7 +114,7 @@ PROG = hush
$(PROG): $(OBJS) $(PROG): $(OBJS)
$(CC) $(LIBS) $(OBJS) -o $@ $(CC) $(LIBS) $(OBJS) -o $@
%.a: %.c %.o: %.c
$(CC) $(INCLUDES) $(DEFINES) $(CFLAGS) -c $< -o $@ \ $(CC) $(INCLUDES) $(DEFINES) $(CFLAGS) -c $< -o $@ \
$(eq,$<,$(MAIN_SRC) -s$(STACKSIZE) -r) \ $(eq,$<,$(MAIN_SRC) -s$(STACKSIZE) -r) \
$(!eq,$(SHELL_OTHER_SRC:s/$<//),$(SHELL_OTHER_SRC) $(SHELL_OTHER_SEG)) \ $(!eq,$(SHELL_OTHER_SRC:s/$<//),$(SHELL_OTHER_SRC) $(SHELL_OTHER_SEG)) \

View File

@ -1 +1 @@
chtyp -l cc include/*.h coreutils/*.c libbb/*.c shell/*.c shell/*.h; make -i $1 chtyp -l cc include/*.h coreutils/*.c libbb/*.c shell/*.c shell/*.h; make $1