diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-26 18:03:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:45 -0500 |
| commit | d8e35f882879e189f55b3bca818dd44cc5f0c6fa (patch) | |
| tree | e9a9696ef8406b06cdaa2dee0dfcc2d01d594d76 /source4/ntvfs | |
| parent | 448483199fb436309735f5203b3282fca2c517ec (diff) | |
| download | samba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.tar.gz samba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.tar.bz2 samba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.zip | |
r12498: Eliminate INIT_OBJ_FILES and ADD_OBJ_FILES. We were not using
the difference between these at all, and in the future the
fact that INIT_OBJ_FILES include smb_build.h will be sufficient to
have recompiles at the right time.
(This used to be commit b24f2583edee38abafa58578d8b5c4b43e517def)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/config.mk | 20 | ||||
| -rw-r--r-- | source4/ntvfs/posix/config.mk | 5 | ||||
| -rw-r--r-- | source4/ntvfs/unixuid/config.mk | 2 |
3 files changed, 12 insertions, 15 deletions
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk index a600a9a9a0..1c37a608bf 100644 --- a/source4/ntvfs/config.mk +++ b/source4/ntvfs/config.mk @@ -7,7 +7,7 @@ include unixuid/config.mk [MODULE::ntvfs_cifs] INIT_FUNCTION = ntvfs_cifs_init SUBSYSTEM = NTVFS -INIT_OBJ_FILES = \ +OBJ_FILES = \ cifs/vfs_cifs.o REQUIRED_SUBSYSTEMS = \ LIBCLI @@ -19,9 +19,8 @@ REQUIRED_SUBSYSTEMS = \ [MODULE::ntvfs_simple] INIT_FUNCTION = ntvfs_simple_init SUBSYSTEM = NTVFS -INIT_OBJ_FILES = \ - simple/vfs_simple.o -ADD_OBJ_FILES = \ +OBJ_FILES = \ + simple/vfs_simple.o \ simple/svfs_util.o # End MODULE ntvfs_cifs ################################################ @@ -31,7 +30,7 @@ ADD_OBJ_FILES = \ [MODULE::ntvfs_print] INIT_FUNCTION = ntvfs_print_init SUBSYSTEM = NTVFS -INIT_OBJ_FILES = \ +OBJ_FILES = \ print/vfs_print.o # End MODULE ntvfs_print ################################################ @@ -41,7 +40,7 @@ INIT_OBJ_FILES = \ [MODULE::ntvfs_ipc] SUBSYSTEM = NTVFS INIT_FUNCTION = ntvfs_ipc_init -INIT_OBJ_FILES = \ +OBJ_FILES = \ ipc/vfs_ipc.o \ ipc/ipc_rap.o \ ipc/rap_server.o @@ -55,7 +54,7 @@ INIT_OBJ_FILES = \ [MODULE::ntvfs_nbench] SUBSYSTEM = NTVFS INIT_FUNCTION = ntvfs_nbench_init -INIT_OBJ_FILES = \ +OBJ_FILES = \ nbench/vfs_nbench.o # End MODULE ntvfs_nbench ################################################ @@ -63,7 +62,7 @@ INIT_OBJ_FILES = \ ################################################ # Start SUBSYSTEM ntvfs_common [SUBSYSTEM::ntvfs_common] -ADD_OBJ_FILES = \ +OBJ_FILES = \ common/brlock.o \ common/opendb.o \ common/sidmap.o @@ -80,9 +79,8 @@ MINOR_VERSION = 0 INIT_FUNCTION = ntvfs_init DESCRIPTION = Virtual File System with NTFS semantics RELEASE_VERSION = 1 -INIT_OBJ_FILES = \ - ntvfs_base.o -ADD_OBJ_FILES = \ +OBJ_FILES = \ + ntvfs_base.o \ ntvfs_generic.o \ ntvfs_interface.o \ ntvfs_util.o diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index cf406890c9..53c51cf805 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -3,9 +3,8 @@ [MODULE::ntvfs_posix] SUBSYSTEM = NTVFS INIT_FUNCTION = ntvfs_posix_init -INIT_OBJ_FILES = \ - vfs_posix.o -ADD_OBJ_FILES = \ +OBJ_FILES = \ + vfs_posix.o \ pvfs_util.o \ pvfs_search.o \ pvfs_dirlist.o \ diff --git a/source4/ntvfs/unixuid/config.mk b/source4/ntvfs/unixuid/config.mk index b9c8000384..d99229729c 100644 --- a/source4/ntvfs/unixuid/config.mk +++ b/source4/ntvfs/unixuid/config.mk @@ -3,7 +3,7 @@ [MODULE::ntvfs_unixuid] INIT_FUNCTION = ntvfs_unixuid_init SUBSYSTEM = NTVFS -INIT_OBJ_FILES = \ +OBJ_FILES = \ vfs_unixuid.o REQUIRED_SUBSYSTEMS = \ ntvfs_common |