Changeset 9141

Timestamp:

12/07/11 14:09:12 (18 months ago)

Author:

k

Message:

Cleanup library variable setup in Makefile.in

Files:

• trunk/Makefile.in (modified) (1 diff)

trunk/Makefile.in

@@ -512 +512 @@
 
 # LIBRARIES is a list of the pvfs2 client libraries that will be installed
-LIBRARIES :=
+LIBRARIES_STATIC := lib/libpvfs2.a
+LIBRARIES_SHARED := lib/libpvfs2.so
+LIBRARIES_THREADED_STATIC := lib/libpvfs2-threaded.a
+LIBRARIES_THREADED_SHARED := lib/libpvfs2-threaded.so
+
 ifdef BUILD_BMI_ONLY
-BMILIBRARIES :=
-endif
-LIBRARIES_THREADED :=
-ifeq ($(build_shared),yes)
-ifdef BUILD_BMI_ONLY
-BMILIBRARIES := lib/libbmi.so
-endif
-LIBRARIES_SHARED = lib/libpvfs2.so lib/libofs.so
-LIBRARIES += $(LIBRARIES_SHARED)
-LIBRARIES_THREADED_SHARED += lib/libpvfs2-threaded.so lib/libofs-threaded.so
-LIBRARIES_THREADED += $(LIBRARIES_THREADED_SHARED)
-endif
-ifeq ($(build_static),yes)
-ifdef BUILD_BMI_ONLY
-BMILIBRARIES += lib/libbmi.a
-endif
-LIBRARIES_STATIC = lib/libpvfs2.a lib/libofs.a
-LIBRARIES += $(LIBRARIES_STATIC)
-LIBRARIES_THREADED_STATIC += lib/libpvfs2-threaded.a lib/libofs-threaded.a
-LIBRARIES_THREADED += $(LIBRARIES_THREADED_STATIC)
-endif
+LIBRARIES_STATIC += lib/libbmi.a
+LIBRARIES_SHARED += lib/libbmi.so
+endif
+
+ifdef BUILD_USRINT
+LIBRARIES_STATIC += lib/libofs.a
+LIBRARIES_SHARED += lib/libofs.so
+LIBRARIES_THREADED_STATIC += lib/libofs-threaded.a
+LIBRARIES_THREADED_SHARED += lib/libofs-threaded.so
+endif
+
+ifneq (($build_static),yes)
+LIBRARIES_STATIC := 
+LIBRARIES_THREADED_STATIC :=
+endif
+
+ifneq (($build_shared),yes)
+LIBRARIES_SHARED :=
+LIBRARIES_THREADED_SHARED := 
+endif
+
+LIBRARIES_THREADED := $(LIBRARIES_THREADED_STATIC) $(LIBRARIES_THREADED_SHARED)
+LIBRARIES := $(LIBRARIES_SHARED) $(LIBRARIES_STATIC) $(LIBRARIES_THREADED)
+
 
 ################################################################