git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
opr: Add new queue implementation
[openafs.git] / src / util / Makefile.in
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 1817811..00f8bad 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -7,6 +7,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@
@@ -18,13 +20,13 @@ objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \
         hostparse.o exec.o \
         hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \
         dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \
-        afs_atomlist.o afs_lhash.o snprintf.o strlcat.o strlcpy.o strnlen.o \
-        pthread_glock.o daemon.o ${REGEX_OBJ}
+        afs_atomlist.o afs_lhash.o snprintf.o pthread_glock.o \
+        tabular_output.o ${REGEX_OBJ}
 
 includes = \
        ${TOP_INCDIR}/afs/dirpath.h \
        ${TOP_INCDIR}/afs/pthread_nosigs.h \
-       ${TOP_INCDIR}/afs/assert.h \
+       ${TOP_INCDIR}/afs/afs_assert.h \
        ${TOP_INCDIR}/afs/errors.h \
        ${TOP_INCDIR}/afs/vice.h \
        ${TOP_INCDIR}/afs/remote.h \
@@ -40,7 +42,10 @@ includes = \
        ${TOP_INCDIR}/afs/softsig.h \
        ${TOP_INCDIR}/afs/work_queue.h \
        ${TOP_INCDIR}/afs/work_queue_types.h \
-       ${TOP_INCDIR}/potpourri.h 
+       ${TOP_INCDIR}/afs/thread_pool.h \
+       ${TOP_INCDIR}/afs/thread_pool_types.h \
+       ${TOP_INCDIR}/afs/tabular_output.h \
+       ${TOP_INCDIR}/opr/queue.h
 
 all: ${includes} \
        ${TOP_LIBDIR}/util.a \
@@ -58,7 +63,7 @@ ${TOP_INCDIR}/afs/dirpath.h: dirpath.h
 ${TOP_INCDIR}/afs/pthread_nosigs.h: ${srcdir}/pthread_nosigs.h
        ${INSTALL_DATA} $? $@
 
-${TOP_INCDIR}/afs/assert.h: ${srcdir}/assert.h
+${TOP_INCDIR}/afs/afs_assert.h: ${srcdir}/afs_assert.h
        ${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/errors.h: ${srcdir}/errors.h
@@ -106,9 +111,20 @@ ${TOP_INCDIR}/afs/work_queue.h: ${srcdir}/work_queue.h
 ${TOP_INCDIR}/afs/work_queue_types.h: ${srcdir}/work_queue_types.h
        ${INSTALL_DATA} $? $@
 
+${TOP_INCDIR}/afs/thread_pool.h: ${srcdir}/thread_pool.h
+       ${INSTALL_DATA} $? $@
+
+${TOP_INCDIR}/afs/thread_pool_types.h: ${srcdir}/thread_pool_types.h
+
+${TOP_INCDIR}/afs/tabular_output.h: ${srcdir}/tabular_output.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_INCDIR}/potpourri.h: ${srcdir}/potpourri.h
        ${INSTALL_DATA} $? $@
 
+${TOP_INCDIR}/opr/queue.h: ${srcdir}/queue.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_LIBDIR}/util.a: util.a
        ${INSTALL_DATA} $? $@
 
@@ -141,91 +157,17 @@ util.a: ${objects} AFS_component_version_number.o
        $(RANLIB) util.a
 
 pthread_glock.o: ${srcdir}/pthread_glock.c ${includes}
