From 78eaa13a02ff4ddd90265c2f44634dd458c69478 Mon Sep 17 00:00:00 2001
From: Eyal Rozenberg <eyalroz1@gmx.com>
Date: Fri, 12 Nov 2021 01:02:55 +0200
Subject: [PATCH] Resolves #58: Moving `printf.h` and `printf.c` into the
 `src/` directory (and marking it as an include directory).

---
 CMakeLists.txt           | 6 +++---
 printf.c => src/printf.c | 0
 printf.h => src/printf.h | 0
 test/aliasing.c          | 2 +-
 test/autotest.cpp        | 2 +-
 test/test_suite.cpp      | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename printf.c => src/printf.c (100%)
 rename printf.h => src/printf.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd823d76..39b70d4c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,9 +63,9 @@ else()
 endif()
 set(GENERATED_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
 configure_file("printf_config.h.in" "${GENERATED_INCLUDE_DIR}/printf_config.h" @ONLY)
-target_sources(printf PRIVATE printf.c "${GENERATED_INCLUDE_DIR}/printf_config.h" printf.h)
+target_sources(printf PRIVATE src/printf.c "${GENERATED_INCLUDE_DIR}/printf_config.h" src/printf.h)
 target_compile_definitions(printf PRIVATE PRINTF_INCLUDE_CONFIG_H)
-target_include_directories(printf PRIVATE "$<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>")
+target_include_directories(printf PRIVATE src "$<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>")
 
 set_property(TARGET printf PROPERTY C_STANDARD 99)
 set_property(TARGET printf PROPERTY C_STANDARD_REQUIRED ON)
@@ -134,7 +134,7 @@ install(
 )
 
 install(
-	FILES "printf.h"
+	FILES "src/printf.h"
 	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 )
 
diff --git a/printf.c b/src/printf.c
similarity index 100%
rename from printf.c
rename to src/printf.c
diff --git a/printf.h b/src/printf.h
similarity index 100%
rename from printf.h
rename to src/printf.h
diff --git a/test/aliasing.c b/test/aliasing.c
index a1539f0f..051de43f 100644
--- a/test/aliasing.c
+++ b/test/aliasing.c
@@ -2,7 +2,7 @@
 
 // Note: If we include <printf.h>, that will likely get us the
 // the file /usr/include/printf.h on Linux systems
-#include "../printf.h"
+#include "../src/printf.h"
 
 int strcmp_(const char* lhs, const char* rhs)
 {
diff --git a/test/autotest.cpp b/test/autotest.cpp
index 0aaab7ca..753f2621 100644
--- a/test/autotest.cpp
+++ b/test/autotest.cpp
@@ -12,7 +12,7 @@
 #include <assert.h>
 
 #include "printf_config.h"
-#include "../printf.h"
+#include "../src/printf.h"
 
 #ifndef PRINTF_ALIAS_STANDARD_FUNCTION_NAMES
 #define PRINTF_ALIAS_STANDARD_FUNCTION_NAMES 0
diff --git a/test/test_suite.cpp b/test/test_suite.cpp
index 065eab43..6978a16c 100644
--- a/test/test_suite.cpp
+++ b/test/test_suite.cpp
@@ -46,8 +46,8 @@ typedef SSIZE_T ssize_t;
 
 namespace test {
   // use functions in own test namespace to avoid stdio conflicts
-  #include "../printf.h"
-  #include "../printf.c"
+  #include "../src/printf.h"
+  #include "../src/printf.c"
 } // namespace test
 
 #define CAPTURE_AND_PRINT(printer_, ...)                  \