fix xsegbd to work with the new scheme. needs further testing

[archipelago] / xseg / sys / user / Makefile

diff --git a/xseg/sys/user/Makefile b/xseg/sys/user/Makefile
index 4f6285e..1242477 100644 (file)
--- a/xseg/sys/user/Makefile
+++ b/xseg/sys/user/Makefile
@@ -6,7 +6,7 @@ MAJOR=0
 MINOR=0.1
 AR=ar
 
-DRIVERS=xseg_posix xseg_segdev
+DRIVERS=xseg_posix xseg_segdev xseg_pthread
 DRVDIR=$(BASE)/drivers/user
 DRVOBJS=$(addsuffix .o, $(addprefix $(DRVDIR)/, $(DRIVERS)))
 SHELL=/bin/bash
@@ -15,7 +15,10 @@ default: all
 
 all: libxseg.a libxseg.so
        make -C xq all
-       make -C python all
+       make -C xpool all
+       make -C xhash all
+       make -C xheap all
+       make -C xobj all
 
 COMMA=,
 _initialize.c: drivers
@@ -55,6 +58,19 @@ xhash/xhash.o:
 
 xhash/xhash.pic.o:
        make -C xhash xhash.pic.o
+
+xheap/xheap.o:
+       make -C xheap xheap.o
+
+xheap/xheap.pic.o:
+       make -C xheap xheap.pic.o
+
+xobj/xobj.o:
+       make -C xobj xobj.o
+
+xobj/xobj.pic.o:
+       make -C xobj xobj.pic.o
+
 xseg_user.o: xseg_user.c
        $(CC) $(CFLAGS) $(INC) -Wall -O2 -finline-functions -fPIC -c -o $@ $<
 
@@ -62,12 +78,14 @@ libxseg.map: $(BASE)/xtypes/xq_exports.h $(BASE)/xseg/xseg_exports.h
        cat $(BASE)/xtypes/xq_exports.h $(BASE)/xseg/xseg_exports.h | ./make_symbol_map.sh > $@
 
 libxseg.so.$(MAJOR).$(MINOR): xseg.pic.o xseg_user.o libxseg.map \
-                                xq/xq.pic.o xpool/xpool.pic.o xhash/xhash.pic.o $(DRVOBJS)
+                                xq/xq.pic.o xpool/xpool.pic.o xhash/xhash.pic.o \
+                                xheap/xheap.pic.o xobj/xobj.pic.o $(DRVOBJS)
        $(CC) $(CFLAGS) -shared \
                         -Wl,-soname=libxseg.so.$(MAJOR) \
                         -o libxseg.so.$(MAJOR).$(MINOR) \
                         xseg.pic.o xseg_user.o xq/xq.pic.o \
                        xpool/xpool.pic.o xhash/xhash.pic.o\
+                       xheap/xheap.pic.o xobj/xobj.pic.o \
                         _initialize.o $(DRVOBJS) \
                         -Wl,--version-script=libxseg.map \
                         -ldl -lrt
@@ -81,6 +99,8 @@ clean:
        make -C xq clean
        make -C xpool clean
        make -C xhash clean
+       make -C xheap clean
+       make -C xobj clean
        make -C python clean
        rm -f _initialize.c _initialize.o
        rm -f xseg.o xseg.pic.o xseg_user.o