diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-07 13:47:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:52:29 -0500 |
| commit | 1718e2d4df28ecdf39247b8095ec61a4abab49fe (patch) | |
| tree | 34e034ab60bde50a43f99fffe2a284868a96126d | |
| parent | 17ae598141b44142ad52a66cc4767029e3a73d6c (diff) | |
| download | samba-1718e2d4df28ecdf39247b8095ec61a4abab49fe.tar.gz samba-1718e2d4df28ecdf39247b8095ec61a4abab49fe.tar.bz2 samba-1718e2d4df28ecdf39247b8095ec61a4abab49fe.zip | |
r13939: Fix bin/.dummy issues, add more ignores
(This used to be commit 557533b9173a72d2db2a0fa05ab5500f446306c8)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 0638c0ac30..0feabd8ac9 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -273,7 +273,7 @@ sub SharedLibrary($$) $self->output(<< "__EOD__" # -bin/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) bin/.dummy +bin/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) \@echo Linking \$\@ \@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \\ \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \\ @@ -284,11 +284,11 @@ __EOD__ if (defined($ctx->{LIBRARY_SONAME})) { $self->output(<< "__EOD__" # Symlink $ctx->{LIBRARY_SONAME} -bin/$ctx->{LIBRARY_SONAME}: bin/$ctx->{LIBRARY_REALNAME} bin/.dummy +bin/$ctx->{LIBRARY_SONAME}: bin/$ctx->{LIBRARY_REALNAME} \@echo Symlink \$\@ \@ln -sf $ctx->{LIBRARY_REALNAME} \$\@ # Symlink $ctx->{LIBRARY_NAME} -bin/$ctx->{LIBRARY_NAME}: bin/$ctx->{LIBRARY_SONAME} bin/.dummy +bin/$ctx->{LIBRARY_NAME}: bin/$ctx->{LIBRARY_SONAME} \@echo Symlink \$\@ \@ln -sf $ctx->{LIBRARY_SONAME} \$\@ @@ -361,7 +361,7 @@ sub StaticLibrary($$) $self->output(<< "__EOD__" # -$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) bin/.dummy +$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) \@echo Linking \$@ \@\$(STLD) \$(STLD_FLAGS) \$@ \\ \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) @@ -415,7 +415,7 @@ sub Binary($$) if ($self->{duplicate_build}) { $self->output(<< "__EOD__" # -bin/$ctx->{BINARY}: bin/.dummy \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) +bin/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) \@echo Linking \$\@ \@\$(CC) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) \\ |