jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

opr: Move queue header out of util

Browse Source 
Move the header which is installed as opr/queues.h out of util/ and
into the new, top level, opr/ directory. Similarly move the tests out
of the util/ test suite, and into the opr/ tests

Change-Id: I81af487f09e1f0f4b25654a1f64c5ac75fd5a95b
Reviewed-on: http://gerrit.openafs.org/5656
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
This commit is contained in:
Simon Wilkinson 2011-10-22 09:43:41 +01:00 committed by Derrick Brashear
parent ab866c821a
commit 55efff93fe
10 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -941,6 +941,7 @@ distclean: clean
tests/auth/Makefile \
tests/cmd/Makefile \
tests/common/Makefile \
tests/opr/Makefile \
tests/util/Makefile \
tests/volser/Makefile \
src/helper-splint.sh

1
configure.ac
View File

@ -255,6 +255,7 @@ tests/Makefile \
tests/auth/Makefile \
tests/cmd/Makefile \
tests/common/Makefile \
tests/opr/Makefile \
tests/rpctestlib/Makefile \
tests/tap/Makefile \
tests/util/Makefile \

7
src/opr/Makefile.in
View File

@ -6,6 +6,7 @@ objects = assert.o casestrcpy.o
all: $(TOP_INCDIR)/afs/opr.h \
$(TOP_INCDIR)/afs/opr_assert.h \
$(TOP_INCDIR)/opr/queue.h \
$(TOP_LIBDIR)/libopr.a
libopr.a: $(objects)
@ -22,6 +23,12 @@ $(TOP_INCDIR)/afs/opr.h: opr.h
$(TOP_INCDIR)/afs/opr_assert.h: opr_assert.h
$(INSTALL_DATA) opr_assert.h $@
$(TOP_INCDIR)/opr/queue.h: queue.h
$(INSTALL_DATA) queue.h $@
clean:
rm -f $(objects) libopr.a
install: libopr.a
$(INSTALL_DATA) libopr.a $(DESTDIR)$(libdir)/libopr.a

0
src/util/queue.h → src/opr/queue.h
View File

6
src/util/Makefile.in
View File

@ -61,8 +61,7 @@ includes = \
${TOP_INCDIR}/afs/work_queue_types.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
${TOP_INCDIR}/afs/tabular_output.h
all: ${includes} \
${TOP_LIBDIR}/util.a \
@ -132,9 +131,6 @@ ${TOP_INCDIR}/afs/tabular_output.h: ${srcdir}/tabular_output.h
${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} $? $@

2
tests/Makefile.in
View File

@ -9,7 +9,7 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
MODULE_CFLAGS = -DSOURCE='"$(abs_top_srcdir)/tests"' \
-DBUILD='"$(abs_top_builddir)/tests"'
SUBDIRS = tap common auth util cmd volser
SUBDIRS = tap common auth util cmd volser opr
all: runtests
@for A in $(SUBDIRS); do cd $$A && $(MAKE) $@ && cd .. || exit 1; done

2
tests/TESTS
View File

@ -1,10 +1,10 @@
util/ktime
util/exec-alt
util/queues
auth/keys
auth/superuser
auth/authcon
cmd/command
opr/queues
ptserver/pt_util
ptserver/pts-man
volser/vos-man

18
tests/opr/Makefile.in Normal file
View File

@ -0,0 +1,18 @@
srcdir=@srcdir@
abs_top_builddir=@abs_top_builddir@
include @TOP_OBJDIR@/src/config/Makefile.config
include @TOP_OBJDIR@/src/config/Makefile.lwp
MODULE_CFLAGS = -I$(srcdir)/..
LIBS=../tap/libtap.a $(abs_top_builddir)/lib/libopr.a
tests = queues-t
all check test tests: $(tests)
queues-t: queues-t.o
$(AFS_LDRULE) queues-t.o ../tap/libtap.a $(XLIBS)
clean distclean:
$(RM) -f $(tests) *.o core

2
tests/util/queues-t.c → tests/opr/queues-t.c
View File

@ -118,5 +118,3 @@ main(void)
return 0;
}

5
tests/util/Makefile.in
View File

@ -9,7 +9,7 @@ MODULE_CFLAGS = -I$(srcdir)/..
LIBS = ../tap/libtap.a $(abs_top_builddir)/lib/util.a
tests = ktime-t exec-alt-t queues-t
tests = ktime-t exec-alt-t
all check test tests: $(tests)
@ -19,9 +19,6 @@ ktime-t: ktime-t.o $(LIBS)
exec-alt-t: exec-alt-t.o $(LIBS)
$(AFS_LDRULE) exec-alt-t.o $(LIBS) $(XLIBS)
queues-t: queues-t.o
$(AFS_LDRULE) queues-t.o ../tap/libtap.a $(XLIBS)
install:
clean distclean: