summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Green <paulg@samba.org>2006-12-01 20:45:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:18 -0500
commit4eb9dda8a7e7b8a223478edbb86c7d7a6ddfe4ce (patch)
treeecdc8ab5382d7ad1bfe833887f6bc6024bfeb948
parentecf90c495eb850cd6f376fb4e090640b69f0c029 (diff)
downloadsamba-4eb9dda8a7e7b8a223478edbb86c7d7a6ddfe4ce.tar.gz
samba-4eb9dda8a7e7b8a223478edbb86c7d7a6ddfe4ce.tar.bz2
samba-4eb9dda8a7e7b8a223478edbb86c7d7a6ddfe4ce.zip
r19992: Add support to the tdb Makefile.in for executable extensions and for
separately specifying CPPFLAGS and LDFLAGS. (This used to be commit 8c36f1a7458e7cf29c9ec647e98d0a1e2d32d239)
-rw-r--r--source3/tdb/Makefile.in38
1 files changed, 23 insertions, 15 deletions
diff --git a/source3/tdb/Makefile.in b/source3/tdb/Makefile.in
index e16f50f6dd..455a6e52ce 100644
--- a/source3/tdb/Makefile.in
+++ b/source3/tdb/Makefile.in
@@ -12,11 +12,17 @@ libdir = @libdir@
VPATH = @srcdir@:@libreplacedir@
srcdir = @srcdir@
builddir = @builddir@
-CFLAGS = -I$(srcdir)/include -Iinclude -I../include -I@libreplacedir@ @CFLAGS@
+CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude -I../include -I@libreplacedir@
+CFLAGS = $(CPPFLAGS) @CFLAGS@
+LDFLAGS = @LDFLAGS@
+EXEEXT = @EXEEXT@
.PHONY: test
-PROGS = bin/tdbtool bin/tdbtorture
+PROGS = bin/tdbtool$(EXEEXT) bin/tdbtorture$(EXEEXT)
+PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT)
+ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL)
+
TDB_OBJ = @TDBOBJ@
DIRS = bin common tools
@@ -26,6 +32,8 @@ all: showflags dirs $(PROGS)
showflags:
@echo 'tdb will be compiled with flags:'
@echo ' CFLAGS = $(CFLAGS)'
+ @echo ' CPPFLAGS = $(CPPFLAGS)'
+ @echo ' LDFLAGS = $(LDFLAGS)'
@echo ' LIBS = $(LIBS)'
.c.o:
@@ -48,28 +56,28 @@ install: all
libtdb.a: $(TDB_OBJ)
ar -rv libtdb.a $(TDB_OBJ)
-bin/tdbtest: tools/tdbtest.o libtdb.a
- $(CC) $(CFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm
+bin/tdbtest$(EXEEXT): tools/tdbtest.o libtdb.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm
-bin/tdbtool: tools/tdbtool.o libtdb.a
- $(CC) $(CFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb
+bin/tdbtool$(EXEEXT): tools/tdbtool.o libtdb.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb
-bin/tdbtorture: tools/tdbtorture.o libtdb.a
- $(CC) $(CFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb
+bin/tdbtorture$(EXEEXT): tools/tdbtorture.o libtdb.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb
-bin/tdbdump: tools/tdbdump.o libtdb.a
- $(CC) $(CFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb
+bin/tdbdump$(EXEEXT): tools/tdbdump.o libtdb.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb
-bin/tdbbackup: tools/tdbbackup.o libtdb.a
- $(CC) $(CFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb
+bin/tdbbackup$(EXEEXT): tools/tdbbackup.o libtdb.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb
-test: bin/tdbtorture
- bin/tdbtorture
+test: bin/tdbtorture$(EXEEXT)
+ bin/tdbtorture$(EXEEXT)
installcheck: test install
clean:
- rm -f $(PROGS) *.o *.a common/*.o tools/*.o tdb.pc
+ rm -f $(ALL_PROGS) *.o *.a common/*.o tools/*.o tdb.pc
rm -f test.db test.tdb torture.tdb test.gdbm
distclean: clean