Add OpenAFS build machinery for libhcrypto

[openafs.git] / src / config / Makefile.config.in

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index e4f6dba..4199b5a 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -11,9 +11,11 @@ afssrvbindir=@afssrvbindir@
 afskerneldir=@afskerneldir@
 afssrvlibexecdir=@afssrvlibexecdir@
 afssrvsbindir=@afssrvsbindir@
+afsdatadir=@afsdatadir@
 bindir=@bindir@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
+datadir=@datadir@
 includedir=@includedir@
 libdir=@libdir@
 libexecdir=@libexecdir@
@@ -42,13 +44,18 @@ DARWIN_INFOFILE=@DARWIN_INFOFILE@
 DBG = @DBG@
 DEST = @DEST@
 FSINCLUDES = @FSINCLUDES@
+INCLUDE_LIBINTL = @INCLUDE_libintl@
 KERN_DBG = @KERN_DBG@
 KERN_OPTMZ = @KERN_OPTMZ@
 LD = @LD@
 LEX = @LEX@
 LIB_AFSDB = @LIB_AFSDB@
+LIB_crypt = @LIB_crypt@
+LIB_hcrypto = @LIB_hcrypto@
 LIBS = @LIBS@
+LIB_LIBINTL = @LIB_libintl@
 LINUX_KERNEL_PATH = @LINUX_KERNEL_PATH@
+LINUX_KERNEL_BUILD = @LINUX_KERNEL_BUILD@
 LINUX_LIBAFS_NAME = @LINUX_LIBAFS_NAME@
 LINUX_KERNEL_PACKAGING = @LINUX_KERNEL_PACKAGING@
 LINUX_VERSION = @LINUX_VERSION@
@@ -71,6 +78,7 @@ PATH_CPP = @PATH_CPP@
 RANLIB = @RANLIB@
 REGEX_OBJ = @REGEX_OBJ@
 RM = @RM@
+RXDEBUG = @RXDEBUG@
 SHLIB_CFLAGS = @SHLIB_CFLAGS@
 SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
 SHLIB_LINKER = @SHLIB_LINKER@
@@ -119,10 +127,13 @@ SHELL = /bin/sh
 # Common/standard cflags/paths/etc
 # Cflags defaults, will be overridden later if necessary
 #
-COMMON_INCL=-I${TOP_OBJDIR}/src/config -I. -I${srcdir} -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -I${TOP_INCDIR}/rx -I${TOP_OBJDIR} -I${TOP_SRCDIR} -I${TOP_OBJDIR}/src
-COMMON_CFLAGS=${DBG} ${OPTMZ} ${COMMON_INCL}
+# -I. and -I${srcdir} are only needed for objdir builds - we should
+# conditionalise them on that.
 
-CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS}
+COMMON_INCL=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${srcdir} -I.
+COMMON_CFLAGS=${DBG} ${OPTMZ} ${COMMON_INCL} ${INCLUDE_LIBINTL}
+
+CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} $(CFLAGS_NOERROR)
 LDFLAGS=${XLDFLAGS} ${ARCHFLAGS}
 
 .c.o: