diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 01:53:38 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 01:53:38 +0100 |
| commit | 8ada2737005d8a5f065949ba13da43ef72c17d45 (patch) | |
| tree | beed060b9d80667fe697827d9478f3a24ab4cd60 /source3/samba4.mk | |
| parent | e6d55522507ef06abbc282547a7f65fbc4243b90 (diff) | |
| download | samba-8ada2737005d8a5f065949ba13da43ef72c17d45.tar.gz samba-8ada2737005d8a5f065949ba13da43ef72c17d45.tar.bz2 samba-8ada2737005d8a5f065949ba13da43ef72c17d45.zip | |
Use make variable for Samba 4 shared library output directory.
Diffstat (limited to 'source3/samba4.mk')
| -rw-r--r-- | source3/samba4.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/samba4.mk b/source3/samba4.mk index 3f4fff4d35..a374e81084 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -6,6 +6,7 @@ HOSTLD = $(CC) PARTLINK = $(PROG_LD) -r MDLD = $(SHLD) MDLD_FLAGS = $(LDSHFLAGS) +shliboutputdir = bin/shared samba4srcdir = $(srcdir)/../source4 @@ -59,8 +60,6 @@ endif @mkdir -p $(@D) @$(AR) -rc $@ $^ -INTERN_LDFLAGS = -L${builddir}/bin/static -L${builddir}/bin/shared - pidldir = $(samba4srcdir)/../pidl include $(pidldir)/config.mk include samba4-config.mk @@ -151,7 +150,7 @@ clean:: @-find $(samba4srcdir) -name '*.ho' -exec rm -f '{}' \; @echo Removing samba 4 libraries @-rm -f $(STATIC_LIBS) $(SHARED_LIBS) - @-rm -f bin/static/*.a bin/shared/*.$(SHLIBEXT) bin/mergedobj/*.o + @-rm -f bin/static/*.a $(shliboutputdir)/*.$(SHLIBEXT) bin/mergedobj/*.o @echo Removing samba 4 modules @-rm -f bin/modules/*/*.$(SHLIBEXT) @-rm -f bin/*_init_module.c |