diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 17:14:03 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 17:14:03 +0100 |
| commit | 0459d958862b9f048197c792dee76b64ac0cdf38 (patch) | |
| tree | 60d17068f54ed0ccf16d19f4680efec13ec49e39 | |
| parent | cddb061f3ce1f872d28d0b2e384f6071356c2409 (diff) | |
| download | samba-0459d958862b9f048197c792dee76b64ac0cdf38.tar.gz samba-0459d958862b9f048197c792dee76b64ac0cdf38.tar.bz2 samba-0459d958862b9f048197c792dee76b64ac0cdf38.zip | |
Use make to create lists of plugins, remove duplicate variable.
(This used to be commit 36cc584374d32c7875333fa5abd97b31e83291aa)
| -rw-r--r-- | source4/Makefile | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/source4/Makefile b/source4/Makefile index a2f0afc5f1..ea98b5e469 100644 --- a/source4/Makefile +++ b/source4/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/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 0f0c716cac..bac9c30f3a 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -24,8 +24,6 @@ sub new($$$) $self->{python_dsos} = []; $self->{python_pys} = []; $self->{headers} = []; - $self->{shared_modules} = []; - $self->{plugins} = []; $self->{output} = ""; $self->{mkfile} = $mkfile; @@ -142,8 +140,7 @@ 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("PLUGINS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n"); $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"); $self->output("\t\@mkdir -p \$(DESTDIR)\$(modulesdir)/$sane_subsystem/\n"); @@ -421,8 +418,6 @@ sub write($$) $self->output("PYTHON_DSOS = " . array2oneperline($self->{python_dsos}) . "\n"); $self->output("PYTHON_PYS = " . array2oneperline($self->{python_pys}) . "\n"); $self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) . "\n"); - $self->output("SHARED_MODULES = " . array2oneperline($self->{shared_modules}) . "\n"); - $self->output("PLUGINS = " . array2oneperline($self->{plugins}) . "\n"); $self->_prepare_mk_files(); |