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 9c3161a..4199b5a 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -11,8 +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@
@@ -32,6 +35,7 @@ AS = @AS@
 AFSD_LIBS = @AFSD_LIBS@
 AFSD_LDFLAGS = @AFSD_LDFLAGS@
 CC = @CC@
+CPP = @CPP@
 CCOBJ = @CCOBJ@
 CCXPG2 = @CCXPG2@
 CFLAGS = @CFLAGS@
@@ -40,13 +44,20 @@ 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@
 LINUX_VERS = @LINUX_VERSION@
 LWP_OPTMZ = @LWP_OPTMZ@
@@ -57,13 +68,17 @@ MT_CC = @MT_CC@
 MT_CFLAGS = @MT_CFLAGS@
 MT_LIBS = @MT_LIBS@
 MV = @MV@
+NO_STRIP_BIN = @NO_STRIP_BIN@
 OPTMZ = @OPTMZ@
 PAM_CFLAGS = @PAM_CFLAGS@
 PAM_LIBS = @PAM_LIBS@
-PINSTALL_LIBS = @PINSTALL_LIBS@
+PAM_OPTMZ = @PAM_OPTMZ@
+PAM_DBG = @PAM_DBG@
+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@
@@ -88,14 +103,6 @@ YACC = @YACC@
 #
 # Special build targets
 #
-dest_FS_CONV_OSF40D = @dest_FS_CONV_OSF40D@
-install_FS_CONV_OSF40D = @install_FS_CONV_OSF40D@
-FS_CONV_OSF40D = @FS_CONV_OSF40D@
-
-dest_FS_CONV_SOL26 = @dest_FS_CONV_SOL26@
-install_FS_CONV_SOL26 = @install_FS_CONV_SOL26@
-FS_CONV_SOL26 = @FS_CONV_SOL26@
-
 dest_XFS_SIZE_CHECK = @dest_XFS_SIZE_CHECK@
 install_XFS_SIZE_CHECK = @install_XFS_SIZE_CHECK@
 XFS_SIZE_CHECK = @XFS_SIZE_CHECK@
@@ -113,8 +120,6 @@ KERNELDIR = ../libafs
 # Build helper apps
 #
 COMPILE_ET = ${TOP_OBJDIR}/src/comerr/compile_et
-INSTALL = ${TOP_OBJDIR}/src/pinstall/pinstall
-INSTALLex = ${INSTALL} -m 755
 RXGEN = ${TOP_OBJDIR}/src/rxgen/rxgen
 SHELL = /bin/sh
 
@@ -122,11 +127,14 @@ 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.
+
+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}
-LDFLAGS=${XLDFLAGS}
+CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} $(CFLAGS_NOERROR)
+LDFLAGS=${XLDFLAGS} ${ARCHFLAGS}
 
 .c.o:
        $(CCOBJ) $(CFLAGS) -c $<