VPATH problems with samba-1.9.18p8

[Tim Rice]

On Thu, 6 Aug 1998, Bill Campbell wrote:

> The following diffs fix some problems I've found compiling samba-1.9.18p8
> in a directory other than the source directory.  This includes fixes the
> the Makefile as well as a couple of the install.*sh scripts which didn't
> recognize the SRCDIR setting and attempted to copy files from the current
> directory.
> 
> The changes to the Makefile include:
> 
>   1.  Make the appropriate subdirectories for object files.

Nice work.
I took it a step further and modified the Makefile to work
with compilers that can't handle both -c and -o.
(UnixWare 1.x, UnixWare 2.x, SCO UNIX 3.2v4.2, and perhaps others)


> 
>   2.  Fix the -o option the rule to make objects removing $(srcdir)

I took out the -o part alltogether and added rules for all the
parts that live in subdirectories.

> 
>   3.  Add the $(srcdir) argument to installscripts.sh and installcp.sh
>       which they need for their source files.
> 
> My changes to installscripts.sh and installcp.sh include some things that
> others may not want to use as we use ginstall modified to install relative
> to the ROOT environment variable (actually I have rewritten gnu-install in
> perl to use rsync to update the objects preserving the timestamps and
> allowing more efficient installs across a network).
> 
[snip patches]

-- 
Tim Rice			Multitalents	(707) 887-1469 (voice)
tim at trr.metro.net

-------------- next part --------------
*** Makefile.old	Thu Aug  6 23:12:28 1998
--- Makefile	Fri Aug  7 17:42:03 1998
***************
*** 765,771 ****
  
  .c.o: $(INCLUDES)
  	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c -o $*.o
  
  smbd: $(SMBDOBJ) $(ARCFOUR_OBJ)
  	@echo Linking smbd
--- 765,861 ----
  
  .c.o: $(INCLUDES)
  	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 
! mem_man/mem_man.o: $(INCLUDES) mem_man/mem_man.c mem_man/mem_man.h
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv mem_man.o mem_man/mem_man.o
! 
! ubiqx/ubi_dLinkList.o: $(INCLUDES) ubiqx/ubi_dLinkList.h ubiqx/ubi_dLinkList.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv ubi_dLinkList.o ubiqx/ubi_dLinkList.o 
! 
! rpc_pipes/lsa_hnd.o: $(INCLUDES) rpc_pipes/lsa_hnd.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv lsa_hnd.o rpc_pipes/lsa_hnd.o 
! 
! rpc_pipes/lsaparse.o: $(INCLUDES) rpc_pipes/lsaparse.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv lsaparse.o rpc_pipes/lsaparse.o 
! 
! rpc_pipes/ntclientlsa.o: $(INCLUDES) rpc_pipes/ntclientlsa.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv ntclientlsa.o rpc_pipes/ntclientlsa.o 
! 
! rpc_pipes/ntclientnet.o: $(INCLUDES) rpc_pipes/ntclientnet.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv ntclientnet.o rpc_pipes/ntclientnet.o 
! 
! rpc_pipes/ntclientpipe.o: $(INCLUDES) rpc_pipes/ntclientpipe.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv ntclientpipe.o rpc_pipes/ntclientpipe.o 
! 
! rpc_pipes/pipe_hnd.o: $(INCLUDES) rpc_pipes/pipe_hnd.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv pipe_hnd.o rpc_pipes/pipe_hnd.o 
! 
! rpc_pipes/pipenetlog.o: $(INCLUDES) rpc_pipes/pipenetlog.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv pipenetlog.o rpc_pipes/pipenetlog.o 
! 
! rpc_pipes/pipentlsa.o: $(INCLUDES) rpc_pipes/pipentlsa.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv pipentlsa.o rpc_pipes/pipentlsa.o 
! 
! rpc_pipes/pipesamr.o: $(INCLUDES) rpc_pipes/pipesamr.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv pipesamr.o rpc_pipes/pipesamr.o 
! 
! rpc_pipes/pipesrvsvc.o: $(INCLUDES) rpc_pipes/pipesrvsvc.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv pipesrvsvc.o rpc_pipes/pipesrvsvc.o 
! 
! rpc_pipes/pipeutil.o: $(INCLUDES) rpc_pipes/pipeutil.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv pipeutil.o rpc_pipes/pipeutil.o 
! 
! rpc_pipes/pipewkssvc.o: $(INCLUDES) rpc_pipes/pipewkssvc.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv pipewkssvc.o rpc_pipes/pipewkssvc.o 
! 
! rpc_pipes/samrparse.o: $(INCLUDES) rpc_pipes/samrparse.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv samrparse.o rpc_pipes/samrparse.o 
! 
! rpc_pipes/smbparse.o: $(INCLUDES) rpc_pipes/smbparse.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv smbparse.o rpc_pipes/smbparse.o 
! 
! rpc_pipes/srvparse.o: $(INCLUDES) rpc_pipes/srvparse.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv srvparse.o rpc_pipes/srvparse.o 
! 
! rpc_pipes/wksparse.o: $(INCLUDES) rpc_pipes/wksparse.c
! 	@echo Compiling $*.c
! 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
! 	mv wksparse.o rpc_pipes/wksparse.o 
  
  smbd: $(SMBDOBJ) $(ARCFOUR_OBJ)
  	@echo Linking smbd