diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-11-20 11:17:06 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-11-20 11:17:06 +0000 |
| commit | b1e5882eb380ebfab3ca3e3d0c2d1f979d6efe86 (patch) | |
| tree | 4348b7412e09f5b759f86ae839d470ac2854e5cb | |
| parent | b0083691759c9d0561a5e9d436d927a44c82b388 (diff) | |
| download | samba-b1e5882eb380ebfab3ca3e3d0c2d1f979d6efe86.tar.gz samba-b1e5882eb380ebfab3ca3e3d0c2d1f979d6efe86.tar.bz2 samba-b1e5882eb380ebfab3ca3e3d0c2d1f979d6efe86.zip | |
* fixed libndr.h header
* "make clean" now removed the generated files
(This used to be commit 683259a4dd30861ed24e8e5df918c8725ae13800)
| -rw-r--r-- | source4/Makefile.in | 4 | ||||
| -rw-r--r-- | source4/librpc/ndr/libndr.h | 19 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_spoolss_buf.h | 23 |
3 files changed, 12 insertions, 34 deletions
diff --git a/source4/Makefile.in b/source4/Makefile.in index fd6c16b2a9..2601511517 100644 --- a/source4/Makefile.in +++ b/source4/Makefile.in @@ -1072,7 +1072,9 @@ TOPFILES=dynconfig.o dynconfig.po clean: delheaders python_clean -rm -f core */*~ *~ */*.o */*/*.o */*/*.po */*/*.po32 */*.po */*.po32 */*.@SHLIBEXT@ \ - $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(MODULES) $(TORTURE_PROGS) .headers.stamp + $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(MODULES) $(TORTURE_PROGS) \ + .headers.stamp + -rm -rf librpc/gen_* # Making this target will just make sure that the prototype files # exist, not necessarily that they are up to date. Since they're diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h index 8975874c90..93687d8796 100644 --- a/source4/librpc/ndr/libndr.h +++ b/source4/librpc/ndr/libndr.h @@ -191,13 +191,12 @@ typedef void (*ndr_print_union_fn_t)(struct ndr_print *, const char *, uint32, v /* now pull in the individual parsers */ #include "librpc/ndr/ndr_basic.h" #include "librpc/ndr/ndr_sec.h" -#include "librpc/ndr/ndr_misc.h" -#include "librpc/ndr/ndr_echo.h" -#include "librpc/ndr/ndr_lsa.h" -#include "librpc/ndr/ndr_dfs.h" -#include "librpc/ndr/ndr_spoolss.h" -#include "librpc/ndr/ndr_spoolss_buf.h" -#include "librpc/ndr/ndr_samr.h" -#include "librpc/ndr/ndr_wkssvc.h" -#include "librpc/ndr/ndr_srvsvc.h" -#include "librpc/ndr/ndr_atsvc.h" +#include "librpc/gen_ndr/ndr_misc.h" +#include "librpc/gen_ndr/ndr_echo.h" +#include "librpc/gen_ndr/ndr_lsa.h" +#include "librpc/gen_ndr/ndr_dfs.h" +#include "librpc/gen_ndr/ndr_spoolss.h" +#include "librpc/gen_ndr/ndr_samr.h" +#include "librpc/gen_ndr/ndr_wkssvc.h" +#include "librpc/gen_ndr/ndr_srvsvc.h" +#include "librpc/gen_ndr/ndr_atsvc.h" diff --git a/source4/librpc/ndr/ndr_spoolss_buf.h b/source4/librpc/ndr/ndr_spoolss_buf.h deleted file mode 100644 index 3ff43a116c..0000000000 --- a/source4/librpc/ndr/ndr_spoolss_buf.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - definitions for marshalling/unmarshalling spoolss buffer structures - - Copyright (C) Andrew Tridgell 2003 - Copyright (C) Tim Potter 2003 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - |