diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-15 15:59:10 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:24 -0500 |
| commit | f8be4e8a4fd853d97c5f3188e93747314618323a (patch) | |
| tree | 5aedacafd011823c86cb29486169a9724ecb3978 /source4/main.mk | |
| parent | 6589e93b1b8a61860931a171a0306b270597e1f2 (diff) | |
| download | samba-f8be4e8a4fd853d97c5f3188e93747314618323a.tar.gz samba-f8be4e8a4fd853d97c5f3188e93747314618323a.tar.bz2 samba-f8be4e8a4fd853d97c5f3188e93747314618323a.zip | |
r12253: Automatically build seperate binaries without -rpath to install when
using shared libraries and developer mode is enabled.
(This used to be commit 507bee76dc26b048ead317ec5e10a9deb1ff7f09)
Diffstat (limited to 'source4/main.mk')
| -rw-r--r-- | source4/main.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/main.mk b/source4/main.mk index 1f8838a495..74d33c8f32 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -1,4 +1,4 @@ -all: binary_asn1_compile binary_compile_et binaries +all: basics bin/asn1_compile bin/compile_et binaries include heimdal_build/config.mk include config.mk @@ -30,7 +30,7 @@ include libcli/config.mk include scripting/config.mk include kdc/config.mk -binaries: $(BIN_PROGS) $(SBIN_PROGS) +binaries: $(BINARIES) libraries: $(STATIC_LIBS) $(SHARED_LIBS) headers: $(PUBLIC_HEADERS) manpages: $(MANPAGES) @@ -53,7 +53,7 @@ showlayout: showflags: @echo "Samba will be compiled with flags:" @echo " CFLAGS = $(CFLAGS)" - @echo " LD_FLAGS = $(LD_FLAGS)" + @echo " LDFLAGS = $(LDFLAGS)" @echo " STLD_FLAGS = $(STLD_FLAGS)" @echo " SHLD_FLAGS = $(SHLD_FLAGS)" @echo " LIBS = $(LIBS)" @@ -88,7 +88,7 @@ install: showlayout installbin installdat installswat installmisc installlib \ installdirs: @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(PRIVATEDIR)/tls $(DESTDIR)$(INCLUDEDIR) -installbin: binaries installdirs +installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS) @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(BIN_PROGS) @@ -200,7 +200,7 @@ clean: heimdal_clean @-rm -f lib/registry/regf.h lib/registry/tdr_regf* distclean: clean - -rm -f bin/.dummy + -rm -f bin/.dummy -rm -f include/config.h include/smb_build.h -rm -f Makefile -rm -f config.status |