svn commit: samba r17680 - in branches/SAMBA_4_0/source/lib/tdb: .
tridge at samba.org
tridge at samba.org
Tue Aug 22 01:45:40 GMT 2006
Author: tridge
Date: 2006-08-22 01:45:39 +0000 (Tue, 22 Aug 2006)
New Revision: 17680
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17680
Log:
make standalone tdb support building and testing in a different
directory to source
Modified:
branches/SAMBA_4_0/source/lib/tdb/Makefile.in
branches/SAMBA_4_0/source/lib/tdb/configure.in
Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-08-22 01:32:29 UTC (rev 17679)
+++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-08-22 01:45:39 UTC (rev 17680)
@@ -2,33 +2,42 @@
# Makefile for tdb directory
#
-CFLAGS = -Iinclude @CFLAGS@
CC = @CC@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
includedir = @includedir@
libdir = @libdir@
+VPATH = @srcdir@
+srcdir = @srcdir@
+builddir = @builddir@
+CFLAGS = -I$(srcdir)/include @CFLAGS@
PROGS = bin/tdbtool bin/tdbtorture
TDB_OBJ = common/tdb.o common/dump.o common/io.o common/lock.o \
common/open.o common/traverse.o common/freelist.o common/error.o \
common/transaction.o
-all: $(PROGS)
+DIRS = lib bin common tools examples
+all: dirs $(PROGS)
+
.c.o:
@echo Compiling $*.c
- @$(CC) $(CFLAGS) -c $< -o $@
+ @mkdir -p `dirname $@`
+ $(CC) $(CFLAGS) -c $< -o $@
+dirs:
+ @mkdir -p $(DIRS)
+
install: all
mkdir -p $(bindir)
mkdir -p $(includedir)
mkdir -p $(libdir)
mkdir -p $(libdir)/pkgconfig
cp $(PROGS) $(bindir)
- cp include/tdb.h $(includedir)
- cp tdb.pc $(libdir)/pkgconfig
+ cp $(srcdir)/include/tdb.h $(includedir)
+ cp $(srcdir)/tdb.pc $(libdir)/pkgconfig
bin/tdbtest: tools/tdbtest.o $(TDB_OBJ)
$(CC) $(CFLAGS) -o bin/tdbtest tools/tdbtest.o $(TDB_OBJ) -lgdbm
Modified: branches/SAMBA_4_0/source/lib/tdb/configure.in
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/configure.in 2006-08-22 01:32:29 UTC (rev 17679)
+++ branches/SAMBA_4_0/source/lib/tdb/configure.in 2006-08-22 01:45:39 UTC (rev 17680)
@@ -1,3 +1,4 @@
+AC_PREREQ(2.50)
AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
AC_DEFUN([SMB_ENABLE], [echo -n ""])
@@ -2,2 +3,3 @@
AC_INIT(include/tdb.h)
+AC_CONFIG_SRCDIR([common/tdb.c])
AC_CONFIG_HEADER(include/config.h)
More information about the samba-cvs
mailing list