more-makefiles-cleanup-20010829

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

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index 4a12eb7..7b674eb 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -15,6 +15,8 @@ SHELL=/bin/sh
 include ../config/Makefile.${SYS_NAME}
 
 COMPILE_ET=${SRCDIR}/bin/compile_et
+RXGEN=${SRCDIR}/bin/rxgen
+
 CFLAGS=${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config -I${SRCDIR}/include ${XCFLAGS}
 LDFLAGS=${DBG} ${OPTMZ} ${XLDFLAGS}
 
@@ -28,17 +30,8 @@ RINCLS=${SRCDIR}/include/rx/rx.h ${SRCDIR}/include/rx/xdr.h \
        ${SRCDIR}/include/afs/keys.h ${SRCDIR}/include/afs/cellconfig.h \
        ${SRCDIR}/include/ubik.h ${SRCDIR}/include/afs/cmd.h
 
-TARGETS= ${DESTDIR}/include/afs/volser.h \
-        ${DESTDIR}/include/afs/volint.h \
-        ${DESTDIR}/etc/vos \
-        ${DESTDIR}root.server/usr/afs/bin/vos \
-        ${DESTDIR}root.server/usr/afs/bin/volserver \
-        ${DESTDIR}/lib/afs/libvolser.a 
-
 INTINCLS=volint.h volser.h 
 
-HACKS=${SRCDIR}/lib/afs/libdir.a
-
 LIBS= \
        ${SRCDIR}/lib/afs/libaudit.a \
        ${SRCDIR}/lib/afs/vlib.a \
@@ -62,33 +55,39 @@ LIBS= \
 VSOBJS=vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o 
 SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o volerr.o \
  volint.cs.o dumpstuff.o  volint.ss.o volint.xdr.o
-COBJS=volint.cs.o volint.xdr.o
 
-all: volserver libvolser.a vos restorevol
+all: install
 
 restorevol: restorevol.c
        ${CC} ${CFLAGS} -o restorevol restorevol.c \
                ${SRCDIR}/lib/afs/libcmd.a ${SRCDIR}/lib/afs/util.a
-       ${INSTALL} restorevol ${SRCDIR}/etc
 
 vos: vos.o ${VSOBJS} libvolser.a ${LIBS}
-       ${CC} ${LDFLAGS} -o vos vos.o $(VSOBJS) libvolser.a  ${LIBS} \
-               ${XLIBS}
+       ${CC} ${LDFLAGS} -o vos vos.o $(VSOBJS) libvolser.a ${LIBS} ${XLIBS}
+
+volserver: $(SOBJS) $(LIBS) ${SRCDIR}/lib/afs/libdir.a
+       ${CC} ${DBUG} -o volserver $(SOBJS) ${SRCDIR}/lib/afs/libdir.a \
+               ${LDFLAGS} $(LIBS) ${XLIBS}
 
 libvolser.a: volint.cs.o  $(VSOBJS) volint.ss.o AFS_component_version_number.o
-       -rm -f libvolser.a
-       ar rv libvolser.a volint.cs.o $(VSOBJS) volint.ss.o \
-               AFS_component_version_number.o 
+       -$(RM) -f libvolser.a
+       ar rv libvolser.a volint.cs.o $(VSOBJS) volint.ss.o AFS_component_version_number.o 
        $(RANLIB) libvolser.a
 
 volser.h volerr.c: volerr.et volser.p.h
-       rm -f volser.h volerr.c; ${COMPILE_ET} volerr -h volser
+       $(RM) -f volser.h volerr.c
+       ${COMPILE_ET} volerr -h volser
 
 volint.h volint.ss.c volint.cs.c volint.xdr.c: volint.xg
-       ${SRCDIR}/bin/rxgen -x volint.xg
+       ${RXGEN} -x volint.xg
 
+#
+# Dependencies
+#
+volint.cs.o: volint.cs.c ${INTINCLS}
+volint.ss.o: volint.ss.c ${INTINCLS}
+volint.xdr.o: volint.xdr.c ${INTINCLS}
 vsutils.o: vsutils.c ${VINCLS} ${RINCLS} ${INTINCLS}
-
 volmain.o: volmain.c ${VINCLS} ${RINCLS} AFS_component_version_number.c
 volprocs.o: volprocs.c ${VINCLS} ${RINCLS} ${INTINCLS}
 dumpstuff.o: dumpstuff.c ${VINCLS} ${RINCLS} ${INTINCLS}
@@ -99,36 +98,43 @@ physio.o: physio.c ${VINCLS}
 common.o: common.c ${VINCLS}
 lockprocs.o: lockprocs.c ${VINCLS} ${INTINCLS} ${RINCLS}
 
-volint.cs.o: volint.cs.c ${INTINCLS}
-volint.ss.o: volint.ss.c ${INTINCLS}
-volint.xdr.o: volint.xdr.c ${INTINCLS}
-
-volserver: $(SOBJS) $(LIBS) $(HACKS)
-       ${CC} ${DBUG} -o volserver $(SOBJS) $(HACKS) \
-               ${LDFLAGS} $(LIBS) ${XLIBS}
+#
+# Installation targets
+#
+install: volserver vos restorevol \
+       ${DESTDIR}/etc/restorevol \
+       ${DESTDIR}/include/afs/volser.h \
+        ${DESTDIR}/include/afs/volint.h \
+        ${DESTDIR}/etc/vos \
+        ${DESTDIR}/root.server/usr/afs/bin/vos \
+        ${DESTDIR}/root.server/usr/afs/bin/volserver \
+        ${DESTDIR}/lib/afs/libvolser.a
 
-system: install
 
-${DESTDIR}/include/afs/volser.h :: volser.h
+${DESTDIR}/include/afs/volser.h: volser.h
        ${INSTALL} $? $@
 
-${DESTDIR}/include/afs/volint.h :: volint.h
+${DESTDIR}/include/afs/volint.h: volint.h
        ${INSTALL} $? $@
 
-${DESTDIR}/etc/vos ${DESTDIR}root.server/usr/afs/bin/vos :: vos
+${DESTDIR}/etc/restorevol: restorevol
        ${INSTALL} $? $@
 
-${DESTDIR}/lib/afs/libvolser.a :: libvolser.a
+${DESTDIR}/etc/vos ${DESTDIR}/root.server/usr/afs/bin/vos: vos
        ${INSTALL} $? $@
 
-${DESTDIR}root.server/usr/afs/bin/volserver :: volserver
+${DESTDIR}/lib/afs/libvolser.a: libvolser.a
        ${INSTALL} $? $@
 
-install: all $(TARGETS)
+${DESTDIR}/root.server/usr/afs/bin/volserver: volserver
+       ${INSTALL} $? $@
 
+#
+# Misc targets
+# 
 clean:
-       rm -f volserver *.o volint.ss.c volint.cs.c *.a  volint.h \
-       volint.xdr.c vos core volser.h volerr.c AFS_component_version_number.c restorevol
+       $(RM) -f *.o *.a core volserver volint.ss.c volint.cs.c volint.h \
+       volint.xdr.c vos volser.h volerr.c AFS_component_version_number.c restorevol
 
 include ../config/Makefile.version