more-makefiles-cleanup-20010829

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

diff --git a/src/uss/Makefile.in b/src/uss/Makefile.in
index 0004332..053b3f7 100644 (file)
--- a/src/uss/Makefile.in
+++ b/src/uss/Makefile.in
@@ -16,13 +16,13 @@ SHELL=/bin/sh
 
 include ../config/Makefile.${SYS_NAME}
 
-#
-# This makefile creates the following things:
-#
-PROGRAMS = uss
+all: install
+
+CFLAGS = ${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \
+       -I${SRCDIR}/include -I. ${XCFLAGS}
 
 #
-# and here's what it uses to do so:
+# Build targets
 #
 LIBS = ${SRCDIR}/lib/afs/libvolser.a \
        ${SRCDIR}/lib/afs/libvldb.a  \
@@ -41,8 +41,6 @@ LIBS =        ${SRCDIR}/lib/afs/libvolser.a \
        ${SRCDIR}/lib/afs/util.a \
        ${XLIBS}
 
-CFLAGS = ${DBUG} -I/usr/include -I${TOP_SRCDIR}/config \
-       -I${SRCDIR}/include -I. ${XCFLAGS}
 OBJS =  uss_procs.o \
        uss_common.o \
        uss_vol.o \
@@ -53,30 +51,11 @@ OBJS =  uss_procs.o \
        lex.yy.o \
        y.tab.o 
 
-include ../config/Makefile.version
-
-#
-# Top-level options:
-#
-all :  ${PROGRAMS}
-
-install: all
-       ${INSTALL} uss ${DESTDIR}/etc
-
-system: install
-
-clean:
-       rm -f *.o ${PROGRAMS} y.tab.c y.tab.h lex.yy.c core AFS_component_version_number.c
-
-###### uss program ######
-
-uss: uss.o  ${OBJS} 
+uss: uss.o ${OBJS} 
        ${CC} ${CFLAGS} -o uss uss.o ${OBJS} ${LIBS}
 
 uss.o:  uss.c AFS_component_version_number.c
-        ${CC} -c ${CFLAGS} uss.c
-
-###### common stuff ######
+       ${CC} -c ${CFLAGS} uss.c
 
 uss_procs.o : uss_procs.c
        ${CC} -c ${CFLAGS} uss_procs.c
@@ -126,3 +105,21 @@ uss_fs.c: uss_fs.h
 
 y.tab.c : grammar.y
        ${YACC} -d grammar.y
+
+#
+# Installation targets
+#
+install: ${DESTDIR}/etc/uss
+
+${DESTDIR}/etc/uss: uss
+       ${INSTALL} $? $@
+
+#
+# Misc. targets
+#
+clean:
+       $(RM) -f *.o uss y.tab.c y.tab.h lex.yy.c core AFS_component_version_number.c
+
+include ../config/Makefile.version
+
+#