generated: take into account the things needed in master

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

diff --git a/src/roken/Makefile.in b/src/roken/Makefile.in
index 55c96c7..539620a 100644 (file)
--- a/src/roken/Makefile.in
+++ b/src/roken/Makefile.in
@@ -7,16 +7,17 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.shared
 
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
 
-HEADERS = ${TOP_INCDIR}/roken.h \
+HEADERS = ${TOP_INCDIR}/base64.h \
+         ${TOP_INCDIR}/roken.h \
          ${TOP_INCDIR}/roken-common.h
 
 UPSTREAM = $(TOP_SRCDIR)/external/heimdal/roken
 
 SHLIBOBJ = librokenafs.${SHLIB_SUFFIX}.${LIBMAJOR}.${LIBMINOR}
 
+buildtools: $(ROKEN_HEADERS) $(HEADERS) $(TOP_LIBDIR)/librokenafs.a
+
 all: $(ROKEN_HEADERS) $(HEADERS) \
        $(TOP_LIBDIR)/$(SHLIBOBJ) \
        $(TOP_LIBDIR)/librokenafs.a
@@ -32,11 +33,13 @@ dest: librokenafs.a $(SHLIBOBJ)
        $(INSTALL_DATA) librokenafs.a $(DEST)/lib/librokenafs.a
 
 clean:
-       $(RM) -f $(OBJECTS) $(SHLIBOBJ) librokenafs.a librokenafs.exp
+       $(RM) -f $(OBJECTS) $(SHLIBOBJ) librokenafs.a librokenafs.exp \
+               err.h
 
 OBJECTS = $(ROKEN_LIBOBJS) \
+         base64.o \
          cloexec.o ct.o hex.o issuid.o net_read.o net_write.o socket.o \
-         warnerr.o
+         snprintf.o warnerr.o
 
 $(TOP_LIBDIR)/$(SHLIBOBJ): $(SHLIBOBJ)
        $(TOP_OBJDIR)/src/config/shlib-install -d $(TOP_LIBDIR) \
@@ -55,6 +58,9 @@ librokenafs.a: $(OBJECTS)
        $(AR) crv $@ $(OBJECTS)
        $(RANLIB) $@
 
+$(TOP_INCDIR)/base64.h: ${UPSTREAM}/base64.h
+       $(INSTALL_DATA) $? $@
+
 $(TOP_INCDIR)/err.h: ${UPSTREAM}/err.hin
        cp $? $@
 
@@ -67,6 +73,9 @@ $(TOP_INCDIR)/roken-common.h: $(UPSTREAM)/roken-common.h
 err.h: ${UPSTREAM}/err.hin
        cp $? $@
 
+base64.o: $(UPSTREAM)/base64.c
+       $(AFS_CCRULE) $(UPSTREAM)/base64.c
+
 cloexec.o: ${UPSTREAM}/cloexec.c
        $(AFS_CCRULE) $(UPSTREAM)/cloexec.c
 
@@ -91,6 +100,9 @@ err.o: ${UPSTREAM}/err.c err.h
 errx.o: ${UPSTREAM}/errx.c err.h
        $(AFS_CCRULE) $(UPSTREAM)/errx.c
 
+flock.o: ${UPSTREAM}/flock.c
+       $(AFS_CCRULE) $(UPSTREAM)/flock.c
+
 getopt.o: ${UPSTREAM}/getopt.c
        $(AFS_CCRULE) $(UPSTREAM)/getopt.c
 
@@ -103,6 +115,9 @@ hex.o: ${UPSTREAM}/hex.c
 issuid.o: ${UPSTREAM}/issuid.c
        $(AFS_CCRULE) $(UPSTREAM)/issuid.c
 
+mkstemp.o: ${UPSTREAM}/mkstemp.c
+       $(AFS_CCRULE) $(UPSTREAM)/mkstemp.c
+
 net_read.o: ${UPSTREAM}/net_read.c
        $(AFS_CCRULE) $(UPSTREAM)/net_read.c
 
@@ -112,6 +127,12 @@ net_write.o: ${UPSTREAM}/net_write.c
 socket.o: ${UPSTREAM}/socket.c
        $(AFS_CCRULE) $(UPSTREAM)/socket.c
 
+# The upstream snprintf.c has some pointer warnings in it
+CFLAGS_snprintf.o = @CFLAGS_NOERROR@
+
+snprintf.o: ${UPSTREAM}/snprintf.c
+       $(AFS_CCRULE) $(UPSTREAM)/snprintf.c
+
 strlcat.o: ${UPSTREAM}/strlcat.c
        $(AFS_CCRULE) $(UPSTREAM)/strlcat.c
 
@@ -121,12 +142,18 @@ strlcpy.o: ${UPSTREAM}/strlcpy.c
 strnlen.o: ${UPSTREAM}/strnlen.c
        $(AFS_CCRULE) $(UPSTREAM)/strnlen.c
 
+strsep.o: ${UPSTREAM}/strsep.c
+       $(AFS_CCRULE) $(UPSTREAM)/strsep.c
+
 verr.o: ${UPSTREAM}/verr.c err.h
        $(AFS_CCRULE) $(UPSTREAM)/verr.c
 
 verrx.o: ${UPSTREAM}/verrx.c err.h
        $(AFS_CCRULE) $(UPSTREAM)/verrx.c
 
+vsyslog.o: ${UPSTREAM}/vsyslog.c
+       $(AFS_CCRULE) $(UPSTREAM)/vsyslog.c
+
 vwarn.o: ${UPSTREAM}/vwarn.c err.h
        $(AFS_CCRULE) $(UPSTREAM)/vwarn.c