diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-11-24 10:37:24 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-11-24 10:37:24 +0000 |
| commit | 5e64ecac2f2de4888d83872aaf273e3c1882c772 (patch) | |
| tree | a7bcd08ccf2c968312a6f77e40076d291de426e3 | |
| parent | f5fe95abd203cc0506bcf7e94690d102d854ba0e (diff) | |
| download | samba-5e64ecac2f2de4888d83872aaf273e3c1882c772.tar.gz samba-5e64ecac2f2de4888d83872aaf273e3c1882c772.tar.bz2 samba-5e64ecac2f2de4888d83872aaf273e3c1882c772.zip | |
removed the STFS specific flags in the Makefile.
Jim, we are going to need to redo the STFS backend as a module, as
otherwise maintaining it outside of the samba.org tree will become too
awkward.
(This used to be commit 0fedafd7a026c8a793a1478d8a989f0c930092b4)
| -rw-r--r-- | source4/Makefile.in | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/source4/Makefile.in b/source4/Makefile.in index 52dce72edc..47122679c6 100644 --- a/source4/Makefile.in +++ b/source4/Makefile.in @@ -84,13 +84,7 @@ LIBSMBCLIENT_MAJOR=0 LIBSMBCLIENT_MINOR=1 -FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I. $(CPPFLAGS) -I$(srcdir) -FLAGS2 = -I/usr/src/newport/csm/include/@STFS_CSM_INCLUDE@ -I/usr/src/newport/csm/include/common -I/usr/src/newport/stp/include -FLAGS3 = -FLAGS4 = -FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -FLAGS = $(ISA) $(FLAGS5) -FLAGS32 = $(ISA32) $(FLAGS5) +FLAGS = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I. $(CPPFLAGS) -I$(srcdir) PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\" PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" @@ -284,10 +278,6 @@ CSM_NTVFS_OBJ = ntvfs/tank/csm_init.o ntvfs/tank/csm_unlink.o \ ntvfs/tank/csm_attr.o ntvfs/tank/csm_truncate.o \ ntvfs/tank/csm_fd.o -@STFS_ENABLED@STFS_MAIN = $(CSM_NTVFS_MAIN) -@STFS_ENABLED@STFS_OBJS = $(CSM_NTVFS_OBJ) -@STFS_ENABLED@STFS_LIBS = -L/usr/lib -L/usr/src/newport/csm/lib -Wl,"-(,-lcsm,-lcsmlinuxusp,-)" - SMBD_NTVFS_OBJ = ntvfs/ntvfs_base.o ntvfs/ntvfs_util.o ntvfs/ntvfs_generic.o \ ntvfs/simple/vfs_simple.o ntvfs/simple/svfs_util.o \ ntvfs/ipc/vfs_ipc.o ntvfs/cifs/vfs_cifs.o \ @@ -302,7 +292,7 @@ SMBD_OBJ_SRV = smbd/connection.o \ lib/sysacls.o lib/server_mutex.o \ smbd/build_options.o smbd/service.o \ smbd/rewrite.o \ - $(SMBD_NTVFS_OBJ) $(STFS_MAIN) @SMBD_EXTRA_OBJS@ + $(SMBD_NTVFS_OBJ) @SMBD_EXTRA_OBJS@ PROCESS_MODEL_OBJ = smbd/process.o smbd/process_model.o smbd/process_standard.o \ smbd/process_single.o @@ -311,7 +301,7 @@ PROCESS_MODEL_OBJ = smbd/process.o smbd/process_model.o smbd/process_standard.o # printing/printfsp.o -SMBD_OBJ_BASE = $(PROCESS_MODEL_OBJ) $(SMBD_OBJ_SRV) $(STFS_OBJS) \ +SMBD_OBJ_BASE = $(PROCESS_MODEL_OBJ) $(SMBD_OBJ_SRV) \ $(MSDFS_OBJ) $(PARAM_OBJ) \ $(SECRETS_OBJ) \ $(PASSDB_OBJ) \ @@ -708,7 +698,7 @@ bin/.dummy: bin/smbd@EXEEXT@: $(SMBD_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \ - $(AUTHLIBS) $(ACLLIBS) $(LIBS) $(PTHREAD_LIB) @SMBD_EXTRA_LIBS@ $(STFS_LIBS) @BUILD_POPT@ + $(AUTHLIBS) $(ACLLIBS) $(LIBS) $(PTHREAD_LIB) @SMBD_EXTRA_LIBS@ @BUILD_POPT@ bin/nmbd@EXEEXT@: $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ |