diff --git a/Doxyfile b/Doxyfile index 3ab9535..52a8cb6 100644 --- a/Doxyfile +++ b/Doxyfile @@ -864,7 +864,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = src doc/index.md +INPUT = src doc/index.md include # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/Makefile b/Makefile index bcb62e8..e1ec4cb 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ MAKEFLAGS="-j $(grep -c ^processor /proc/cpuinfo)" CXXFLAGS:=$(CXXFLAGS) -std=c++20 -Wall -Wextra -Werror=switch -Werror=return-type -Werror=unused-result -Wno-maybe-uninitialized -CPPFLAGS:=$(CPPFLAGS) -Ilib/expected/ -Ilib/ut/ -Ilib/midi/include -Isrc/ -Ilib/bestline/ +CPPFLAGS:=$(CPPFLAGS) -Ilib/expected/ -Ilib/ut/ -Ilib/midi/include -Iinclude/ -Ilib/bestline/ RELEASE_FLAGS=-O3 DEBUG_FLAGS=-O0 -ggdb -fsanitize=undefined -DDebug CXX=g++ @@ -47,19 +47,19 @@ test: unit-tests debug: bin/debug/musique -bin/%.o: src/%.cc src/*.hh +bin/%.o: src/%.cc include/*.hh @echo "CXX $@" @$(CXX) $(CXXFLAGS) $(RELEASE_FLAGS) $(CPPFLAGS) -o $@ $< -c -bin/musique: $(Release_Obj) bin/main.o bin/bestline.o src/*.hh lib/midi/libmidi-alsa.a +bin/musique: $(Release_Obj) bin/main.o bin/bestline.o include/*.hh lib/midi/libmidi-alsa.a @echo "CXX $@" @$(CXX) $(CXXFLAGS) $(RELEASE_FLAGS) $(CPPFLAGS) -o $@ $(Release_Obj) bin/bestline.o bin/main.o $(LDFLAGS) $(LDLIBS) -bin/debug/musique: $(Debug_Obj) bin/debug/main.o bin/bestline.o src/*.hh +bin/debug/musique: $(Debug_Obj) bin/debug/main.o bin/bestline.o include/*.hh @echo "CXX $@" @$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(CPPFLAGS) -o $@ $(Debug_Obj) bin/bestline.o bin/debug/main.o $(LDFLAGS) $(LDLIBS) -bin/debug/%.o: src/%.cc src/*.hh +bin/debug/%.o: src/%.cc include/*.hh @echo "CXX $@" @$(CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $(CPPFLAGS) -o $@ $< -c @@ -81,7 +81,7 @@ unit-test-coverage: rm -rf bin/debug xdg-open coverage/index.html -doc: Doxyfile src/*.cc src/*.hh +doc: Doxyfile src/*.cc include/*.hh doxygen doc-open: doc diff --git a/README.md b/README.md index 05240b5..7c51d01 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,8 @@ $ make bin/musique ├── lib Zewnętrzne zależności projektu │   ├── expected │   └── ut -└── src Główny katalog z kodem źródłowym +└── include Główny katalog z plikami nagłówkowymi +└── src Główny katalog z plikami źródłowymi └── tests Katalog z testami jednostkowymi ``` diff --git a/src/musique.hh b/include/musique.hh similarity index 100% rename from src/musique.hh rename to include/musique.hh