디렉토리 구조 단순화

Author: notJoon

Makefile

@@ -3,15 +3,15 @@
 CC      ?= cc
 CSTD    ?= c11
 CFLAGS  ?= -std=$(CSTD) -Wall -Wextra -Wpedantic -Wshadow -Wconversion -O2 -g
-CPPFLAGS = -Iinclude
+CPPFLAGS = -I.
 LDFLAGS ?=
 LDLIBS  ?= -lz
 
 BIN        := git-client
 BUILD      := build
 TEST_BUILD := $(BUILD)/tests
-SRC        := $(shell find src -name '*.c')
-OBJ        := $(patsubst src/%.c,$(BUILD)/%.o,$(SRC))
+SRC        := $(wildcard *.c)
+OBJ        := $(patsubst %.c,$(BUILD)/%.o,$(SRC))
 DEP        := $(OBJ:.o=.d)
 SHA1_TEST  := $(TEST_BUILD)/test_sha1
 ZLIB_TEST  := $(TEST_BUILD)/test_zlib
@@ -26,47 +26,47 @@ build: $(BUILD)/$(BIN) ## Compile the binary
 $(BUILD)/$(BIN): $(OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
-$(BUILD)/%.o: src/%.c
+$(BUILD)/%.o: %.c
 	@mkdir -p $(dir $@)
 	$(CC) $(CFLAGS) $(CPPFLAGS) -MMD -MP -c -o $@ $<
 
 run: build ## Build and run the binary (pass ARGS="...")
 	./$(BUILD)/$(BIN) $(ARGS)
 
 test: ## Run tests
-	@test -f include/sha1.h || { echo "missing include/sha1.h; implement the SHA-1 API from spec.md first"; exit 1; }
-	@test -f src/sha1.c || { echo "missing src/sha1.c; implement the SHA-1 API from spec.md first"; exit 1; }
-	@test -f include/zlib_wrap.h || { echo "missing include/zlib_wrap.h; implement the zlib API from spec.md first"; exit 1; }
-	@test -f src/zlib_wrap.c || { echo "missing src/zlib_wrap.c; implement the zlib API from spec.md first"; exit 1; }
-	@test -f include/object.h || { echo "missing include/object.h; implement the object API from spec.md first"; exit 1; }
-	@test -f src/object.c || { echo "missing src/object.c; implement the Blob object store from spec.md first"; exit 1; }
+	@test -f sha1.h || { echo "missing sha1.h; implement the SHA-1 API from spec.md first"; exit 1; }
+	@test -f sha1.c || { echo "missing sha1.c; implement the SHA-1 API from spec.md first"; exit 1; }
+	@test -f zlib_wrap.h || { echo "missing zlib_wrap.h; implement the zlib API from spec.md first"; exit 1; }
+	@test -f zlib_wrap.c || { echo "missing zlib_wrap.c; implement the zlib API from spec.md first"; exit 1; }
+	@test -f object.h || { echo "missing object.h; implement the object API from spec.md first"; exit 1; }
+	@test -f object.c || { echo "missing object.c; implement the Blob object store from spec.md first"; exit 1; }
 	$(MAKE) $(SHA1_TEST)
 	$(MAKE) $(ZLIB_TEST)
 	$(MAKE) $(OBJECT_TEST)
 	./$(SHA1_TEST)
 	./$(ZLIB_TEST)
 	./$(OBJECT_TEST)
 
-$(SHA1_TEST): tests/test_sha1.c src/sha1.c include/sha1.h
+$(SHA1_TEST): tests/test_sha1.c sha1.c sha1.h
 	@mkdir -p $(dir $@)
-	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ tests/test_sha1.c src/sha1.c $(LDFLAGS) $(LDLIBS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ tests/test_sha1.c sha1.c $(LDFLAGS) $(LDLIBS)
 
-$(ZLIB_TEST): tests/test_zlib.c src/zlib_wrap.c include/zlib_wrap.h
+$(ZLIB_TEST): tests/test_zlib.c zlib_wrap.c zlib_wrap.h
 	@mkdir -p $(dir $@)
-	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ tests/test_zlib.c src/zlib_wrap.c $(LDFLAGS) $(LDLIBS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ tests/test_zlib.c zlib_wrap.c $(LDFLAGS) $(LDLIBS)
 
-$(OBJECT_TEST): tests/test_object.c src/object.c src/sha1.c src/zlib_wrap.c include/object.h include/sha1.h include/zlib_wrap.h
+$(OBJECT_TEST): tests/test_object.c object.c sha1.c zlib_wrap.c object.h sha1.h zlib_wrap.h
 	@mkdir -p $(dir $@)
-	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ tests/test_object.c src/object.c src/sha1.c src/zlib_wrap.c $(LDFLAGS) $(LDLIBS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ tests/test_object.c object.c sha1.c zlib_wrap.c $(LDFLAGS) $(LDLIBS)
 
 fmt: ## Format sources with clang-format
-	@find src include tests -name '*.c' -o -name '*.h' | xargs clang-format -i
+	@clang-format -i *.c *.h tests/*.c
 
 fmt-check: ## Verify formatting without writing
-	@find src include tests -name '*.c' -o -name '*.h' | xargs clang-format --dry-run --Werror
+	@clang-format --dry-run --Werror *.c *.h tests/*.c
 
 tidy: ## Run clang-tidy over sources
-	@find src -name '*.c' | xargs -I{} clang-tidy {} -- $(CPPFLAGS) $(CFLAGS)
+	@clang-tidy $(wildcard *.c) -- $(CPPFLAGS) $(CFLAGS)
 
 clean: ## Remove build artifacts
 	rm -rf $(BUILD)

README.md

@@ -29,10 +29,9 @@ make help       # list targets
 ## Layout
 
 ```
-src/
-  main.c            entry point
-  cli/commands/     command implementations
-  core/             core git logic (objects, refs, index, ...)
-include/git-client/ public headers
-tests/              tests (framework TBD)
+main.c              entry point
+object.c / .h       object store (blob, tree, commit)
+sha1.c / .h         SHA-1 hashing
+zlib_wrap.c / .h    zlib compression wrappers
+tests/              tests
 ```