Changeset 9252

Timestamp:

03/14/12 15:03:58 (15 months ago)

Author:

k

Message:

Makefile.in: Rather than rely on KERNAPPSTHR to determine whether to install LIBRARIES_THREADED_STATIC, use LIBRARIES_THREADED_STATIC itself. On Darwin only run ranlib on static libraries.

Files:

• branches/stable/Makefile.in (modified) (3 diffs)

branches/stable/Makefile.in

@@ -1216 +1216 @@
             install -m 755 lib/$$i $(libdir) ;\
         done
-ifneq (,$(KERNAPPSTHR))
+ifdef TARGET_OS_DARWIN
+#       TOC needs to be regenerated in libs after they get moved
+        ranlib $(patsubst %,$(prefix)/%,$(LIBRARIES_STATIC))
+endif
+endif
+ifneq (,$(LIBRARIES_THREADED_STATIC))
         for i in $(notdir $(LIBRARIES_THREADED_STATIC)) ; do \
             install -m 755 lib/$$i $(libdir) ;\
         done
+ifdef TARGET_OS_DARWIN
+#       TOC needs to be regenerated in libs after they get moved
+        ranlib $(patsubst %,$(prefix)/%,$(LIBRARIES_THREADED_STATIC))
 endif
 endif
@@ -1228 +1236 @@
             $(LN_S) $$i.$(SO_VER) $(libdir)/$$i ;\
         done
-ifneq (,$(KERNAPPSTHR))
+endif
+ifneq (,$(LIBRARIES_THREADED_SHARED))
         for i in $(notdir $(LIBRARIES_THREADED_SHARED)) ; do \
             install -m 755 lib/$$i $(libdir)/$$i.$(SO_FULLVER) ;\
@@ -1234 +1243 @@
            $(LN_S) $$i.$(SO_VER) $(libdir)/$$i ;\
         done
-endif
-endif
-
-ifdef TARGET_OS_DARWIN
-#       TOC needs to be regenerated in libs after they get moved
-        ranlib $(patsubst %,$(prefix)/%,$(LIBRARIES))
 endif