diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-02-01 12:16:26 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2004-02-01 12:16:26 +0000 |
| commit | 9b736c3d9e459241232f2313ad6f99a352633c19 (patch) | |
| tree | 48c0d1d5670684ddf7c99529144e576b0d246a60 /source4/Makefile.in | |
| parent | 670ccc7d643b8e04743542b4336f6830ac065463 (diff) | |
| download | samba-9b736c3d9e459241232f2313ad6f99a352633c19.tar.gz samba-9b736c3d9e459241232f2313ad6f99a352633c19.tar.bz2 samba-9b736c3d9e459241232f2313ad6f99a352633c19.zip | |
Makefile.in cleanups:
lib/util_smbd.c is not used anymore
reorder the SMB_MODULE() parameters the goal is to autogenerate the
make rules for shared modules:
dnl SMB_MODULE(1:name,2:subsystem,3:default_build,
4:object_files,5:shared_object,6:libs
7:whatif-static,8:whatif-shared,9:whatif-not)
and generate <SUBSYSTEM>_LIBS and MODULE_<name>_LIBS with the SMB_MODULE() macro
metze
(This used to be commit 904ce91ed9e3b26d591278984ae32fa99bac01fd)
Diffstat (limited to 'source4/Makefile.in')
| -rw-r--r-- | source4/Makefile.in | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/source4/Makefile.in b/source4/Makefile.in index 1580814920..2ad5992ec6 100644 --- a/source4/Makefile.in +++ b/source4/Makefile.in @@ -119,8 +119,6 @@ LIB_OBJ = lib/version.o lib/charcnv.o lib/debug.o lib/fault.o \ lib/module.o \ lib/ldap_escape.o lib/events.o lib/mutex.o -LIB_SMBD_OBJ = lib/util_smbd.o $(LIB_OBJ) - READLINE_OBJ = lib/readline.o POPT_LIB_OBJ = lib/popt_common.o @@ -129,15 +127,14 @@ PARAM_OBJ = param/loadparm.o param/params.o dynconfig.o SECRETS_OBJ = passdb/secrets.o -LIBNMB_OBJ = libcli/unexpected.o libcli/namecache.o libcli/nmblib.o \ - libcli/namequery.o - -LIBSAMBA_OBJ = libcli/util/nterr.o libcli/util/smbdes.o libcli/util/smbencrypt.o +LIBNMB_OBJ = libcli/unexpected.o libcli/namecache.o libcli/nmblib.o \ + libcli/namequery.o LIBCLIUTIL_OBJ = libcli/util/asn1.o \ - libcli/util/smberr.o \ - libcli/util/doserr.o libcli/util/errormap.o \ - libcli/util/pwd_cache.o libcli/util/clierror.o libcli/util/cliutil.o + libcli/util/smberr.o \ + libcli/util/doserr.o libcli/util/errormap.o \ + libcli/util/pwd_cache.o libcli/util/clierror.o libcli/util/cliutil.o \ + libcli/util/nterr.o libcli/util/smbdes.o libcli/util/smbencrypt.o LIBRAW_NDR_OBJ = librpc/ndr/ndr.o librpc/ndr/ndr_basic.o librpc/ndr/ndr_sec.o \ librpc/ndr/ndr_spoolss_buf.o \ @@ -174,7 +171,7 @@ LIBRAW_OBJ = libcli/raw/rawfile.o libcli/raw/smb_signing.o \ libcli/raw/rawnegotiate.o libcli/raw/rawfsinfo.o \ libcli/raw/rawfileinfo.o libcli/raw/rawnotify.o \ libcli/raw/rawioctl.o libcli/raw/rawacl.o \ - $(LIBRAW_NDR_OBJ) $(LIBRAW_RPC_OBJ) $(LIBSAMBA_OBJ) $(LIBCLIUTIL_OBJ) \ + $(LIBRAW_NDR_OBJ) $(LIBRAW_RPC_OBJ) $(LIBCLIUTIL_OBJ) \ $(LIBNMB_OBJ) $(LIBCLIAUTH_OBJ) LIBSMB_OBJ = libcli/clireadwrite.o libcli/cliconnect.o \ @@ -232,7 +229,7 @@ PROCESS_MODEL_OBJ = smbd/process.o smbd/process_model.o smbd/process_standard.o SMBD_OBJ_BASE = $(PROCESS_MODEL_OBJ) $(SMBD_OBJ_SRV) \ $(PARAM_OBJ) $(SECRETS_OBJ) $(PASSDB_OBJ) \ - $(AUTH_OBJ) $(LIB_SMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_OBJ) + $(AUTH_OBJ) $(LIB_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_OBJ) SMBD_OBJ = $(SMBD_OBJ_MAIN) $(SMBD_OBJ_BASE) @@ -283,7 +280,7 @@ PROTO_OBJ = $(SMBD_OBJ_SRV) \ $(AUTH_OBJ) $(PARAM_OBJ) $(SECRETS_OBJ) \ $(PASSDB_OBJ) \ $(READLINE_OBJ) $(CLIENT_OBJ1) \ - $(LIB_SMBD_OBJ) $(POPT_LIB_OBJ) \ + $(LIB_OBJ) $(POPT_LIB_OBJ) \ POPT_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ popt/popthelp.o popt/poptparse.o |