diff options
-rw-r--r-- | CHANGELOG.txt | 2 | ||||
-rw-r--r-- | zp/GNUmakefile | 47 |
2 files changed, 20 insertions, 29 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 79a8d04..172fe9b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -82,6 +82,8 @@ * Rename private namespace: priv => prv; * Rename isarith to isari; +* Clean up makefile; + # 0.0.2 * Migrate to CMake; diff --git a/zp/GNUmakefile b/zp/GNUmakefile index f37ccea..e9f0432 100644 --- a/zp/GNUmakefile +++ b/zp/GNUmakefile @@ -149,7 +149,7 @@ HDRS := \ include/zp/str \ include/zp/str.h \ include/zp/bs.d/isconsteval.ii \ - include/zp/bs.d/syscl.ii \ + include/zp/bs.d/syscl.ii \ include/zp/bs.d/trp.ii \ include/zp/bs.d/urch.ii \ include/zp/mem.d/cpy.ii \ @@ -172,13 +172,13 @@ HDRS := \ include/zp/mth.d/vec2/cvec.ii \ include/zp/mth.d/vec3/cvec.ii \ include/zp/mth.d/vec4/cvec.ii \ - include/zp/prv/arc.h \ - include/zp/prv/chr.h \ - include/zp/prv/flt.h \ - include/zp/prv/imp.h \ - include/zp/prv/int.h \ - include/zp/prv/std.h \ - include/zp/prv/sys.h \ + include/zp/prv/arc.h \ + include/zp/prv/chr.h \ + include/zp/prv/flt.h \ + include/zp/prv/imp.h \ + include/zp/prv/int.h \ + include/zp/prv/std.h \ + include/zp/prv/sys.h \ include/zp/str.d/fmt.ii \ include/zp/str.d/fmtlen.ii \ include/zp/str.d/numdig.ii \ @@ -195,30 +195,19 @@ HDRS := \ include/zp/str.d/utf8enc.ii \ include/zp/str.d/utf8enclen.ii \ include/zp/str.d/win1252dec.ii \ - include/zp/str.d/win1252enc.ii \ - -CFLAGS := \ - -Iinclude \ - -Oz \ - -Wall \ - -Wextra \ - -ffreestanding \ - -fshort-enums \ - -nostdlib \ - -pipe \ - -std=$(stdc) + include/zp/str.d/win1252enc.ii CXXFLAGS := \ -Dzp_prv_nconsteval \ - -Iinclude \ - -Oz \ - -Wall \ - -Wextra \ - -ffreestanding \ - -fno-exceptions \ - -fshort-enums \ - -nostdlib \ - -pipe \ + -Iinclude \ + -Oz \ + -Wall \ + -Wextra \ + -ffreestanding \ + -fno-exceptions \ + -fshort-enums \ + -nostdlib \ + -pipe \ -std=$(stdcxx) ifeq "$(shrlib)" "true" |