]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
tubik: Don't install ubik.h or ubik_int.h
authorSimon Wilkinson <sxw@your-file-system.com>
Fri, 21 Dec 2012 09:35:28 +0000 (09:35 +0000)
committerPaul Smeddle <paul.smeddle@gmail.com>
Sat, 22 Dec 2012 11:58:44 +0000 (03:58 -0800)
Both ubik and tubik try to install ubik.h and ubik_int.h. This leads
to a race during which the header file may be missing, which upsets
parallel builds. Just don't install them from tubik to solve this
issue.

This is 1.6 only - a similar fix was done as part of the libtool
work on master in 035a2ea4a1a26141508cf3fa5918d40b7be6fc90

Change-Id: I18a7dcb425b2f805656ab8ff8c06b87bcca526c7
Reviewed-on: http://gerrit.openafs.org/8808
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Paul Smeddle <paul.smeddle@gmail.com>
src/tubik/Makefile.in

index 43e059ce785dbea39f4e8cb26393475899f81a8d..3a78dd11363195b945b7d19916c0b6dd4ce4f475 100644 (file)
@@ -40,9 +40,7 @@ LIBS=${RXOBJS} ${UTILOBJS} ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/liblwp.a \
 all: depinstall ${TOP_LIBDIR}/libubik_pthread.a udebug utst_server utst_client
 
 depinstall: \
-       ubik_int.cs.c ubik_int.xdr.c \
-       ${TOP_INCDIR}/ubik.h \
-       ${TOP_INCDIR}/ubik_int.h
+       ubik_int.cs.c ubik_int.xdr.c
 
 #
 # get the pthreaded rx stuff compiled here
@@ -269,15 +267,9 @@ ${TOP_LIBDIR}/libubik_pthread.a: libubik_pthread.a
 ${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 \