Add CCRULE variants for each build type

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

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index 24e16fd..a3fbd67 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -24,7 +24,7 @@ mandir=@mandir@
 prefix=@prefix@
 sbindir=@sbindir@
 sysconfdir=@sysconfdir@
-viceetcdir=@viceetcdir@
+viceetcdir=@viceetcdir@/
 
 
 #
@@ -36,6 +36,7 @@ AFSD_LIBS = @AFSD_LIBS@
 AFSD_LDFLAGS = @AFSD_LDFLAGS@
 CC = @CC@
 CPP = @CPP@
+CPPFLAGS_roken = @CPPFLAGS_roken@
 CCOBJ = @CCOBJ@
 CCXPG2 = @CCXPG2@
 CFLAGS = @CFLAGS@
@@ -43,14 +44,19 @@ CP = @CP@
 DARWIN_INFOFILE=@DARWIN_INFOFILE@
 DBG = @DBG@
 DEST = @DEST@
+DIR_roken = @DIR_roken@
 FSINCLUDES = @FSINCLUDES@
 INCLUDE_LIBINTL = @INCLUDE_libintl@
 KERN_DBG = @KERN_DBG@
 KERN_OPTMZ = @KERN_OPTMZ@
 LD = @LD@
+LDFLAGS_roken = @LDFLAGS_roken@
 LEX = @LEX@
 LIB_AFSDB = @LIB_AFSDB@
 LIB_crypt = @LIB_crypt@
+LIB_curses = @LIB_curses@
+LIB_hcrypto = @LIB_hcrypto@
+LIB_roken = @LIB_roken@
 LIBS = @LIBS@
 LIB_LIBINTL = @LIB_libintl@
 LINUX_KERNEL_PATH = @LINUX_KERNEL_PATH@
@@ -76,8 +82,11 @@ PAM_DBG = @PAM_DBG@
 PATH_CPP = @PATH_CPP@
 RANLIB = @RANLIB@
 REGEX_OBJ = @REGEX_OBJ@
+REGEX_OBJ_PIC = @REGEX_OBJ_PIC@
 RM = @RM@
 RXDEBUG = @RXDEBUG@
+ROKEN_HEADERS = @ROKEN_HEADERS@
+ROKEN_LIBOBJS = @LIBOBJS@
 SHLIB_CFLAGS = @SHLIB_CFLAGS@
 SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
 SHLIB_LINKER = @SHLIB_LINKER@
@@ -88,7 +97,6 @@ TOP_LIBDIR = @TOP_LIBDIR@
 TOP_JLIBDIR= @TOP_JLIBDIR@
 TOP_OBJDIR = @TOP_OBJDIR@
 TOP_SRCDIR = @TOP_SRCDIR@
-TXLIBS = @TXLIBS@
 VPATH = ${srcdir}
 XCFLAGS64 = @XCFLAGS64@
 XCFLAGS = @XCFLAGS@
@@ -105,6 +113,8 @@ YACC = @YACC@
 dest_XFS_SIZE_CHECK = @dest_XFS_SIZE_CHECK@
 install_XFS_SIZE_CHECK = @install_XFS_SIZE_CHECK@
 XFS_SIZE_CHECK = @XFS_SIZE_CHECK@
+AIX32 = @AIX32@
+AIX64 = @AIX64@
 
 #
 # Paths to build dirs
@@ -129,11 +139,31 @@ SHELL = /bin/sh
 # -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}
+COMMON_INCL=$(MODULE_INCLUDE) -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} \
+           -I${srcdir} -I. 
 
-CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} $(CFLAGS_NOERROR)
-LDFLAGS=${XLDFLAGS} ${ARCHFLAGS}
+COMMON_CFLAGS=$(CFLAGS) ${DBG} ${OPTMZ} ${COMMON_INCL} ${INCLUDE_LIBINTL} \
+             $(CPPFLAGS_libroken)
+
+COMMON_LDFLAGS=$(LDFLAGS) $(LDFLAGS_roken) $(DBG) $(OPTMZ)
+
+# LWP Flags
+LWP_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) $(XCFLAGS) $(ARCHFLAGS)
+LWP_LDFLAGS=$(COMMON_LDFLAGS) $(MODULE_LDFLAGS) $(XLDFLAGS) $(ARCHFLAGS)
+LWP_CCRULE=$(CCOBJ) $(LWP_CFLAGS) $(CFLAGS_$(@)) -o $@ -c
+
+# Pthreaded
+PTH_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) $(MT_CFLAGS)
+PTH_LDFLAGS=$(COMMON_LDFLAGS) $(MODULE_LDFLAGS) $(MT_LDFLAGS)
+PTH_CCRULE=$(MT_CC) $(PTH_CFLAGS) $(CFLAGS_$(@)) -o $@ -c
+
+# Shared
+SHD_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) $(MT_CFLAGS) $(SHLIB_CFLAGS)
+SHD_LDFLAGS=$(COMMON_LDFLAGS) $(MODULE_LDFLAGS) $(SHLIB_LDFLAGS)
+SHD_CCRULE=$(MT_CC) $(SHD_CFLAGS) $(CFLAGS_$(@)) -o $@ -c
+
+# Default rules. These will be overriden if the module Makefile specifically
+# includes a particular type (lwp, pthread, or shared)
+
+AFS_LDRULE =$(CC) $(AFS_LDFLAGS) $(AFS_CFLAGS) $(LDFLAGS_$(@)) -o $@
 
-.c.o:
-       $(CCOBJ) $(CFLAGS) -c $<