diff options
| author | Volker Lendecke <vl@samba.org> | 2011-04-23 16:49:04 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2011-04-25 09:50:33 +0200 |
| commit | 39375de8354b676904e1fea097a68178acd987e4 (patch) | |
| tree | 47897786a5c6c95ff73590e0b5ccd196ac9ffdbc | |
| parent | f4a0f856f31291dd316a937f8060d2f205e8d4d6 (diff) | |
| download | samba-39375de8354b676904e1fea097a68178acd987e4.tar.gz samba-39375de8354b676904e1fea097a68178acd987e4.tar.bz2 samba-39375de8354b676904e1fea097a68178acd987e4.zip | |
s3: Add pthreadpooltest to main build
| -rw-r--r-- | source3/Makefile.in | 12 | ||||
| -rw-r--r-- | source3/configure.in | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index e503112392..b3764cac93 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -97,6 +97,7 @@ TDBTOOL = @TDBTOOL@ TDBDUMP = @TDBDUMP@ TDBRESTORE = @TDBRESTORE@ TDBTORTURE = @TDBTORTURE@ +PTHREADPOOLTEST = @PTHREADPOOLTEST@ INSTALLCMD=@INSTALL@ INSTALLLIBCMD_SH=@INSTALLLIBCMD_SH@ @@ -230,7 +231,7 @@ TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \ bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \ bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@ \ bin/pdbtest@EXEEXT@ $(TALLOCTORT) bin/replacetort@EXEEXT@ \ - $(TDBTORTURE) \ + $(TDBTORTURE) $(PTHREADPOOLTEST) \ bin/smbconftort@EXEEXT@ bin/vlp@EXEEXT@ BIN_PROGS = @EXTRA_BIN_PROGS@ \ @@ -1129,6 +1130,9 @@ SMBCONFTORT_OBJ = $(SMBCONFTORT_OBJ0) \ $(LIBSMB_ERR_OBJ) \ $(POPT_LIB_OBJ) +PTHREADPOOLTEST_OBJ = lib/pthreadpool/pthreadpool.o \ + lib/pthreadpool/tests.o + LIBNET_OBJ = libnet/libnet_join.o \ libnet/libnet_keytab.o \ librpc/gen_ndr/ndr_libnet_join.o @@ -1567,6 +1571,8 @@ replacetort : SHOWFLAGS bin/replacetort@EXEEXT@ smbconftort : SHOWFLAGS bin/smbconftort@EXEEXT@ +pthreadpooltest : SHOWFLAGS bin/pthreadpooltest@EXEEXT@ + timelimit : SHOWFLAGS bin/timelimit@EXEEXT@ nsswitch : SHOWFLAGS bin/winbindd@EXEEXT@ bin/wbinfo@EXEEXT@ @WINBIND_NSS@ \ @@ -1892,6 +1898,10 @@ bin/smbconftort@EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) +bin/pthreadpooltest@EXEEXT@: $(PTHREADPOOLTEST_OBJ) + @echo Linking $@ + @$(CC) -o $@ $(PTHREADPOOLTEST_OBJ) $(LDFLAGS) -lpthread + bin/masktest@EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @echo Linking $@ @$(CC) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \ diff --git a/source3/configure.in b/source3/configure.in index b4ac2114d4..3a2f089a29 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6648,6 +6648,8 @@ if test x"$enable_pthreadpool" = x"yes" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; t CFLAGS="$CFLAGS $PTHREAD_CFLAGS" AC_DEFINE(WITH_PTHREADPOOL, 1, [Whether to include pthreadpool helpers]) AC_SUBST(PTHREADPOOL_OBJ, "lib/pthreadpool/pthreadpool.o") + PTHREADPOOLTEST="bin/pthreadpooltest\$(EXEEXT)" + AC_SUBST(PTHREADPOOLTEST) fi ################################################# |