single-header creation refactor

3 files changed, 11 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 553c6bc..1fe6142 100644
--- a/Makefile
+++ b/Makefile
@@ -68,14 +68,19 @@ build: pkmacros
 build: pkmem-types
 build: pkmem
 build: pkstr
-	@sed "1d; s/@@PK_VERSION@@/$(VERSION)/g; s/@@YEAR@@/`date -u +%%Y`/g;" pk.h.in > tmp
-	cat tmp \
+	cat pk.h.in \
 	pkmacros.h \
 	pkmem-types.h \
 	pkmem.h \
 	pkstr.h \
 	> pk.h
-	rm tmp
+	sed -i -r \
+		-e "s/@@PK_VERSION@@/$(VERSION)/g" \
+		-e "s/@@YEAR@@/`date -u +%Y`/g" \
+		-e "/deleteme/d" \
+		-e "/vim:/d" \
+		pk.h
+
 
 test-pkmacros: test/pkmacros.o
 	$(CC) -g -O0 -std=c2x $(CFLAGS) -o test/$@ $^ $(LDFLAGS)
diff --git a/pkmem.h b/pkmem.h
index 4896cf1..ec6719d 100644
--- a/pkmem.h
+++ b/pkmem.h
@@ -1,9 +1,8 @@
 #ifndef PK_MEM_H
 #define PK_MEM_H
 
-#include "./pkmem-types.h"
-#include "./pkmacros.h"
-
+#include "./pkmem-types.h" /* deleteme */
+#include "./pkmacros.h" /* deleteme */
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -31,7 +30,6 @@ void* pk_new_bkt(size_t sz, size_t alignment, struct pk_membucket* bkt);
 void pk_delete_base(const void* ptr, size_t sz);
 void pk_delete_bkt(const void* ptr, size_t sz, struct pk_membucket* bkt);
 
-
 #if defined(__cplusplus)
 
 #include <type_traits>
diff --git a/pkstr.h b/pkstr.h
index 75d6801..429a234 100644
--- a/pkstr.h
+++ b/pkstr.h
@@ -25,8 +25,7 @@ int pk_compare_cstr(const struct pk_cstr *lhs, const struct pk_cstr *rhs);
 
 #ifdef PK_IMPL_STR
 
-#include "./pkmacros.h"
-
+#include "./pkmacros.h" /* deleteme */
 #include <string.h>
 
 struct pk_str