diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-11 15:42:19 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:06:25 -0500 |
commit | ed2a1c718ae4fb56fdfe73da6f63ddb7fb15d9fd (patch) | |
tree | d583b466f1e3fdfe309d4e19077e2cc7deb6a862 /source4/lib/ldb/config.mk | |
parent | c44019e1e3d804f577e6432e191fb3d3e93a8f02 (diff) | |
download | samba-ed2a1c718ae4fb56fdfe73da6f63ddb7fb15d9fd.tar.gz samba-ed2a1c718ae4fb56fdfe73da6f63ddb7fb15d9fd.tar.bz2 samba-ed2a1c718ae4fb56fdfe73da6f63ddb7fb15d9fd.zip |
r25081: Add modules_dir member to ldb_context that is used rather than a global
modulesdir setting. Samba always sets this to lp_modulesdir()/ldb
(This used to be commit e672380d2156cf0421108a9c34f04f096c2afeed)
Diffstat (limited to 'source4/lib/ldb/config.mk')
-rw-r--r-- | source4/lib/ldb/config.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index e47bf8ea39..ec74599fd8 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -142,9 +142,16 @@ PRIVATE_DEPENDENCIES = \ ./lib/ldb/common/ldb_modules.o: lib/ldb/common/ldb_modules.c Makefile @echo Compiling $< @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) \ - -DLDBMODULESDIR=\"$(MODULESDIR)/ldb\" -DSHLIBEXT=\"$(SHLIBEXT)\" \ + -DSHLIBEXT=\"$(SHLIBEXT)\" \ -c $< -o $@ +./lib/ldb/common/ldb.o: lib/ldb/common/ldb.c Makefile + @echo Compiling $< + @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) \ + -DLDB_MODULESDIR=\"$(MODULESDIR)/ldb\" \ + -c $< -o $@ + + ################################################ # Start SUBSYSTEM ldb [LIBRARY::LIBLDB] |