From: Keith Busch Date: Thu, 13 Feb 2020 17:59:08 +0000 (-0800) Subject: Move ccan up a directory X-Git-Tag: v1.0-rc0~174 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ab9c473661432321142fe24e962d671cc22436c7;p=users%2Fsagi%2Flibnvme.git Move ccan up a directory This will make it easier to generate library documentation when the source is not mixed with external libraries. Signed-off-by: Keith Busch --- diff --git a/src/ccan/ccan/array_size/LICENSE b/ccan/ccan/array_size/LICENSE similarity index 100% rename from src/ccan/ccan/array_size/LICENSE rename to ccan/ccan/array_size/LICENSE diff --git a/src/ccan/ccan/array_size/_info b/ccan/ccan/array_size/_info similarity index 100% rename from src/ccan/ccan/array_size/_info rename to ccan/ccan/array_size/_info diff --git a/src/ccan/ccan/array_size/array_size.h b/ccan/ccan/array_size/array_size.h similarity index 100% rename from src/ccan/ccan/array_size/array_size.h rename to ccan/ccan/array_size/array_size.h diff --git a/src/ccan/ccan/build_assert/LICENSE b/ccan/ccan/build_assert/LICENSE similarity index 100% rename from src/ccan/ccan/build_assert/LICENSE rename to ccan/ccan/build_assert/LICENSE diff --git a/src/ccan/ccan/build_assert/_info b/ccan/ccan/build_assert/_info similarity index 100% rename from src/ccan/ccan/build_assert/_info rename to ccan/ccan/build_assert/_info diff --git a/src/ccan/ccan/build_assert/build_assert.h b/ccan/ccan/build_assert/build_assert.h similarity index 100% rename from src/ccan/ccan/build_assert/build_assert.h rename to ccan/ccan/build_assert/build_assert.h diff --git a/src/ccan/ccan/check_type/LICENSE b/ccan/ccan/check_type/LICENSE similarity index 100% rename from src/ccan/ccan/check_type/LICENSE rename to ccan/ccan/check_type/LICENSE diff --git a/src/ccan/ccan/check_type/_info b/ccan/ccan/check_type/_info similarity index 100% rename from src/ccan/ccan/check_type/_info rename to ccan/ccan/check_type/_info diff --git a/src/ccan/ccan/check_type/check_type.h b/ccan/ccan/check_type/check_type.h similarity index 100% rename from src/ccan/ccan/check_type/check_type.h rename to ccan/ccan/check_type/check_type.h diff --git a/src/ccan/ccan/container_of/LICENSE b/ccan/ccan/container_of/LICENSE similarity index 100% rename from src/ccan/ccan/container_of/LICENSE rename to ccan/ccan/container_of/LICENSE diff --git a/src/ccan/ccan/container_of/_info b/ccan/ccan/container_of/_info similarity index 100% rename from src/ccan/ccan/container_of/_info rename to ccan/ccan/container_of/_info diff --git a/src/ccan/ccan/container_of/container_of.h b/ccan/ccan/container_of/container_of.h similarity index 100% rename from src/ccan/ccan/container_of/container_of.h rename to ccan/ccan/container_of/container_of.h diff --git a/src/ccan/ccan/endian/LICENSE b/ccan/ccan/endian/LICENSE similarity index 100% rename from src/ccan/ccan/endian/LICENSE rename to ccan/ccan/endian/LICENSE diff --git a/src/ccan/ccan/endian/_info b/ccan/ccan/endian/_info similarity index 100% rename from src/ccan/ccan/endian/_info rename to ccan/ccan/endian/_info diff --git a/src/ccan/ccan/endian/endian.h b/ccan/ccan/endian/endian.h similarity index 100% rename from src/ccan/ccan/endian/endian.h rename to ccan/ccan/endian/endian.h diff --git a/src/ccan/ccan/list/LICENSE b/ccan/ccan/list/LICENSE similarity index 100% rename from src/ccan/ccan/list/LICENSE rename to ccan/ccan/list/LICENSE diff --git a/src/ccan/ccan/list/_info b/ccan/ccan/list/_info similarity index 100% rename from src/ccan/ccan/list/_info rename to ccan/ccan/list/_info diff --git a/src/ccan/ccan/list/list.c b/ccan/ccan/list/list.c similarity index 100% rename from src/ccan/ccan/list/list.c rename to ccan/ccan/list/list.c diff --git a/src/ccan/ccan/list/list.h b/ccan/ccan/list/list.h similarity index 100% rename from src/ccan/ccan/list/list.h rename to ccan/ccan/list/list.h diff --git a/src/ccan/ccan/minmax/LICENSE b/ccan/ccan/minmax/LICENSE similarity index 100% rename from src/ccan/ccan/minmax/LICENSE rename to ccan/ccan/minmax/LICENSE diff --git a/src/ccan/ccan/minmax/_info b/ccan/ccan/minmax/_info similarity index 100% rename from src/ccan/ccan/minmax/_info rename to ccan/ccan/minmax/_info diff --git a/src/ccan/ccan/minmax/minmax.h b/ccan/ccan/minmax/minmax.h similarity index 100% rename from src/ccan/ccan/minmax/minmax.h rename to ccan/ccan/minmax/minmax.h diff --git a/src/ccan/ccan/short_types/LICENSE b/ccan/ccan/short_types/LICENSE similarity index 100% rename from src/ccan/ccan/short_types/LICENSE rename to ccan/ccan/short_types/LICENSE diff --git a/src/ccan/ccan/short_types/short_types.h b/ccan/ccan/short_types/short_types.h similarity index 100% rename from src/ccan/ccan/short_types/short_types.h rename to ccan/ccan/short_types/short_types.h diff --git a/src/ccan/ccan/str/LICENSE b/ccan/ccan/str/LICENSE similarity index 100% rename from src/ccan/ccan/str/LICENSE rename to ccan/ccan/str/LICENSE diff --git a/src/ccan/ccan/str/_info b/ccan/ccan/str/_info similarity index 100% rename from src/ccan/ccan/str/_info rename to ccan/ccan/str/_info diff --git a/src/ccan/ccan/str/debug.c b/ccan/ccan/str/debug.c similarity index 100% rename from src/ccan/ccan/str/debug.c rename to ccan/ccan/str/debug.c diff --git a/src/ccan/ccan/str/str.c b/ccan/ccan/str/str.c similarity index 100% rename from src/ccan/ccan/str/str.c rename to ccan/ccan/str/str.c diff --git a/src/ccan/ccan/str/str.h b/ccan/ccan/str/str.h similarity index 100% rename from src/ccan/ccan/str/str.h rename to ccan/ccan/str/str.h diff --git a/src/ccan/ccan/str/str_debug.h b/ccan/ccan/str/str_debug.h similarity index 100% rename from src/ccan/ccan/str/str_debug.h rename to ccan/ccan/str/str_debug.h diff --git a/src/ccan/licenses/BSD-MIT b/ccan/licenses/BSD-MIT similarity index 100% rename from src/ccan/licenses/BSD-MIT rename to ccan/licenses/BSD-MIT diff --git a/src/ccan/licenses/CC0 b/ccan/licenses/CC0 similarity index 100% rename from src/ccan/licenses/CC0 rename to ccan/licenses/CC0 diff --git a/src/ccan/tools/configurator/configurator.c b/ccan/tools/configurator/configurator.c similarity index 100% rename from src/ccan/tools/configurator/configurator.c rename to ccan/tools/configurator/configurator.c diff --git a/src/Makefile b/src/Makefile index 57b56242..7e004fc1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,7 +6,7 @@ prefix ?= /usr includedir ?= $(prefix)/include libdir ?= $(prefix)/lib -CCANDIR=ccan/ +CCANDIR=../ccan/ CFLAGS ?= -g -fomit-frame-pointer -O2 -I/usr/include -Invme/ -I$(CCANDIR) -include ../config-host.h -D_GNU_SOURCE override CFLAGS += -Wall -fPIC