From 41cc413fa128de15188c7ae5c08a9f22605bade3 Mon Sep 17 00:00:00 2001 From: Alexander Nicholi Date: Thu, 15 Oct 2020 02:57:10 -0400 Subject: [PATCH] update all Makefiles to support PUBHFILES and PRVHFILES --- arr/Makefile | 20 ++++++++++---------- chkmath/Makefile | 18 +++++++++--------- decl/Makefile | 18 +++++++++--------- endian/Makefile | 20 ++++++++++---------- err/Makefile | 18 +++++++++--------- futils/Makefile | 18 +++++++++--------- himem/Makefile | 18 +++++++++--------- log/Makefile | 18 +++++++++--------- str/Makefile | 20 ++++++++++---------- table/Makefile | 20 ++++++++++---------- 10 files changed, 94 insertions(+), 94 deletions(-) diff --git a/arr/Makefile b/arr/Makefile index 1a51189..5dce919 100644 --- a/arr/Makefile +++ b/arr/Makefile @@ -38,21 +38,21 @@ FWORKS := 3PLIBS := # sources -SFILES := -CFILES := \ +SFILES := +CFILES := \ src/arr.c -HFILES := \ - include/uni/arr.h \ +CPPFILES := +PUBHFILES := \ + include/uni/arr.h +PRVHFILES := \ src/arr.h -CPPFILES := -HPPFILES := # test suite sources -TES_CFILES := \ +TES_CFILES := \ src/arr.tes.c -TES_HFILES := -TES_CPPFILES := -TES_HPPFILES := +TES_CPPFILES := +TES_PUBHFILES := +TES_PRVHFILES := # this defines all our usual targets include $(AQ)/lib/slick/targets.mk diff --git a/chkmath/Makefile b/chkmath/Makefile index c3737a1..518df9e 100644 --- a/chkmath/Makefile +++ b/chkmath/Makefile @@ -37,18 +37,18 @@ FWORKS := 3PLIBS := tes # sources -SFILES := -CFILES := -HFILES := \ +SFILES := +CFILES := +CPPFILES := +PUBHFILES := \ include/uni/chkmath.h -CPPFILES := -HPPFILES := +PRVHFILES := # test suite sources -TES_CFILES := -TES_HFILES := -TES_CPPFILES := -TES_HPPFILES := +TES_CFILES := +TES_CPPFILES := +TES_PUBHFILES := +TES_PRVHFILES := # this defines all our usual targets include $(AQ)/lib/slick/targets.mk diff --git a/decl/Makefile b/decl/Makefile index c4c04c6..886eb9b 100644 --- a/decl/Makefile +++ b/decl/Makefile @@ -37,9 +37,10 @@ FWORKS := 3PLIBS := tes # sources -SFILES := -CFILES := -HFILES := \ +SFILES := +CFILES := +CPPFILES := +PUBHFILES := \ include/uni/types/float.h \ include/uni/types/geo.h \ include/uni/types/int.h \ @@ -49,14 +50,13 @@ HFILES := \ include/uni/types/vec.h \ include/uni/decl.h \ include/uni/ver.h -CPPFILES := -HPPFILES := +PRVHFILES := # test suite sources -TES_CFILES := -TES_HFILES := -TES_CPPFILES := -TES_HPPFILES := +TES_CFILES := +TES_CPPFILES := +TES_PUBHFILES := +TES_PRVHFILES := # this defines all our usual targets include $(AQ)/lib/slick/targets.mk diff --git a/endian/Makefile b/endian/Makefile index c1755fb..806dfc0 100644 --- a/endian/Makefile +++ b/endian/Makefile @@ -34,21 +34,21 @@ FWORKS := # 3PLIBDIR is the base directory # 3PLIBS is the folder names in the base directory for each library 3PLIBDIR := 3rdparty -3PLIBS := tes +3PLIBS := # sources -SFILES := -CFILES := -HFILES := \ +SFILES := +CFILES := +CPPFILES := +PUBHFILES := \ include/uni/endian.h -CPPFILES := -HPPFILES := +PRVHFILES := # test suite sources -TES_CFILES := -TES_HFILES := -TES_CPPFILES := -TES_HPPFILES := +TES_CFILES := +TES_CPPFILES := +TES_PUBHFILES := +TES_PRVHFILES := # this defines all our usual targets include $(AQ)/lib/slick/targets.mk diff --git a/err/Makefile b/err/Makefile index f9bed28..7946fa9 100644 --- a/err/Makefile +++ b/err/Makefile @@ -37,19 +37,19 @@ FWORKS := 3PLIBS := tes # sources -SFILES := -CFILES := \ +SFILES := +CFILES := \ src/err.c -HFILES := \ +CPPFILES := +PUBHFILES := \ include/uni/err.h -CPPFILES := -HPPFILES := +PRVHFILES := # test suite sources -TES_CFILES := -TES_HFILES := -TES_CPPFILES := -TES_HPPFILES := +TES_CFILES := +TES_CPPFILES := +TES_PUBHFILES := +TES_PRVHFILES := # this defines all our usual targets include $(AQ)/lib/slick/targets.mk diff --git a/futils/Makefile b/futils/Makefile index 79a1df4..4eccc9e 100644 --- a/futils/Makefile +++ b/futils/Makefile @@ -37,19 +37,19 @@ FWORKS := 3PLIBS := tes # sources -SFILES := -CFILES := \ +SFILES := +CFILES := \ src/futils.c -HFILES := \ +CPPFILES := +PUBHFILES := \ include/uni/futils.h -CPPFILES := -HPPFILES := +PRVHFILES := # test suite sources -TES_CFILES := -TES_HFILES := -TES_CPPFILES := -TES_HPPFILES := +TES_CFILES := +TES_CPPFILES := +TES_PUBHFILES := +TES_PRVHFILES := # this defines all our usual targets include $(AQ)/lib/slick/targets.mk diff --git a/himem/Makefile b/himem/Makefile index 7bc0f89..7559124 100644 --- a/himem/Makefile +++ b/himem/Makefile @@ -37,25 +37,25 @@ FWORKS := 3PLIBS := tes # sources -SFILES := \ +SFILES := \ src/gbabios.s \ src/memcpy.s \ src/memset.s -CFILES := \ +CFILES := \ src/gbahimem.c \ src/memory.c -HFILES := \ +CPPFILES := +PUBHFILES := \ include/uni/memory.h +PRVHFILES := \ src/gbabios.h \ src/gbahimem.h -CPPFILES := -HPPFILES := # test suite sources -TES_CFILES := -TES_HFILES := -TES_CPPFILES := -TES_HPPFILES := +TES_CFILES := +TES_CPPFILES := +TES_PUBHFILES := +TES_PRVHFILES := # this defines all our usual targets include $(AQ)/lib/slick/targets.mk diff --git a/log/Makefile b/log/Makefile index 73743af..dec75b0 100644 --- a/log/Makefile +++ b/log/Makefile @@ -37,19 +37,19 @@ FWORKS := 3PLIBS := tes # sources -SFILES := -CFILES := \ +SFILES := +CFILES := \ src/log.c -HFILES := \ +CPPFILES := +PUBHFILES := \ include/uni/log.h -CPPFILES := -HPPFILES := +PRVHFILES := # test suite sources -TES_CFILES := -TES_HFILES := -TES_CPPFILES := -TES_HPPFILES := +TES_CFILES := +TES_CPPFILES := +TES_PUBHFILES := +TES_PRVHFILES := # this defines all our usual targets include $(AQ)/lib/slick/targets.mk diff --git a/str/Makefile b/str/Makefile index fc985da..a7c4709 100644 --- a/str/Makefile +++ b/str/Makefile @@ -37,25 +37,25 @@ FWORKS := 3PLIBS := tes # sources -SFILES := -CFILES := \ +SFILES := +CFILES := \ src/str.c \ src/utf8.c -HFILES := \ +CPPFILES := +PUBHFILES := \ include/uni/str.h \ - include/uni/utf8.h \ + include/uni/utf8.h +PRVHFILES := \ src/str.h \ src/utf8.h -CPPFILES := -HPPFILES := # test suite sources -TES_CFILES := \ +TES_CFILES := \ src/str.tes.c \ src/utf8.tes.c -TES_HFILES := -TES_CPPFILES := -TES_HPPFILES := +TES_CPPFILES := +TES_PUBHFILES := +TES_PRVHFILES := # this defines all our usual targets include $(AQ)/lib/slick/targets.mk diff --git a/table/Makefile b/table/Makefile index 12533b5..01dfcb9 100644 --- a/table/Makefile +++ b/table/Makefile @@ -37,20 +37,20 @@ FWORKS := 3PLIBS := tes # sources -SFILES := -CFILES := \ +SFILES := +CFILES := \ src/table.c -HFILES := \ - include/uni/table.h \ +CPPFILES := +PUBHFILES := \ + include/uni/table.h +PRVHFILES := \ src/table.h -CPPFILES := -HPPFILES := # test suite sources -TES_CFILES := -TES_HFILES := -TES_CPPFILES := -TES_HPPFILES := +TES_CFILES := +TES_CPPFILES := +TES_PUBHFILES := +TES_PRVHFILES := # this defines all our usual targets include $(AQ)/lib/slick/targets.mk