Tue Jul 6 11:18:45 1999 Timur I. Bakeyev <mc@bat.ru>

* Make-mc.in(XCPPFLAGS): Add necessary paths to allow compile sambafs
	when builddir != srcdir. Removed some junk after not coherent patching.
This commit is contained in:
Timur Bakeyev 1999-07-06 09:21:39 +00:00
parent fab9402302
commit 81a3cb3c24
2 changed files with 6 additions and 10 deletions

View File

@ -1,3 +1,8 @@
Tue Jul 6 11:18:45 1999 Timur I. Bakeyev <mc@bat.ru>
* Make-mc.in(XCPPFLAGS): Add necessary paths to allow compile sambafs
when builddir != srcdir. Removed some junk after not coherent patching.
1999-07-04 Federico Mena Quintero <federico@nuclecu.unam.mx>
* Make-mc.in (distcopy): Added a bunch of new lists of files for

View File

@ -9,7 +9,7 @@ rootdir = $(srcdir)/..
@MCFG@@MCF@
CFLAGS = $(XCFLAGS) -D_LARGEFILE64_SOURCE
CPPFLAGS = $(XCPPFLAGS) -Isamba/ubiqx -Isamba/smbwrapper
CPPFLAGS = $(XCPPFLAGS) -I$(builddir)/vfs -I$(srcdir)/samba/ubiqx -I$(srcdir)/samba/smbwrapper
LDFLAGS = $(XLDFLAGS)
DEFS = $(XDEFS)
LIBS = @LINTL@ @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ @LCRYPT@ $(XLIB)
@ -368,14 +368,6 @@ distcopy:
mkdir ../../mc-$(VERSION)/vfs/samba/ubiqx
(cd samba; $(CP) $(SAMBA_DIST_TOPLEVEL) ../../../mc-$(VERSION)/vfs/samba)
<<<<<<< Make-mc.in
(cd samba; $(CP) include/*.h ../../../mc-$(VERSION)/vfs/samba/include)
(cd samba; $(CP) lib/*.[ch] ../../../mc-$(VERSION)/vfs/samba/lib)
(cd samba; $(CP) libsmb/*.[ch] ../../../mc-$(VERSION)/vfs/samba/libsmb)
(cd samba; $(CP) ubiqx/*.[ch] ../../../mc-$(VERSION)/vfs/samba/ubiqx)
(cd samba; $(CP) tests/*.c ../../../mc-$(VERSION)/vfs/samba/tests)
(cd samba; $(CP) param/*.c ../../../mc-$(VERSION)/vfs/samba/param)
=======
(cd samba/include; $(CP) $(SAMBA_DIST_INCLUDE)* ../../../../mc-$(VERSION)/vfs/samba/include)
(cd samba/lib; $(CP) $(SAMBA_DIST_LIB) ../../../../mc-$(VERSION)/vfs/samba/lib)
(cd samba/libsmb; $(CP) $(SAMBA_DIST_LIBSMB) ../../../../mc-$(VERSION)/vfs/samba/libsmb)
@ -383,7 +375,6 @@ distcopy:
(cd samba/smbwrapper; $(CP) $(SAMBA_DIST_SMBWRAPPER) ../../../../mc-$(VERSION)/vfs/samba/smbwrapper)
(cd samba/tests; $(CP) $(SAMBA_DIST_TESTS) ../../../../mc-$(VERSION)/vfs/samba/tests)
(cd samba/ubiqx; $(CP) $(SAMBA_DIST_UBIQX) ../../../../mc-$(VERSION)/vfs/samba/ubiqx)
>>>>>>> 1.32
depend dep: mcdep