Changeset 239 for branches/samba-3.3.x/source/Makefile

Timestamp:

May 29, 2009, 9:57:41 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fix for Ticket #85 (by diver) in 3.3 branch

File:

• branches/samba-3.3.x/source/Makefile (modified) (5 diffs)

branches/samba-3.3.x/source/Makefile

@@ -20 +20 @@
 smbtorture4_path=
 
-LIBS=
+LIBS=-lsocket -lsyslog -lurpo
 CC=gcc
 SHLD=shared-libraries-disabled
@@ -37 +37 @@
 # (GCC) warnings. This is done automtically for --enable-developer,
 # --enable-picky-developer and --enable-krb5developer.
-DEVELOPER_CFLAGS=-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER -Wdeclaration-after-statement -Werror-implicit-function-declaration
+DEVELOPER_CFLAGS=-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER -Werror-implicit-function-declaration
 CFLAGS= -O -D_SAMBA_BUILD_=3
 CPPFLAGS=-DHAVE_CONFIG_H  -Iinclude -I./include -I. -I. -I./lib/replace -I./lib/talloc -I./lib/tdb/include -I./libaddns -I./librpc -I./popt
@@ -43 +43 @@
 EXEEXT=.exe
 AR=ar.exe
-LDSHFLAGS=shared-libraries-disabled  -Zexe -Zomf -Zmap -Zargs-wild -Zhigh-mem -D__ST_MT_ERRNO__ -s
-LDFLAGS=-pie  -Zexe -Zomf -Zmap -Zargs-wild -Zhigh-mem -D__ST_MT_ERRNO__ -s
-
-WINBIND_NSS_LDSHFLAGS=shared-libraries-disabled -Zexe -Zomf -Zmap -Zargs-wild -Zhigh-mem -D__ST_MT_ERRNO__ -s
+LDSHFLAGS=shared-libraries-disabled  -Zexe -Zomf -Zmap -Zargs-wild -Zbin-files -D__ST_MT_ERRNO__ -s
+LDFLAGS=  -Zexe -Zomf -Zmap -Zargs-wild -Zbin-files -D__ST_MT_ERRNO__ -s
+
+WINBIND_NSS_LDSHFLAGS=shared-libraries-disabled -Zexe -Zomf -Zmap -Zargs-wild -Zbin-files -D__ST_MT_ERRNO__ -s
 AWK=gawk
-PICFLAG=-fPIE
+PICFLAG=
 DYNEXP=
-PERL=u:/perl5/bin/perl.exe
+PERL=u:/Perl/bin/perl.exe
 
 PIDL_ARGS=
@@ -82 +82 @@
 
 
-srcdir=U:/DEV/samba-3.3.0/source
-builddir=U:/DEV/samba-3.3.0/source
+srcdir=U:/Develop/Samba/samba-3.3.x/source
+builddir=U:/Develop/Samba/samba-3.3.x/source
 SHELL=/bin/sh
 DESTDIR=/
@@ -1447 +1447 @@
 bin/replacetort.exe: $(REPLACETORT_OBJ)  
         @echo Linking $@
-        @$(CC) $(FLAGS) -pie -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
+        @$(CC) $(FLAGS)  -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
                 $(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
 
 bin/smbconftort.exe: $(SMBCONFTORT_OBJ)   
         @echo Linking $@
-        @$(CC) $(FLAGS) -pie -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
+        @$(CC) $(FLAGS)  -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
                 $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
                 $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)