Use correct syntax for libtool version info

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

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index 75b6327..7b34846 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -56,6 +56,7 @@ LD = @LD@
 LDFLAGS_roken = @LDFLAGS_roken@
 LDFLAGS_hcrypto = @LDFLAGS_hcrypto@
 LDFLAGS_krb5 = @KRB5_LDFLAGS@
+CPPFLAGS_gssapi = @GSSAPI_CPPFLAGS@
 LEX = @LEX@
 LIB_AFSDB = @LIB_AFSDB@
 LIB_crypt = @LIB_crypt@
@@ -63,6 +64,7 @@ LIB_curses = @LIB_curses@
 LIB_hcrypto = @LIB_hcrypto@
 LIB_roken = @LIB_roken@
 LIB_krb5 = @KRB5_LIBS@
+LIB_gssapi = @GSSAPI_LIBS@
 LIBTOOL= @LIBTOOL@
 LIBS = @LIBS@
 LIB_LIBINTL = @LIB_libintl@
@@ -144,9 +146,9 @@ KERNELDIR = ../libafs
 #
 # Build helper apps
 #
-COMPILE_ET = ${TOP_OBJDIR}/src/comerr/compile_et
-CONFIGTOOL = ${TOP_OBJDIR}/src/config/config
-RXGEN = ${TOP_OBJDIR}/src/rxgen/rxgen
+COMPILE_ET = @COMPILE_ET_PATH@
+CONFIGTOOL = @CONFIGTOOL_PATH@
+RXGEN = @RXGEN_PATH@
 SHELL = @SHELL@
 LWPTOOL = ${TOP_SRCDIR}/config/lwptool
 
@@ -196,6 +198,13 @@ RUN_CC_NOQ=$(RUN_CC_NOQ_V$(V))
 RUN_LD_NOQ=$(RUN_LD_NOQ_V$(V))
 
 #
+# Generate error table header and the source files independently for
+# parallel make.
+#
+COMPILE_ET_H=${COMPILE_ET} -emit h
+COMPILE_ET_C=${COMPILE_ET} -emit c
+
+#
 # Common/standard cflags/paths/etc
 # Cflags defaults, will be overridden later if necessary
 #
@@ -238,14 +247,14 @@ LT_revision=0
 LT_age=0
 
 # Basic rule to link a shared library.
-LT_LDLIB_shlib=$(LIBTOOL) --quiet --mode=link --tag=CC \
-               $(MT_CC) -rpath $(libdir) \
-               $(PTH_LDFLAGS) $(PTH_CFLAGS) $(LDFLAGS_$(@)) \
-               -o $@ \
-               -no-undefined \
-               -export-symbols $@.sym \
-               -version-info=$(LT_current):$(LT_revision):$(LT_age)
+LT_LDLIB_shlib_missing=$(LIBTOOL) --quiet --mode=link --tag=CC \
+                      $(MT_CC) -rpath $(libdir) \
+                      $(PTH_LDFLAGS) $(PTH_CFLAGS) $(LDFLAGS_$(@)) \
+                      -o $@ \
+                      -export-symbols ${srcdir}/$@.sym \
+                      -version-info $(LT_current):$(LT_revision):$(LT_age)
 
+LT_LDLIB_shlib=$(LT_LDLIB_shlib_missing) -no-undefined
 
 # Link a static convenience library (contains no PIC code)
 LT_LDLIB_static=$(LIBTOOL) --quiet --mode=link --tag=CC \
@@ -287,6 +296,10 @@ LT_LDRULE_static = $(RUN_LD) $(LIBTOOL) --quiet --mode=link --tag=CC \
                             $(MT_CC) -static $(PTH_LDFLAGS) $(PTH_CFLAGS) \
                             $(LDFLAGS_$(@)) -o $@
 
+LT_LDRULE_static_NOQ = $(RUN_LD_NOQ) $(LIBTOOL) --quiet --mode=link --tag=CC \
+                            $(MT_CC) -static $(PTH_LDFLAGS) $(PTH_CFLAGS) \
+                            $(LDFLAGS_$(@)) -o $@
+
 LT_INSTALL_DATA=$(LIBTOOL) --quiet --mode=install $(INSTALL_DATA)
 LT_INSTALL_PROGRAM=$(LIBTOOL) --quiet --mode=install $(INSTALL_PROGRAM)