Move compat out of src.

diff --git a/src/compat/arc4random.c b/compat/arc4random.c
similarity index 100%
rename from src/compat/arc4random.c
rename to compat/arc4random.c

diff --git a/src/compat/arc4random.h b/compat/arc4random.h
similarity index 100%
rename from src/compat/arc4random.h
rename to compat/arc4random.h

diff --git a/src/compat/arc4random_uniform.c b/compat/arc4random_uniform.c
similarity index 100%
rename from src/compat/arc4random_uniform.c
rename to compat/arc4random_uniform.c

diff --git a/src/compat/arc4random_uniform.h b/compat/arc4random_uniform.h
similarity index 100%
rename from src/compat/arc4random_uniform.h
rename to compat/arc4random_uniform.h

diff --git a/src/compat/bitops.h b/compat/bitops.h
similarity index 100%
rename from src/compat/bitops.h
rename to compat/bitops.h

diff --git a/src/compat/dprintf.c b/compat/dprintf.c
similarity index 100%
rename from src/compat/dprintf.c
rename to compat/dprintf.c

diff --git a/src/compat/dprintf.h b/compat/dprintf.h
similarity index 100%
rename from src/compat/dprintf.h
rename to compat/dprintf.h

diff --git a/src/compat/endian.h b/compat/endian.h
similarity index 100%
rename from src/compat/endian.h
rename to compat/endian.h

diff --git a/src/compat/getline.c b/compat/getline.c
similarity index 100%
rename from src/compat/getline.c
rename to compat/getline.c

diff --git a/src/compat/getline.h b/compat/getline.h
similarity index 100%
rename from src/compat/getline.h
rename to compat/getline.h

diff --git a/src/compat/pidfile.c b/compat/pidfile.c
similarity index 100%
rename from src/compat/pidfile.c
rename to compat/pidfile.c

diff --git a/src/compat/pidfile.h b/compat/pidfile.h
similarity index 100%
rename from src/compat/pidfile.h
rename to compat/pidfile.h

diff --git a/src/compat/posix_spawn.c b/compat/posix_spawn.c
similarity index 100%
rename from src/compat/posix_spawn.c
rename to compat/posix_spawn.c

diff --git a/src/compat/posix_spawn.h b/compat/posix_spawn.h
similarity index 100%
rename from src/compat/posix_spawn.h
rename to compat/posix_spawn.h

diff --git a/src/compat/queue.h b/compat/queue.h
similarity index 100%
rename from src/compat/queue.h
rename to compat/queue.h

diff --git a/src/compat/reallocarray.c b/compat/reallocarray.c
similarity index 100%
rename from src/compat/reallocarray.c
rename to compat/reallocarray.c

diff --git a/src/compat/reallocarray.h b/compat/reallocarray.h
similarity index 100%
rename from src/compat/reallocarray.h
rename to compat/reallocarray.h

diff --git a/src/compat/strlcpy.c b/compat/strlcpy.c
similarity index 100%
rename from src/compat/strlcpy.c
rename to compat/strlcpy.c

diff --git a/src/compat/strlcpy.h b/compat/strlcpy.h
similarity index 100%
rename from src/compat/strlcpy.h
rename to compat/strlcpy.h

diff --git a/src/compat/strtoi.c b/compat/strtoi.c
similarity index 100%
rename from src/compat/strtoi.c
rename to compat/strtoi.c

diff --git a/src/compat/strtoi.h b/compat/strtoi.h
similarity index 100%
rename from src/compat/strtoi.h
rename to compat/strtoi.h

diff --git a/src/Makefile b/src/Makefile
index 1ab547fef71efe8d8d1e8bfb95f4d6ae76eb8408..625b027e62f51c0a2bfe4def2710186abcf19297 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,12 +13,13 @@ include ${TOP}/iconfig.mk
 
 CSTD?=         c99
 CFLAGS+=       -std=${CSTD}
-CPPFLAGS+=     -I${TOP} -I./crypt -I./
+CPPFLAGS+=     -I${TOP} -I${TOP}/src -I./crypt
 
 SRCS+=         ${DHCPCD_SRCS}
 DHCPCD_DEFS?=  dhcpcd-definitions.conf
 
-OBJS+=         ${SRCS:.c=.o} ${CRYPT_SRCS:.c=.o} ${COMPAT_SRCS:.c=.o}
+PCOMPAT_SRCS=  ${COMPAT_SRCS:compat/%=${TOP}/compat/%}
+OBJS+=         ${SRCS:.c=.o} ${CRYPT_SRCS:.c=.o} ${PCOMPAT_SRCS:.c=.o}
 
 MAN5=          dhcpcd.conf.5
 MAN8=          dhcpcd.8