opr: build and install pic library correctly

[openafs.git] / src / opr / Makefile.in

diff --git a/src/opr/Makefile.in b/src/opr/Makefile.in
index e434602..1f5a85e 100644 (file)
--- a/src/opr/Makefile.in
+++ b/src/opr/Makefile.in
@@ -1,30 +1,70 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.libtool
 include @TOP_OBJDIR@/src/config/Makefile.pthread
 
-objects = assert.o casestrcpy.o
+LT_objs = assert.lo casestrcpy.lo rbtree.lo uuid.lo
 
-all: $(TOP_INCDIR)/afs/opr.h \
-     $(TOP_INCDIR)/afs/opr_assert.h \
-     $(TOP_LIBDIR)/libopr.a
+HEADERS = $(TOP_INCDIR)/afs/opr.h \
+         $(TOP_INCDIR)/afs/opr_assert.h \
+         $(TOP_INCDIR)/opr/jhash.h \
+         $(TOP_INCDIR)/opr/queue.h \
+         $(TOP_INCDIR)/opr/rbtree.h \
+         $(TOP_INCDIR)/opr/time.h \
+         $(TOP_INCDIR)/opr/uuid.h
 
-libopr.a: $(objects)
-       -$(RM) -f $@
-       $(AR) crv $@ $(objects)
-       $(RANLIB) $@
+all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a
+
+liboafs_opr.la: $(LT_objs) $(LT_deps)
+       $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
+
+libopr.a: $(LT_objs)
+       $(LT_LDLIB_static) $(LT_objs)
+
+libopr_pic.la: $(LT_objs)
+       $(LT_LDLIB_pic) $(LT_objs)
 
 $(TOP_LIBDIR)/libopr.a: libopr.a
        $(INSTALL_DATA) libopr.a $@
 
+$(TOP_LIBDIR)/libopr_pic.a: libopr_pic.la
+       $(INSTALL_DATA) .libs/libopr_pic.a $@
+
+
 $(TOP_INCDIR)/afs/opr.h: opr.h
-       $(INSTALL_DATA) opr.h $@
+       $(INSTALL_DATA) $? $@
+
+$(TOP_INCDIR)/afs/opr_assert.h: ${srcdir}/opr_assert.h
+       $(INSTALL_DATA) $? $@
 
-$(TOP_INCDIR)/afs/opr_assert.h: opr_assert.h
-       $(INSTALL_DATA) opr_assert.h $@
+$(TOP_INCDIR)/opr/jhash.h: ${srcdir}/jhash.h
+       $(INSTALL_DATA) $? $@
+
+$(TOP_INCDIR)/opr/queue.h: ${srcdir}/queue.h
+       $(INSTALL_DATA) $? $@
+
+$(TOP_INCDIR)/opr/rbtree.h: ${srcdir}/rbtree.h
+       $(INSTALL_DATA) $? $@
+
+$(TOP_INCDIR)/opr/time.h: ${srcdir}/opr_time.h
+       $(INSTALL_DATA) $? $@
+
+$(TOP_INCDIR)/opr/uuid.h: ${srcdir}/uuid.h
+       $(INSTALL_DATA) $? $@
+
+clean:
+       $(LT_CLEAN)
+       rm -f libopr.a
 
 install: libopr.a
        $(INSTALL_DATA) libopr.a $(DESTDIR)$(libdir)/libopr.a
+       $(INSTALL) -d $(DESTDIR)$(includedir)/opr
+       $(INSTALL_DATA) ${srcdir}/queue.h $(DESTDIR)$(includedir)/opr/queue.h
 
 dest: libopr.a
        $(INSTALL_DATA) libopr.a $(DEST)/lib/libopr.a
+       $(INSTALL) -d $(DEST)/include/opr
+       $(INSTALL_DATA) ${srcdir}/queue.h $(DEST)/include/opr/queue.h
+
+buildtools: $(HEADERS) $(TOP_LIBDIR)/libopr.a