The branch, master has been updated
via 747f4b358c306b3a5ff78966c97adf269b5b843e (commit)
via 4d12acf326520875871c97806beb1ece42fdb957 (commit)
from eeac8d4fbe729830b6daf6ee2e53db277000ffda (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 747f4b358c306b3a5ff78966c97adf269b5b843e
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Wed Sep 17 17:49:16 2008 +0200
examples/libsmbclient: fix Makefile after merged build patch changes.
New variable FLAGS in source3/Makefile.in introduced recursive
variable FLAGS in Makefile.internal.
Michael
commit 4d12acf326520875871c97806beb1ece42fdb957
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Wed Sep 17 17:45:50 2008 +0200
examples/libsmbclient: adapt to new samba3 source dir "source3/
Michael
-----------------------------------------------------------------------
Summary of changes:
examples/libsmbclient/Makefile.internal.in | 38 ++++++++++++++--------------
examples/libsmbclient/smbwrapper/Makefile | 4 +-
2 files changed, 21 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/libsmbclient/Makefile.internal.in
b/examples/libsmbclient/Makefile.internal.in
index dd4518f..d9f0fd3 100644
--- a/examples/libsmbclient/Makefile.internal.in
+++ b/examples/libsmbclient/Makefile.internal.in
@@ -6,7 +6,7 @@
CC = @CC@
-SAMBA_DIR = ../../source
+SAMBA_DIR = ../../source3
SAMBA_INCLUDES = -I$(SAMBA_DIR)/include
SAMBA_LIBPATH = -L$(SAMBA_DIR)/bin
@@ -16,7 +16,7 @@ GTK_LIBS = `gtk-config --libs`
#GTK_CFLAGS = `pkg-config gtk+-2.0 --cflags`
#GTK_LIBS = `pkg-config gtk+-2.0 --libs`
-FLAGS = @CPPFLAGS@ @CFLAGS@ $(GTK_CFLAGS) $(SAMBA_INCLUDES)
+CCFLAGS = @CPPFLAGS@ @CFLAGS@ $(GTK_CFLAGS) $(SAMBA_INCLUDES)
[EMAIL PROTECTED]@
LDFLAGS= $(SAMBA_LIBPATH) @PIE_LDFLAGS@ @LDFLAGS@
@@ -27,7 +27,7 @@ CMDLINE_LIBS = @POPTLIBS@
LIBS = $(EXTERNAL_LIBS) $(LIBSMBCLIENT_LIBS)
# Compile a source file. (.c --> .o)
-COMPILE_CC = $(CC) -I. $(FLAGS) $(PICFLAG) -c $< -o $@
+COMPILE_CC = $(CC) -I. $(CCFLAGS) $(PICFLAG) -c $< -o $@
COMPILE = $(COMPILE_CC)
MAKEDIR = || exec false; \
@@ -68,67 +68,67 @@ all: $(TESTS) smbsh
testsmbc: testsmbc.o
@echo Linking testsmbc
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
tree: tree.o
@echo Linking tree
- @$(CC) $(GTK_CFLAGS) $(FLAGS) $(LDFLAGS) -o $@ $< $(GTK_LIBS) $(LIBS)
+ @$(CC) $(GTK_CFLAGS) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(GTK_LIBS) $(LIBS)
testacl: testacl.o
@echo Linking testacl
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
testacl2: testacl2.o
@echo Linking testacl2
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
testacl3: testacl3.o
@echo Linking testacl3
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
testbrowse: testbrowse.o
@echo Linking testbrowse
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
testbrowse2: testbrowse2.o
@echo Linking testbrowse2
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
teststat: teststat.o
@echo Linking teststat
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
teststat2: teststat2.o
@echo Linking teststat2
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
teststat3: teststat3.o
@echo Linking teststat3
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
testtruncate: testtruncate.o
@echo Linking testtruncate
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
testchmod: testchmod.o
@echo Linking testchmod
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
testutime: testutime.o
@echo Linking testutime
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
testread: testread.o
@echo Linking testread
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
testwrite: testwrite.o
@echo Linking testwrite
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
testctx: testctx.o
@echo Linking testctx
- @$(CC) $(FLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
+ @$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(CMDLINE_LIBS)
smbsh:
make -C smbwrapper
diff --git a/examples/libsmbclient/smbwrapper/Makefile
b/examples/libsmbclient/smbwrapper/Makefile
index eb47005..952015e 100644
--- a/examples/libsmbclient/smbwrapper/Makefile
+++ b/examples/libsmbclient/smbwrapper/Makefile
@@ -3,9 +3,9 @@ DEFS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-D_GNU_SOURCE
CFLAGS = -I$(SAMBA_INCL) $(EXTLIB_INCL)
-LDFLAGS = -L/usr/local/samba/lib -L../../../source/bin
+LDFLAGS = -L/usr/local/samba/lib -L../../../source3/bin
-SMBINCLUDE = -I../../../source/include
+SMBINCLUDE = -I../../../source3/include
CFLAGS= -fpic -g -O0 $(DEFS) $(SMBINCLUDE)
BIN = .
--
Samba Shared Repository
