summaryrefslogtreecommitdiff
path: root/source4/torture/local
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-16 16:45:10 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-16 16:45:10 +0200
commitbf21371c098684ccad427a54ac76766c0021bc88 (patch)
treeed1d0dce7dda8d41c6dcefdfe23eea35df1ced0c /source4/torture/local
parentf957aeaee64745148b815393b1fc1338104ed2e1 (diff)
parent0888ffa2b7382a1c4781ae54bad53eac3b229365 (diff)
downloadsamba-bf21371c098684ccad427a54ac76766c0021bc88.tar.gz
samba-bf21371c098684ccad427a54ac76766c0021bc88.tar.bz2
samba-bf21371c098684ccad427a54ac76766c0021bc88.zip
Merge branch 'singlereplace' into single
Conflicts: source4/configure.ac source4/torture/local/config.mk
Diffstat (limited to 'source4/torture/local')
-rw-r--r--source4/torture/local/config.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index b57093178e..ad69183205 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -21,10 +21,10 @@ PRIVATE_DEPENDENCIES = \
TORTURE_LOCAL_OBJ_FILES = \
$(torturesrcdir)/../lib/charset/tests/iconv.o \
$(torturesrcdir)/../../talloc/testsuite.o \
- $(torturesrcdir)/../lib/replace/test/getifaddrs.o \
- $(torturesrcdir)/../lib/replace/test/os2_delete.o \
- $(torturesrcdir)/../lib/replace/test/strptime.o \
- $(torturesrcdir)/../lib/replace/test/testsuite.o \
+ $(torturesrcdir)/../../replace/test/getifaddrs.o \
+ $(torturesrcdir)/../../replace/test/os2_delete.o \
+ $(torturesrcdir)/../../replace/test/strptime.o \
+ $(torturesrcdir)/../../replace/test/testsuite.o \
$(torturesrcdir)/../lib/messaging/tests/messaging.o \
$(torturesrcdir)/../lib/messaging/tests/irpc.o \
$(torturesrcdir)/../librpc/tests/binding_string.o \