more-makefiles-cleanup-20010829

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

diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index 09e9e4f..27d525f 100644 (file)
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -13,53 +13,27 @@ SYS_NAME=@AFS_SYSNAME@
 SHELL = /bin/sh
 
 include ../config/Makefile.${SYS_NAME}
-MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I./ -I${SRCDIR}/include ${XCFLAGS}
 UKERNELDIR=../libuafs/
+
 LIBOBJS=disk.o  remote.o beacon.o recovery.o ubik.o  vote.o lock.o phys.o \
        ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \
        ubikclient.o uerrors.o
+
 INCLS= ${SRCDIR}/include/lwp.h ${SRCDIR}/include/lock.h \
        ${SRCDIR}/include/rx/rx.h ${SRCDIR}/include/rx/xdr.h \
        ${SRCDIR}/include/lock.h ubik.h ubik_int.h
+
 LIBS=${SRCDIR}/lib/librx.a ${SRCDIR}/lib/liblwp.a \
      ${SRCDIR}/lib/afs/libcom_err.a ${SRCDIR}/lib/afs/libcmd.a \
      ${SRCDIR}/lib/afs/util.a ${SRCDIR}/lib/afs/libsys.a ${XLIBS}
+
 RXGEN=${SRCDIR}/bin/rxgen
 COMPILE_ET = ${SRCDIR}/bin/compile_et
 
-UKSRCS=ubik.h ubikclient.c uerrors.c
-
-include ../config/Makefile.version
-
 all: libubik.a test
 
-test: utst_server utst_client udebug
-       ${INSTALL} udebug ${DESTDIR}/bin
-       ${INSTALL} udebug ${DESTDIR}root.server/usr/afs/bin
-
-clean:
-       rm -f *.o utst_server utst_client udebug *.a *.cs.c *.ss.c *.xdr.c
-       rm -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h
-
-system: install
-
-kinstall:
-       @echo No $@ source here.
-
-ukinstall webinstall: ${UKSRCS} Kubik_int.h Kubik_int.xdr.c Kubik_int.cs.c
-       set ${UKERNELDIR}/afs; $(MKDIR_IF_NEEDED)
-       set ${UKERNELDIR}/afsint; $(MKDIR_IF_NEEDED)
-       ${INSTALL} Kubik_int.h ${UKERNELDIR}/afsint/ubik_int.h
-       ${INSTALL} Kubik_int.cs.c ${UKERNELDIR}/afsint/ubik_int.cs.c
-       ${INSTALL} Kubik_int.xdr.c ${UKERNELDIR}/afsint/ubik_int.xdr.c
-       ${INSTALL} ${UKSRCS} ${UKERNELDIR}/afs
-
-install: libubik.a ukinstall
-       ${INSTALL} libubik.a ${DESTDIR}/lib
-       ${INSTALL} ubik.h ubik_int.h ${DESTDIR}/include
-
 utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a 
        ${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS)
 
@@ -85,7 +59,7 @@ utst_int.ss.o: utst_int.ss.c utst_int.xdr.c
 utst_int.cs.o: utst_int.cs.c utst_int.xdr.c
 utst_int.xdr.o: utst_int.xdr.c utst_int.h
 utst_int.ss.c utst_int.cs.c utst_int.xdr.c utst_int.h: utst_int.xg
-       ${RXGEN}  utst_int.xg
+       ${RXGEN} utst_int.xg
 
 utst_server.o: utst_server.c ${INCLS} utst_int.h AFS_component_version_number.c
 utst_client.o: utst_client.c ${INCLS} utst_int.h AFS_component_version_number.c
@@ -96,11 +70,12 @@ udebug.o: udebug.c ${INCLS} AFS_component_version_number.c
 uerrors.o: uerrors.c
 
 uerrors.c ubik.h: uerrors.et ubik.p.h
-       rm -f ubik.h uerrors.c; ${COMPILE_ET} uerrors -h ubik
+       $(RM) -f ubik.h uerrors.c
+       ${COMPILE_ET} uerrors -h ubik
 
 libubik.a: ${LIBOBJS} AFS_component_version_number.o
-       -rm -f $@
-       ar rv $@ ${LIBOBJS} AFS_component_version_number.o
+       -$(RM) -f $@
+       $(AR) crc $@ ${LIBOBJS} AFS_component_version_number.o
        $(RANLIB) $@
 
 disk.o: disk.c ${INCLS}
@@ -120,7 +95,69 @@ utst_int.ss.o: utst_int.ss.c ${INCLS} utst_int.h
 utst_int.cs.o: utst_int.cs.c ${INCLS} utst_int.h
 utst_int.xdr.o: utst_int.xdr.c ${INCLS} utst_int.h 
 
+#
+# Installation targets
+#
+test: utst_server utst_client \
+       ${DESTDIR}/bin/udebug \
+       ${DESTDIR}/root.server/usr/afs/bin/udebug
+
+install: test ukinstall \
+       ${DESTDIR}/lib/libubik.a \
+       ${DESTDIR}/include/ubik.h \
+       ${DESTDIR}/include/ubik_int.h
 
+${DESTDIR}/bin/udebug ${DESTDIR}/root.server/usr/afs/bin/udebug: udebug
+       ${INSTALL} $? $@
 
+${DESTDIR}/lib/libubik.a: libubik.a
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/ubik.h: ubik.h
+       ${INSTALL} $? $@
+
+${DESTDIR}/include/ubik_int.h: ubik_int.h
+       ${INSTALL} $? $@
+
+ukinstall: ${UKERNELDIR}/afs ${UKERNELDIR}/afsint \
+       ${UKERNELDIR}/afsint/ubik_int.h \
+       ${UKERNELDIR}/afsint/ubik_int.cs.c \
+       ${UKERNELDIR}/afsint/ubik_int.xdr.c \
+       ${UKERNELDIR}/afs/ubik.h \
+       ${UKERNELDIR}/afs/ubikclient.c \
+       ${UKERNELDIR}/afs/uerrors.c
+
+${UKERNELDIR}/afs:
+       mkdir -p $@
+
+${UKERNELDIR}/afsint:
+       mkdir -p $@
+
+${UKERNELDIR}/afsint/ubik_int.h: Kubik_int.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/ubik_int.cs.c: Kubik_int.cs.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afsint/ubik_int.xdr.c: Kubik_int.xdr.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/ubik.h: ubik.h
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/ubikclient.c: ubikclient.c
+       ${INSTALL} $? $@
+
+${UKERNELDIR}/afs/uerrors.c: uerrors.c
+       ${INSTALL} $? $@
+
+#
+# Misc. targets
+#
+clean:
+       $(RM) -f *.o utst_server utst_client udebug *.a *.cs.c *.ss.c *.xdr.c
+       $(RM) -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h
+
+include ../config/Makefile.version