[packages] samba3: add missing patches from previous update commit, refresh series
[openwrt/svn-archive/archive.git] / net / samba3 / patches / 510-remove-printing.patch
1 --- a/source/Makefile.in
2 +++ b/source/Makefile.in
3 @@ -319,7 +319,7 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_wk
4
5 REGOBJS_OBJ = registry/reg_objects.o
6
7 -REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_printing.o \
8 +REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o $(if $(OWRT_NO_PRINTING),,registry/reg_printing.o) \
9 registry/reg_db.o registry/reg_eventlog.o registry/reg_shares.o \
10 registry/reg_util.o registry/reg_dynamic.o registry/reg_perfcount.o
11
12 @@ -349,7 +349,7 @@ RPC_NTSVCS_OBJ = $(if $(OWRT_SMALLER),,r
13
14 RPC_DFS_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_dfs.o rpc_server/srv_dfs_nt.o)
15
16 -RPC_SPOOLSS_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o)
17 +RPC_SPOOLSS_OBJ = $(if $(OWRT_SMALLER)$(OWRT_NO_PRINTING),,rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o)
18
19 RPC_EVENTLOG_OBJ = $(if $(OWRT_SMALLER),,rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o rpc_server/srv_eventlog_lib.o)
20
21 @@ -463,7 +463,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpass
22 smbd/vfs.o smbd/statcache.o \
23 smbd/posix_acls.o lib/sysacls.o $(SERVER_MUTEX_OBJ) \
24 smbd/process.o smbd/service.o smbd/error.o \
25 - printing/printfsp.o lib/sysquotas.o lib/sysquotas_linux.o \
26 + $(if $(OWRT_NO_PRINTING),,printing/printfsp.o) lib/sysquotas.o lib/sysquotas_linux.o \
27 lib/sysquotas_xfs.o lib/sysquotas_4A.o \
28 smbd/change_trust_pw.o smbd/fake_file.o \
29 smbd/ntquotas.o $(AFS_OBJ) smbd/msdfs.o \
30 @@ -480,13 +480,13 @@ SMBD_OBJ_BASE = $(PARAM_OBJ) $(SMBD_OBJ_
31 $(REGISTRY_OBJ) $(POPT_LIB_OBJ) \
32 $(BUILDOPT_OBJ) $(SMBLDAP_OBJ)
33
34 -PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
35 +PRINTING_OBJ = $(if $(OWRT_NO_PRINTING),,printing/pcap.o printing/print_svid.o printing/print_aix.o \
36 printing/print_cups.o printing/print_generic.o \
37 printing/lpq_parse.o printing/load.o \
38 - printing/print_iprint.o printing/print_test.o
39 + printing/print_iprint.o printing/print_test.o)
40
41 -PRINTBASE_OBJ = printing/notify.o printing/printing_db.o
42 -PRINTBACKEND_OBJ = printing/printing.o printing/nt_printing.o $(PRINTBASE_OBJ)
43 +PRINTBASE_OBJ = $(if $(OWRT_NO_PRINTING),,printing/notify.o printing/printing_db.o)
44 +PRINTBACKEND_OBJ = $(if $(OWRT_NO_PRINTING),,printing/printing.o printing/nt_printing.o $(PRINTBASE_OBJ))
45
46 SMBD_OBJ = $(SMBD_OBJ_BASE) $(SMBD_OBJ_MAIN)
47 NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \