Permit both 32 and 64-bit builds

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/Makefile.inc b/Makefile.inc
index 18609e94efd780fb862eebff331800df13de7b61..2eb0da84d4e1de7d69f10d74723c0cc586779ddf 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -35,13 +35,13 @@ urcu-qsbr.o: urcu-qsbr.c urcu-qsbr.h
        $(CC) -fPIC ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
 
 liburcu.so: urcu.o
-       $(CC) -fPIC -shared -o $@ $<
+       $(CC) ${LDFLAGS} -fPIC -shared -o $@ $<
 
 liburcu-qsbr.so: urcu-qsbr.o
-       $(CC) -fPIC -shared -o $@ $<
+       $(CC) ${LDFLAGS} -fPIC -shared -o $@ $<
 
 liburcu-mb.so: urcu-mb.o
-       $(CC) -fPIC -shared -o $@ $<
+       $(CC) ${LDFLAGS} -fPIC -shared -o $@ $<
 
 urcu-yield.o: urcu.c urcu.h
        $(CC) -DDEBUG_YIELD ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
@@ -49,7 +49,7 @@ urcu-yield.o: urcu.c urcu.h
 .PHONY: clean install checkarch tests
 
 subdirs:
-       -for d in ${DIRS}; do cd $${d}; ${MAKE} ${MFLAGS}; done
+       -for d in ${DIRS}; do cd $${d}; ${MAKE} ${MFLAGS} ${EXTRAMFLAGS}; done
 
 install: liburcu.so
        cp -f liburcu.so liburcu-mb.so liburcu-qsbr.so /usr/lib/

diff --git a/Makefile32 b/Makefile32
index 7b30f9c08721727d0724debdbabf3b709755a719..ab576915e254ddd5a309ea1185dddf71460846d2 100644 (file)
--- a/Makefile32
+++ b/Makefile32
@@ -1,4 +1,5 @@
 include Makefile.inc
 
+EXTRAMFLAGS=-f Makefile32
 CFLAGS+=-m32
 LDFLAGS+=-m32

diff --git a/Makefile64 b/Makefile64
index 6103d34a9bcd7db946a82d04fe14c6972d1212cf..83ee8dab1c9a22728063b370404a53637da157d8 100644 (file)
--- a/Makefile64
+++ b/Makefile64
@@ -1,4 +1,5 @@
 include Makefile.inc
 
+EXTRAMFLAGS=-f Makefile64
 CFLAGS+=-m64
 LDFLAGS+=-m64

diff --git a/README b/README
index 96389add129001f9e67a15f63ed8368b37f02cc7..b47fe48c2c181e833c633c8b6b973ddcbf0f5186 100644 (file)
--- a/README
+++ b/README
@@ -5,6 +5,8 @@ BUILDING
 --------
 
        make
+       #force 32-bit build with: make -f Makefile32
+       #force 64-bit build with: make -f Makefile64
        make install
        
 

diff --git a/tests/Makefile32 b/tests/Makefile32
index 7b30f9c08721727d0724debdbabf3b709755a719..ab576915e254ddd5a309ea1185dddf71460846d2 100644 (file)
--- a/tests/Makefile32
+++ b/tests/Makefile32
@@ -1,4 +1,5 @@
 include Makefile.inc
 
+EXTRAMFLAGS=-f Makefile32
 CFLAGS+=-m32
 LDFLAGS+=-m32

diff --git a/tests/Makefile64 b/tests/Makefile64
index 6103d34a9bcd7db946a82d04fe14c6972d1212cf..83ee8dab1c9a22728063b370404a53637da157d8 100644 (file)
--- a/tests/Makefile64
+++ b/tests/Makefile64
@@ -1,4 +1,5 @@
 include Makefile.inc
 
+EXTRAMFLAGS=-f Makefile64
 CFLAGS+=-m64
 LDFLAGS+=-m64