diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 16:33:13 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 16:33:13 +0100 |
| commit | c3633118127ea354ac0bc262f1ed2b6dc49160b1 (patch) | |
| tree | 0f429b4b38923f4f277703049918a7da4214a813 /source4/Makefile | |
| parent | df3871fca23863dffa5c89eac80ad8b2f3a0f948 (diff) | |
| parent | d803ff9e724cc91778c1b94a5b78ef935200adb8 (diff) | |
| download | samba-c3633118127ea354ac0bc262f1ed2b6dc49160b1.tar.gz samba-c3633118127ea354ac0bc262f1ed2b6dc49160b1.tar.bz2 samba-c3633118127ea354ac0bc262f1ed2b6dc49160b1.zip | |
Merge branch 'v4-0-trivial' into v4-0-gmake3
(This used to be commit 8e716d139003d3e743dd99d93f76da4cfa7d48b3)
Diffstat (limited to 'source4/Makefile')
| -rw-r--r-- | source4/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/Makefile b/source4/Makefile index e5399e4c32..a2f0afc5f1 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -27,7 +27,7 @@ include data.mk DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \ $(srcdir)/version.h -binaries:: $(BINARIES) +binaries:: libraries:: $(STATIC_LIBS) $(SHARED_LIBS) modules:: $(SHARED_MODULES) headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS) @@ -124,8 +124,8 @@ installbin:: $(SBIN_PROGS) $(BIN_PROGS) $(TORTURE_PROGS) installdirs installplugins:: -installlib:: $(INSTALLABLE_SHARED_LIBS) $(STATIC_LIBS) installdirs - @$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(SHLIBEXT)" $(INSTALLABLE_SHARED_LIBS) +installlib:: $(SHARED_LIBS) $(STATIC_LIBS) installdirs + @$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(SHLIBEXT)" $(SHARED_LIBS) #@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) "$(STLIBEXT)" $(STATIC_LIBS) installheader:: headers installdirs |