Author: paulg Date: 2006-12-01 19:48:31 +0000 (Fri, 01 Dec 2006) New Revision: 19989
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19989 Log: Add support to the tdb Makefile.in for executable extensions and for separately specifying CPPFLAGS and LDFLAGS. Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-12-01 18:05:09 UTC (rev 19988) +++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-12-01 19:48:31 UTC (rev 19989) @@ -12,11 +12,17 @@ VPATH = @srcdir@:@libreplacedir@ srcdir = @srcdir@ builddir = @builddir@ -CFLAGS = -I$(srcdir)/include -Iinclude [EMAIL PROTECTED]@ @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude [EMAIL PROTECTED]@ +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@ @LIBREPLACEOBJ@ DIRS = bin common tools @@ -26,6 +32,8 @@ 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 @@ 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