-       ${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c
+       ${MT_CC} $(COMMON_CFLAGS) ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c
 
-assert.o: ${srcdir}/assert.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/assert.c
-
-casestrcpy.o: ${srcdir}/casestrcpy.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/casestrcpy.c
-
-hputil.o: ${srcdir}/hputil.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/hputil.c
-
-flipbase64.o: ${srcdir}/flipbase64.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/flipbase64.c
-
-volparse.o: ${srcdir}/volparse.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/volparse.c
-
-snprintf.o: ${srcdir}/snprintf.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/snprintf.c
-
-fstab.o: ${srcdir}/fstab.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/fstab.c
-
-base64.o: ${srcdir}/base64.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/base64.c
+${objects}: ${includes}
 
 config_file.o: ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c krb5_locl.h
-       ${CCOBJ} ${CFLAGS} -c ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c
-
-hostparse.o: ${srcdir}/hostparse.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/hostparse.c
+       $(AFS_CCRULE) -c ${TOP_SRCDIR}/external/heimdal/krb5/config_file.c 
 
-exec.o: ${srcdir}/exec.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/exec.c
-
-ktime.o: ${srcdir}/ktime.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/ktime.c
-
-kreltime.o: ${srcdir}/kreltime.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/kreltime.c
-
-get_krbrlm.o: ${srcdir}/get_krbrlm.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/get_krbrlm.c
-
-uuid.o: ${srcdir}/uuid.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/uuid.c
-
-sys.o: ${srcdir}/sys.c AFS_component_version_number.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/sys.c
+sys.o: sys.c AFS_component_version_number.c ${includes}
 
 sys: sys.o 
-       ${CC} ${LDFLAGS} -o sys sys.o
-
-isathing.o: ${srcdir}/isathing.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/isathing.c
-
-serverLog.o: ${srcdir}/serverLog.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/serverLog.c
-
-dirpath.o: ${srcdir}/dirpath.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/dirpath.c
-
-fileutil.o: ${srcdir}/fileutil.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/fileutil.c
-
-netutils.o: ${srcdir}/netutils.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/netutils.c
-
-afs_atomlist.o: ${srcdir}/afs_atomlist.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/afs_atomlist.c
-
-afs_lhash.o: ${srcdir}/afs_lhash.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/afs_lhash.c
-
-strlcat.o: ${srcdir}/strlcat.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/strlcat.c
-
-strlcpy.o: ${srcdir}/strlcpy.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/strlcpy.c
-
-strnlen.o: ${srcdir}/strnlen.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/strnlen.c
-
-daemon.o: ${srcdir}/daemon.c ${includes}
-       ${CCOBJ} ${CFLAGS} -c ${srcdir}/daemon.c
+       $(AFS_LDRULE) sys.o
 
 #
 # Install targets
@@ -239,7 +181,7 @@ install: dirpath.h util.a sys
        ${INSTALL} -d ${DESTDIR}${bindir}
        ${INSTALL_DATA} dirpath.h ${DESTDIR}${includedir}/afs/dirpath.h
        ${INSTALL_DATA} ${srcdir}/pthread_nosigs.h ${DESTDIR}${includedir}/afs/pthread_nosigs.h
-       ${INSTALL_DATA} ${srcdir}/assert.h ${DESTDIR}${includedir}/afs/assert.h
+       ${INSTALL_DATA} ${srcdir}/afs_assert.h ${DESTDIR}${includedir}/afs/afs_assert.h
        ${INSTALL_DATA} ${srcdir}/errors.h ${DESTDIR}${includedir}/afs/errors.h
        ${INSTALL_DATA} ${srcdir}/vice.h ${DESTDIR}${includedir}/afs/vice.h
        ${INSTALL_DATA} ${srcdir}/remote.h ${DESTDIR}${includedir}/afs/remote.h
@@ -255,7 +197,9 @@ install: dirpath.h util.a sys
        ${INSTALL_DATA} ${srcdir}/softsig.h ${DESTDIR}${includedir}/afs/softsig.h
        ${INSTALL_DATA} ${srcdir}/work_queue.h ${DESTDIR}${includedir}/afs/work_queue.h
        ${INSTALL_DATA} ${srcdir}/work_queue_types.h ${DESTDIR}${includedir}/afs/work_queue_types.h
-       ${INSTALL_DATA} ${srcdir}/potpourri.h ${DESTDIR}${includedir}/potpourri.h
+       ${INSTALL_DATA} ${srcdir}/thread_pool.h ${DESTDIR}${includedir}/afs/thread_pool.h
+       ${INSTALL_DATA} ${srcdir}/thread_pool_types.h ${DESTDIR}${includedir}/afs/thread_pool_types.h
+       ${INSTALL_DATA} ${srcdir}/tabular_output.h ${DESTDIR}${includedir}/afs/tabular_output.h
        ${INSTALL_DATA} util.a ${DESTDIR}${libdir}/afs/util.a
        ${INSTALL_DATA} util.a ${DESTDIR}${libdir}/afs/libafsutil.a
        ${INSTALL_PROGRAM} sys ${DESTDIR}${bindir}/sys
@@ -266,7 +210,7 @@ dest: dirpath.h util.a sys
        ${INSTALL} -d ${DEST}/bin
        ${INSTALL_DATA} dirpath.h ${DEST}/include/afs/dirpath.h
        ${INSTALL_DATA} ${srcdir}/pthread_nosigs.h ${DEST}/include/afs/pthread_nosigs.h
-       ${INSTALL_DATA} ${srcdir}/assert.h ${DEST}/include/afs/assert.h
+       ${INSTALL_DATA} ${srcdir}/afs_assert.h ${DEST}/include/afs/afs_assert.h
        ${INSTALL_DATA} ${srcdir}/errors.h ${DEST}/include/afs/errors.h
        ${INSTALL_DATA} ${srcdir}/vice.h ${DEST}/include/afs/vice.h
        ${INSTALL_DATA} ${srcdir}/remote.h ${DEST}/include/afs/remote.h
@@ -282,7 +226,9 @@ dest: dirpath.h util.a sys
        ${INSTALL_DATA} ${srcdir}/softsig.h ${DEST}/include/afs/softsig.h
        ${INSTALL_DATA} ${srcdir}/work_queue.h ${DEST}/include/afs/work_queue.h
        ${INSTALL_DATA} ${srcdir}/work_queue_types.h ${DEST}/include/afs/work_queue_types.h
-       ${INSTALL_DATA} ${srcdir}/potpourri.h ${DEST}/include/potpourri.h
+       ${INSTALL_DATA} ${srcdir}/thread_pool.h ${DEST}/include/afs/thread_pool.h
+       ${INSTALL_DATA} ${srcdir}/thread_pool_types.h ${DEST}/include/afs/thread_pool_types.h
+       ${INSTALL_DATA} ${srcdir}/tabular_output.h ${DEST}/include/afs/tabular_output.h
        ${INSTALL_DATA} util.a ${DEST}/lib/afs/util.a
        ${INSTALL_DATA} util.a ${DEST}/lib/afs/libafsutil.a
        ${INSTALL_PROGRAM} sys ${DEST}/bin/sys
OpenAFS Master Repository