[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-874-gf5b2b20
Jelmer Vernooij
jelmer at samba.org
Mon Feb 18 11:28:47 GMT 2008
The branch, v4-0-test has been updated
via f5b2b20cafc137604bc527ca6bb2bc8edab551e9 (commit)
from 0d8ddae4964dc50e981e12b6a93235a50a0607ff (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit f5b2b20cafc137604bc527ca6bb2bc8edab551e9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 18 12:26:43 2008 +0100
Eliminate duplicate variable.
-----------------------------------------------------------------------
Summary of changes:
source/Makefile | 2 +-
source/build/smb_build/makefile.pm | 3 ---
2 files changed, 1 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile b/source/Makefile
index a2f0afc..ea98b5e 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -29,7 +29,7 @@ DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
binaries::
libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
-modules:: $(SHARED_MODULES)
+modules:: $(PLUGINS)
headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
manpages:: $(MANPAGES)
all:: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules pythonmods
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 16b46ed..b7b5622 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -29,7 +29,6 @@ sub new($$$)
$self->{python_pys} = [];
$self->{shared_libs} = [];
$self->{headers} = [];
- $self->{shared_modules} = [];
$self->{plugins} = [];
$self->{pc_files} = [];
$self->{proto_headers} = [];
@@ -149,7 +148,6 @@ sub SharedModule($$)
push (@{$self->{python_dsos}},
"$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
} else {
- push (@{$self->{shared_modules}}, "$ctx->{TARGET_SHARED_LIBRARY}");
push (@{$self->{plugins}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
$self->output("installplugins:: $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
$self->output("\t\@echo Installing $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n");
@@ -456,7 +454,6 @@ sub write($$)
$self->output("PC_FILES = " . array2oneperline($self->{pc_files}) . "\n");
$self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) . "\n");
$self->output("PROTO_HEADERS = " . array2oneperline($self->{proto_headers}) . "\n");
- $self->output("SHARED_MODULES = " . array2oneperline($self->{shared_modules}) . "\n");
$self->output("PLUGINS = " . array2oneperline($self->{plugins}) . "\n");
$self->_prepare_mk_files();
--
Samba Shared Repository
More information about the samba-cvs
mailing list