freelance-updates-20011031

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

diff --git a/src/update/Makefile.in b/src/update/Makefile.in
index 5a70d8e..47c524b 100644 (file)
--- a/src/update/Makefile.in
+++ b/src/update/Makefile.in
@@ -5,8 +5,24 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
-DESTDIR=@DESTDIR@
-SRCDIR=@SRCDIR@
+DEST=@DEST@
+TOP_INCDIR=@TOP_INCDIR@
+TOP_LIBDIR=@TOP_LIBDIR@
+TOP_OBJDIR=@TOP_OBJDIR@
+srcdir=@srcdir@
+VPATH=${srcdir}
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+sbindir=@sbindir@
+libexecdir=@libexecdir@
+libdir=@libdir@
+includedir=@includedir@
+mandir=@mandir@
+afssrvbindir=@afssrvbindir@
+afssrvsbindir=@afssrvsbindir@
+afssrvlibexecdir=@afssrvlibexecdir@
+COMPILE_ET=${TOP_OBJDIR}/src/comerr/compile_et
 TOP_SRCDIR=@TOP_SRCDIR@
 SYS_NAME=@AFS_SYSNAME@
 
@@ -14,20 +30,20 @@ SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-LIBS =         ${SRCDIR}/lib/afs/libauth.a \
-       ${SRCDIR}/lib/librxkad.a \
-       ${SRCDIR}/lib/libdes.a \
-       ${SRCDIR}/lib/librx.a \
-       ${SRCDIR}/lib/liblwp.a \
-       ${SRCDIR}/lib/afs/libcom_err.a \
-       ${SRCDIR}/lib/afs/util.a \
-       ${SRCDIR}/lib/afs/libsys.a 
+LIBS=${TOP_LIBDIR}/libauth.a \
+       ${TOP_LIBDIR}/librxkad.a \
+       ${TOP_LIBDIR}/libdes.a \
+       ${TOP_LIBDIR}/librx.a \
+       ${TOP_LIBDIR}/liblwp.a \
+       ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/util.a \
+       ${TOP_LIBDIR}/libsys.a
 
-CFLAGS= -I${SRCDIR}/include -I${TOP_SRCDIR}/config ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} -I${TOP_INCDIR} -I${TOP_OBJDIR}/src/config ${XCFLAGS}
 
-RXGEN=${SRCDIR}/bin/rxgen
+RXGEN=${TOP_OBJDIR}/src/rxgen/rxgen
 
-all: install
+all: upserver upclient
 
 #
 # Build targets
@@ -42,19 +58,31 @@ utils.o: utils.c update.h global.h
 
 client.o server.o: update.h global.h AFS_component_version_number.c
 
-update.cs.c update.ss.c update.er.c update.h: update.xg
-       ${RXGEN} update.xg
+update.cs.c: update.xg
+       ${RXGEN} -C -o $@ ${srcdir}/update.xg
+
+update.ss.c: update.xg
+       ${RXGEN} -S -o $@ ${srcdir}/update.xg
+
+update.xdr.c: update.xg
+       ${RXGEN} -c -o $@ ${srcdir}/update.xg
+
+update.h: update.xg
+       ${RXGEN} -h -o $@ ${srcdir}/update.xg
+
+update.cs.c: update.h
+upcate.ss.c: update.h
+update.er.c: update.h
 
 #
 # Installation targets
 #
-install : ${DESTDIR}/root.server/usr/afs/bin/upserver \
-       ${DESTDIR}/root.server/usr/afs/bin/upclient
+install : ${DESTDIR}${afssrvlibexecdir}/upserver ${DESTDIR}${afssrvlibexecdir}/upclient
 
-${DESTDIR}/root.server/usr/afs/bin/upserver: upserver
+${DEST}/root.server/usr/afs/bin/upserver: upserver
        ${INSTALL} $? $@
 
-${DESTDIR}/root.server/usr/afs/bin/upclient: upclient
+${DEST}/root.server/usr/afs/bin/upclient: upclient
        ${INSTALL} $? $@
 
 #
@@ -66,3 +94,11 @@ clean:
 
 include ../config/Makefile.version
 
+${DESTDIR}${afssrvlibexecdir}/upserver: upserver
+       ${INSTALL} $? $@
+
+${DESTDIR}${afssrvlibexecdir}/upclient: upclient
+       ${INSTALL} $? $@
+
+dest: ${DEST}/root.server/usr/afs/bin/upserver ${DEST}/root.server/usr/afs/bin/upclient
+