X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=Makefile.inc;h=5743c83cddd46ac07dfe151150e2119282c11127;hp=2eb0da84d4e1de7d69f10d74723c0cc586779ddf;hb=7e30abe3df0e83eeb741bfc18d07cb016af804a1;hpb=a669219f71cabe41a5832bdda98c94e4ad63e529

diff --git a/Makefile.inc b/Makefile.inc
index 2eb0da8..5743c83 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -6,6 +6,7 @@ DIRS=tests
 all: checkarch liburcu.so urcu.o \
 	liburcu-qsbr.so urcu-qsbr.o \
 	liburcu-mb.so urcu-mb.o \
+	liburcu-defer.so urcu-defer.o \
 	urcu-yield.o \
 	subdirs
 
@@ -15,36 +16,45 @@ ifeq (${ARCHTYPE},)
 	@exit 1
 endif
 
-arch.h: arch_${ARCHTYPE}.h
-	cp -f arch_${ARCHTYPE}.h arch.h
+urcu/arch.h: urcu/arch_${ARCHTYPE}.h
+	cp -f urcu/arch_${ARCHTYPE}.h urcu/arch.h
 
-arch_atomic.h: arch_atomic_${ARCHTYPE}.h
-	cp -f arch_atomic_${ARCHTYPE}.h arch_atomic.h
+urcu/arch_uatomic.h: urcu/arch_uatomic_${ARCHTYPE}.h
+	cp -f urcu/arch_uatomic_${ARCHTYPE}.h urcu/arch_uatomic.h
 
-urcu.h: arch.h arch_atomic.h
+urcu.h: urcu/arch.h urcu/arch_uatomic.h
 
-urcu-qsbr.h: arch.h arch_atomic.h
+urcu-qsbr.h: urcu/arch.h urcu/arch_uatomic.h
+
+urcu-pointer.o: urcu-pointer.c urcu-pointer.h urcu-pointer-static.h
+	$(CC) -fPIC ${CFLAGS} -c -o $@ $(SRC_DEP)
 
 urcu.o: urcu.c urcu.h
-	$(CC) -fPIC ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
+	$(CC) -fPIC ${CFLAGS} -c -o $@ $(SRC_DEP)
 
 urcu-mb.o: urcu.c urcu.h
-	$(CC) -fPIC -DURCU_MB ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
+	$(CC) -fPIC -DURCU_MB ${CFLAGS} -c -o $@ $(SRC_DEP)
 
 urcu-qsbr.o: urcu-qsbr.c urcu-qsbr.h
-	$(CC) -fPIC ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
+	$(CC) -fPIC ${CFLAGS} -c -o $@ $(SRC_DEP)
+
+urcu-defer.o: urcu-defer.c urcu-defer.h
+	$(CC) -fPIC ${CFLAGS} -c -o $@ $(SRC_DEP)
+
+liburcu.so: urcu.o urcu-pointer.o
+	$(CC) ${LDFLAGS} -fPIC -shared -o $@ $<
 
-liburcu.so: urcu.o
+liburcu-qsbr.so: urcu-qsbr.o urcu-pointer.o
 	$(CC) ${LDFLAGS} -fPIC -shared -o $@ $<
 
-liburcu-qsbr.so: urcu-qsbr.o
+liburcu-mb.so: urcu-mb.o urcu-pointer.o
 	$(CC) ${LDFLAGS} -fPIC -shared -o $@ $<
 
-liburcu-mb.so: urcu-mb.o
+liburcu-defer.so: urcu-defer.o
 	$(CC) ${LDFLAGS} -fPIC -shared -o $@ $<
 
 urcu-yield.o: urcu.c urcu.h
-	$(CC) -DDEBUG_YIELD ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
+	$(CC) -DDEBUG_YIELD ${CFLAGS} -c -o $@ $(SRC_DEP)
 
 .PHONY: clean install checkarch tests
 
@@ -52,12 +62,18 @@ subdirs:
 	-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/
-	cp -f arch.h arch_atomic.h compiler.h	\
-		urcu.h urcu-static.h		\
-		urcu-qsbr.h urcu-qsbr-static.h	\
+	cp -f liburcu.so liburcu-mb.so liburcu-qsbr.so liburcu-defer.so	\
+			/usr/lib/
+	mkdir -p /usr/include/urcu
+	cp -f urcu/arch.h urcu/arch_uatomic.h urcu/compiler.h		\
+		urcu/list.h urcu/rculist.h urcu/hlist.h			\
+			/usr/include/urcu/
+	cp -f urcu.h urcu-static.h					\
+		urcu-qsbr.h urcu-qsbr-static.h				\
+		urcu-defer.h urcu-defer-static.h			\
+		urcu-pointer.h urcu-pointer-static.h			\
 			/usr/include/
 
 clean:
-	rm -f *.o *.so arch.h arch_atomic.h
+	rm -f *.o *.so urcu/arch.h urcu/arch_uatomic.h
 	-for d in ${DIRS}; do cd $${d}; ${MAKE} clean; done