diff --git a/Makefile b/Makefile index 15bb5a1..e3f4a61 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CFLAGS := -ggdb -Wall -pedantic +CFLAGS := -ggdb -Wall -pedantic SRC_DIR := src OBJ_DIR := src/obj @@ -10,7 +10,7 @@ OBJS := $(SRCS:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o) $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(SRC_DIR)/%.h $(CC) $(CFLAGS) -c $< -o $@ -server: $(OBJS) +bbs-server: $(OBJS) $(CC) $(CFLAGS) $^ -o $(BIN_DIR)/$@ ifneq (clean, $(MAKECMDGOALS)) @@ -21,10 +21,10 @@ deps.mk: $(SRCS) $(CC) -MM $^ > $(SRC_DIR)/$@ clean: - rm -f $(OBJ_DIR)/*.o $(BIN_DIR)/server + rm -f $(OBJ_DIR)/*.o $(BIN_DIR)/bbs-server run: - $(BIN_DIR)/server wdir + $(BIN_DIR)/bbs-server wdir valgrind: - valgrind --tool=memcheck ./server wdir \ No newline at end of file + valgrind --tool=memcheck $(BIN_DIR)/bbs-server wdir \ No newline at end of file diff --git a/setup.sh b/setup.sh index face531..a91def6 100755 --- a/setup.sh +++ b/setup.sh @@ -15,6 +15,9 @@ touch wdir/storage/testfile.txt printf 'testfile.txt\nuser\n1\nThis is a test file. You may not need it.\n:END:\n' >> wdir/file_descriptions -echo "Lorem ipsum dolor sit amet consectetur adipiscing elit. Quisque faucibus ex sapien vitae pellentesque sem placerat. In id cursus mi pretium tellus duis convallis. Tempus leo eu aenean sed diam urna tempor. Pulvinar vivamus fringilla lacus nec metus bibendum egestas. Iaculis massa nisl malesuada lacinia integer nunc posuere. \ +echo "Lorem ipsum dolor sit amet consectetur adipiscing elit. Quisque faucibus ex sapien vitae pellentesque sem placerat. \ +In id cursus mi pretium tellus duis convallis. \ +Tempus leo eu aenean sed diam urna tempor. Pulvinar vivamus fringilla lacus nec metus bibendum egestas. \ +Iaculis massa nisl malesuada lacinia integer nunc posuere. \ Ut hendrerit semper vel class aptent taciti sociosqu. Ad litora torquent per \ conubia nostra inceptos himenaeos." >> wdir/storage/testfile.txt \ No newline at end of file