budb: Only have one build rule for budb_errs.c

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

diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in
index 022236e..ed21f6a 100644 (file)
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@@ -8,6 +8,8 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.lwp
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -17,7 +19,6 @@ INCLS=\
        ${TOP_INCDIR}/lock.h \
        ${TOP_INCDIR}/ubik.h \
        ${TOP_INCDIR}/lwp.h \
-       ${TOP_INCDIR}/des.h \
        ${TOP_INCDIR}/rx/rx.h \
        ${TOP_INCDIR}/rx/xdr.h \
        ${TOP_INCDIR}/rx/rxkad.h \
@@ -25,6 +26,8 @@ INCLS=\
        ${TOP_INCDIR}/afs/cellconfig.h \
        ${TOP_INCDIR}/afs/com_err.h \
        ${TOP_INCDIR}/afs/bubasics.h \
+       ${TOP_INCDIR}/afs/budb_client.h \
+       ${TOP_INCDIR}/afs/budb_errs.h \
        budb.h budb_client.h database.h
 
 # library ordering defined by top level makefile
@@ -36,12 +39,12 @@ LIBS=${TOP_LIBDIR}/libbubasics.a \
        ${TOP_LIBDIR}/libauth.a \
        ${TOP_LIBDIR}/librxkad.a \
        ${TOP_LIBDIR}/libsys.a \
-       ${TOP_LIBDIR}/libdes.a \
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libcom_err.a \
+       ${TOP_LIBDIR}/libafshcrypto_lwp.a \
        ${TOP_LIBDIR}/util.a
 
 COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o
@@ -51,6 +54,10 @@ SERVER_OBJS = ${COMMON_OBJS} budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o
 
 all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_prototypes.h budb_server
 
+generated: \
+       budb_errs.c budb_errs.h \
+       budb.cs.c budb.ss.c budb.xdr.c budb.h
+
 ${TOP_LIBDIR}/libbudb.a: libbudb.a
        ${INSTALL_DATA} $? $@
 
@@ -58,7 +65,7 @@ ${TOP_INCDIR}/afs/budb.h: budb.h
        ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/budb_errs.h: budb_errs.h
-       ${INSTALL_DATA} $? $@
+       ${INSTALL_DATA} budb_errs.h $@
 
 ${TOP_INCDIR}/afs/budb_client.h: budb_client.h
        ${INSTALL_DATA} $? $@
@@ -66,16 +73,10 @@ ${TOP_INCDIR}/afs/budb_client.h: budb_client.h
 ${TOP_INCDIR}/afs/budb_prototypes.h: budb_prototypes.h
        ${INSTALL_DATA} $? $@
 
-#
-# budb_errs.o actually depends on neither budb_client.h nor budb_errs.h
-# but generating either of them will rebuild budb_errs.c
-#
-budb_errs.o: budb_errs.c budb_client.h budb_errs.h
-
-budb_errs.c budb_client.h: budb_errs.et budb_client.p.h
-       $(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} -p ${srcdir} budb_errs -h budb_client
+budb_errs.h: budb_errs.c
 
-budb_errs.h: budb_errs.et
+budb_errs.c: budb_errs.et
+       $(RM) -f budb_errs.c
        ${COMPILE_ET} -p ${srcdir} budb_errs
 
 database.o: database.c budb_errs.h globals.h ${INCLS}
@@ -86,11 +87,11 @@ db_text.o:  db_text.c budb_errs.h ${INCLS}
 db_hash.o: db_hash.c budb_errs.h ${INCLS}
 ol_verify.o:   ol_verify.c budb_errs.h ${INCLS}
 procs.o: procs.c budb_errs.h globals.h ${INCLS}
-struct_ops.o: budb_errs.h ${TOP_INCDIR}/afs/budb_client.h
+struct_ops.o: budb_errs.h ${INCLS}
 server.o: server.c budb_errs.h ${INCLS} AFS_component_version_number.c
 
 budb_server: $(SERVER_OBJS) ${LIBS} ${TOP_INCDIR}/afs/budb_client.h
-       ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS}
+       $(AFS_LDRULE) $(SERVER_OBJS) ${LIBS} $(LIB_roken) ${XLIBS}
 
 budb.cs.c: budb.rg
        ${RXGEN} -A -u -C -o $@ ${srcdir}/budb.rg
@@ -140,7 +141,7 @@ dest: libbudb.a budb.h budb_errs.h budb_client.h budb_server
 # Misc targets
 #
 clean:
-       $(RM) -f *.o *~ budb_errs.[ch] budb.h budb_client.h *.a *.xdr.c \
+       $(RM) -f *.o *~ budb_errs.[ch] budb.h *.a *.xdr.c \
                *.ss.c *.cs.c core budb_server AFS_component_version_number.c
 
 include ../config/Makefile.version