X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=Makefile;h=c02252289411a959c811b95f0b7639a1e59c7cea;hb=fc606a745f2825aff6c615e5d6703526e170906b;hp=093bf6619c852bfd920652bfac4929487dd28e0d;hpb=af02d47e5d0712e5ccde6d8f1ee89f18de798cad;p=urcu.git

diff --git a/Makefile b/Makefile
index 093bf66..c022522 100644
--- a/Makefile
+++ b/Makefile
@@ -9,19 +9,26 @@ LDFLAGS=-lpthread
 #Changing the signal number used by the library. SIGUSR1 by default.
 #CFLAGS+=-DSIGURCU=SIGUSR2
 
-SRC_DEP=`echo $^ | sed 's/[^ ]*.h//g'`
+SRC_DEP=`echo $^ | sed 's/[^ ]*\.h//g'`
 
-all: test_urcu test_urcu_dynamic_link test_urcu_timing \
-	test_rwlock_timing test_urcu_yield urcu-asm.S \
+all: arch-api test_urcu test_urcu_dynamic_link test_urcu_timing \
+	test_rwlock_timing test_perthreadlock_timing test_urcu_yield urcu-asm.S \
 	urcu-asm.o urcutorture urcutorture-yield liburcu.so
 
+arch-api: api.h arch.h
+	# Run either make pthreads-x86 or make pthreads-ppc prior to build
+	# the RCU library. Architecture auto-detectection not implemented
+	# in the build system yet.
+
 pthreads-x86: clean
 	cp api_x86.h api.h
 	cp arch_x86.h arch.h
+	cp arch_atomic_x86.h arch_atomic.h
 
 pthreads-ppc: clean
 	cp api_ppc.h api.h
 	cp arch_ppc.h arch.h
+	cp arch_atomic_ppc.h arch_atomic.h
 
 test_urcu: urcu.o test_urcu.c urcu.h
 	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
@@ -38,6 +45,9 @@ test_urcu_timing: urcu.o test_urcu_timing.c urcu.h
 test_rwlock_timing: urcu.o test_rwlock_timing.c urcu.h
 	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
+test_perthreadlock_timing: urcu.o test_perthreadlock_timing.c urcu.h
+	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
+
 urcu.o: urcu.c urcu.h
 	$(CC) -fPIC ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
 
@@ -59,13 +69,13 @@ urcutorture: urcutorture.c urcu.o urcu.h rcutorture.h
 urcutorture-yield: urcutorture.c urcu-yield.o urcu.h rcutorture.h
 	$(CC) -DDEBUG_YIELD ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
-.PHONY: clean install
+.PHONY: clean install arch-api
 
 install: liburcu.so
 	cp -f liburcu.so /usr/lib/
-	cp -f arch.h compiler.h urcu.h urcu-static.h /usr/include/
+	cp -f arch.h arch_atomic.h compiler.h urcu.h urcu-static.h /usr/include/
 
 clean:
 	rm -f *.o test_urcu test_urcu_timing test_rwlock_timing urcu-asm.S \
 		test_urcu_yield urcutorture urcutorture-yield liburcu.so \
-		test_urcu_dynamic_link
+		test_urcu_dynamic_link api.h arch.h arch_atomic.h