Make --enable-pthreaded-ubik do what it claims

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

diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in
index 7ba412f..b4ca2cf 100644 (file)
--- a/src/tubik/Makefile.in
+++ b/src/tubik/Makefile.in
@@ -9,11 +9,8 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.pthread
 
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
+ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 
 UBIK=$(srcdir)/../ubik
 RX=$(srcdir)/../rx
@@ -30,11 +27,10 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
 RXOBJS = rx_pthread.o
 
 UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o \
-       volparse.o flipbase64.o softsig.o hostparse.o snprintf.o \
-       pthread_glock.o
+       volparse.o flipbase64.o softsig.o hostparse.o pthread_glock.o
 
 LIBS=${RXOBJS} ${UTILOBJS} ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \
-     ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \
+     ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libcmd.a \
      ${TOP_LIBDIR}/libsys.a ${XLIBS} ${MT_LIBS}
 
 all: depinstall ${TOP_LIBDIR}/libubik_pthread.a udebug utst_server utst_client
@@ -88,9 +84,6 @@ softsig.o: ${UTIL}/softsig.c
 hostparse.o: ${UTIL}/hostparse.c
        $(AFS_CCRULE) $(UTIL)/hostparse.c
 
-snprintf.o: ${UTIL}/snprintf.c
-       $(AFS_CCRULE) $(UTIL)/snprintf.c
-
 pthread_glock.o: ${UTIL}/pthread_glock.c
        $(AFS_CCRULE) $(UTIL)/pthread_glock.c
 
@@ -212,22 +205,30 @@ ubik_int.xdr.o: ubik_int.xdr.c
 #
 test: all
 
-install: ${DESTDIR}${libdir}/libubik_pthread.a udebug
-       ${INSTALL} udebug ${DESTDIR}${bindir}/udebug
-       ${INSTALL} udebug ${DESTDIR}${afssrvbindir}/udebug
-
-${DEST}/bin/udebug ${DEST}/root.server/usr/afs/bin/udebug: udebug
-       ${INSTALL} $? $@
-
-${DEST}/lib/libubik_pthread.a: libubik_pthread.a
-       ${INSTALL} $? $@
-
-${DEST}/include/ubik.h: ubik.h
-       ${INSTALL} $? $@
-
-${DEST}/include/ubik_int.h: ubik_int.h
-       ${INSTALL} $? $@
-
+install: libubik_pthread.a ubik.h ubik_int.h udebug
+       ${INSTALL} -d ${DESTDIR}${libdir}
+       ${INSTALL} -d ${DESTDIR}${includedir}
+       ${INSTALL} -d ${DESTDIR}${bindir}
+       ${INSTALL} -d ${DESTDIR}${afssrvbindir}
+       ${INSTALL_DATA} libubik_pthread.a ${DESTDIR}${libdir}/libubik_pthread.a
+       if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then                 \
+           ${INSTALL_PROGRAM} udebug ${DESTDIR}${bindir}/udebug;          \
+           ${INSTALL_PROGRAM} udebug ${DESTDIR}${afssrvbindir}/udebug;    \
+           ${INSTALL_DATA} ubik.h ${DESTDIR}${includedir}/ubik.h;         \
+           ${INSTALL_DATA} ubik_int.h ${DESTDIR}${includedir}/ubik_int.h; \
+       fi
+
+dest: libubik_pthread.a ubik.h ubik_int.h udebug
+       ${INSTALL} -d ${DEST}/lib
+       ${INSTALL} -d ${DEST}/include
+       ${INSTALL} -d ${DEST}/root.server/usr/afs/bin
+       ${INSTALL_DATA} libubik_pthread.a ${DEST}/lib/libubik_pthread.a
+       if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then                    \
+           ${INSTALL_PROGRAM} udebug ${DEST}/bin/udebug;                     \
+           ${INSTALL_PROGRAM} udebug ${DEST}/root.server/usr/afs/bin/udebug; \
+           ${INSTALL_DATA} ubik.h ${DEST}/include/ubik.h;                    \
+           ${INSTALL_DATA} ubik_int.h ${DEST}/include/ubik_int.h;            \
+       fi
 #
 # Misc. targets
 #
@@ -237,27 +238,13 @@ clean:
 
 include ../config/Makefile.version
 
-
-${DESTDIR}${libdir}/libubik_pthread.a: libubik_pthread.a
-       ${INSTALL} $? $@
-
 ${TOP_LIBDIR}/libubik_pthread.a: libubik_pthread.a
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/ubik.h: ubik.h
-       ${INSTALL} $? $@
-
 ${TOP_INCDIR}/ubik.h: ubik.h
        ${INSTALL} $? $@
 
-${DESTDIR}${includedir}/ubik_int.h: ubik_int.h
-       ${INSTALL} $? $@
-
 ${TOP_INCDIR}/ubik_int.h: ubik_int.h
        ${INSTALL} $? $@
 
-dest: \
-       ${DEST}/lib/libubik_pthread.a \
-       ${DEST}/bin/udebug \
-       ${DEST}/root.server/usr/afs/bin/udebug