diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..49bc29c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +bin/* +obj/* diff --git a/Makefile b/Makefile index e6c1dd1..2d1298b 100644 --- a/Makefile +++ b/Makefile @@ -3,23 +3,31 @@ OBJ=obj SRC=src CC = gcc +CFLAGS = -Wextra -Wall LDLIBS = -lncurses +NCURSES_H=/usr/include/ncurses.h -${BIN}/nms: ${OBJ}/nms.o ${OBJ}/main.o - $(CC) -o $@ $^ $(LDLIBS) +all: nms sneakers -sneakers: ${OBJ}/nms.o ${OBJ}/sneakers.o - $(CC) -o ${BIN}/$@ $^ $(LDLIBS) +nms: $(OBJ)/nms.o $(OBJ)/main.o | $(BIN) + $(CC) $(CFLAGS) -o $(BIN)/$@ $^ $(LDLIBS) -${OBJ}/main.o: ${SRC}/main.c ${SRC}/nms.h - $(CC) -o $@ -c ${SRC}/main.c +sneakers: $(OBJ)/nms.o $(OBJ)/sneakers.o | $(BIN) + $(CC) $(CFLAGS) -o $(BIN)/$@ $^ $(LDLIBS) -${OBJ}/sneakers.o: ${SRC}/sneakers.c ${SRC}/nms.h - $(CC) -o $@ -c ${SRC}/sneakers.c +$(OBJ)/%.o: $(SRC)/%.c | $(OBJ) + $(CC) $(CFLAGS) -o $@ -c $< -${OBJ}/nms.o: ${SRC}/nms.c ${SRC}/nms.h - $(CC) -o $@ -c ${SRC}/nms.c +$(BIN): + mkdir $(BIN) + +$(OBJ): + mkdir $(OBJ) + +$(NCURSES_H): + sudo apt-get update + sudo apt-get install ncurses-dev clean: - rm -f ${BIN}/* - rm -f $(OBJ)/* + rm -rf $(BIN) + rm -rf $(OBJ) diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index d6b7ef3..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/obj/.gitignore b/obj/.gitignore deleted file mode 100644 index d6b7ef3..0000000 --- a/obj/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index b70b6d7..0000000 --- a/src/.gitignore +++ /dev/null @@ -1 +0,0 @@ -nms diff --git a/src/nms.c b/src/nms.c index bdce6ae..a413fa3 100644 --- a/src/nms.c +++ b/src/nms.c @@ -54,7 +54,6 @@ char nms_exec(NmsArgs *args) { int termSizeRows, termSizeCols; int c, n, x = 0, y = 0; int r_time, r_time_l, r_time_s; - int ms, ls; bool first = true; char ret = 0; diff --git a/src/sneakers.c b/src/sneakers.c index ed819e6..f02ab7f 100644 --- a/src/sneakers.c +++ b/src/sneakers.c @@ -5,7 +5,7 @@ #include "nms.h" int main(void) { - int l, termLines, termCols, spaces = 0; + int termCols, spaces = 0; char input; char display[2000]; char *head1Left = "DATANET PROC RECORD: 45-3456-W-3452"; @@ -27,7 +27,6 @@ int main(void) { // Get terminal dimentions (needed for centering) struct winsize w; ioctl(0, TIOCGWINSZ, &w); - termLines = w.ws_row; termCols = w.ws_col; // Start building the display string