Update the makefile for building on modern *nix systems. Rename to "Makefile" so we can build with just "make."

Also remove an unused variable that clang was warning about.
This commit is contained in:
Stephen Heumann 2014-12-15 16:47:12 -06:00
parent 12d172a1d9
commit e96ed4b46a
3 changed files with 2 additions and 9 deletions

View File

@ -60,9 +60,8 @@ INCLUDES = -I include -I shell -I libbb
DEFINES = -Dhush_main=main -DNDEBUG
LIBS = -ltermcap
OCC_FLAGS = -i -w -a0
# Add $(OCC_FLAGS) to CFLAGS on dmake
CFLAGS = $(null, $(OCC_FLAGS))
# CFLAGS suitable for clang or GCC
CFLAGS = -std=c89 -funsigned-char -Wall -Wno-comment -Wno-format-security
PROG = hush

View File

@ -1,4 +0,0 @@
#!/bin/sh
# Make with appropriate flags for gcc or clang on modern *nix systems
make -f Makefile.gmake CFLAGS="-std=c89 -funsigned-char -Wall -Wno-format-security -Wno-comment"

View File

@ -19,8 +19,6 @@ jmp_buf die_jmp;
void FAST_FUNC xfunc_die(void)
{
int forked;
if (die_sleep) {
if ((ENABLE_FEATURE_PREFER_APPLETS || ENABLE_HUSH)
&& die_sleep < 0