diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-03 10:50:53 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-03 10:50:53 +0100 |
commit | 7dd0cd26d32980d4edb9db5c77c98a2b112e24cb (patch) | |
tree | 025dad49b789c0e9f2eb03d87ec386295630b3f0 /source4/librpc | |
parent | 80e9b72e018fb7d7f2cd5ff383e4a533b4ccc705 (diff) | |
parent | 4d4a898742a0439d3f60c84194b02901412f4679 (diff) | |
download | samba-7dd0cd26d32980d4edb9db5c77c98a2b112e24cb.tar.gz samba-7dd0cd26d32980d4edb9db5c77c98a2b112e24cb.tar.bz2 samba-7dd0cd26d32980d4edb9db5c77c98a2b112e24cb.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/Makefile
source/build/smb_build/makefile.pm
source/librpc/config.mk
(This used to be commit 3e02fcfd3fb6683f51417ba39f4ec177494eff3e)
Diffstat (limited to 'source4/librpc')
-rw-r--r-- | source4/librpc/config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 8a5e1478f6..7abc693960 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -298,8 +298,8 @@ include librpc/idl-deps librpc/gen_ndr/tables.c: $(IDL_NDR_PARSE_H_FILES) @echo Generating $@ - @$(PERL) $(srcdir)/librpc/tables.pl --output=$@ $(IDL_NDR_PARSE_H_FILES) > librpc/gen_ndr/tables.x - mv librpc/gen_ndr/tables.x $@ + @$(PERL) $(srcdir)/librpc/tables.pl --output=$@ $^ > librpc/gen_ndr/tables.x + @mv librpc/gen_ndr/tables.x $@ [SUBSYSTEM::NDR_TABLE] OBJ_FILES = ndr/ndr_table.o gen_ndr/tables.o |