Skip to content

Commit

Permalink
deplibs patch from upstream; fixes shlib builds
Browse files Browse the repository at this point in the history
  • Loading branch information
Pete Wyckoff committed Mar 14, 2008
1 parent c6b0379 commit dce1c1d
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ LDSHARED = $(CC) -shared
PICFLAGS = -fPIC
LIBS += -lpvfs2 @LIBS@
LIBS_THREADED += -lpvfs2-threaded @LIBS@
# need to include external dependency libs when building shared libraries
DEPLIBS := @LIBS@
MMAP_RA_CACHE = @MMAP_RA_CACHE@
TRUSTED_CONNECTIONS = @TRUSTED_CONNECTIONS@
REDHAT_RELEASE = @REDHAT_RELEASE@
Expand Down Expand Up @@ -286,6 +288,7 @@ endif
LIBCFLAGS=@LIBCFLAGS@ -D__PVFS2_CLIENT__
LIBTHREADEDCFLAGS=-D__GEN_POSIX_LOCKING__ -D__PVFS2_JOB_THREADED__ -D__PVFS2_CLIENT__
LIBS += @THREAD_LIB@
DEPLIBS += @THREAD_LIB@
LIBS_THREADED += @THREAD_LIB@

################################################################
Expand All @@ -304,6 +307,7 @@ ifdef BUILD_GM
CFLAGS += -D__STATIC_METHOD_BMI_GM__
GMLIBS := -L@GM_LIBDIR@ -lgm
LIBS += $(GMLIBS)
DEPLIBS += $(GMLIBS)
LIBS_THREADED += $(GMLIBS)
SERVERLIBS += $(GMLIBS)
endif
Expand All @@ -316,6 +320,7 @@ ifdef BUILD_MX
CFLAGS += -D__STATIC_METHOD_BMI_MX__
MXLIBS := -L@MX_LIBDIR@ -lmyriexpress -lpthread
LIBS += $(MXLIBS)
DEPLIBS += $(MXLIBS)
LIBS_THREADED += $(MXLIBS)
SERVERLIBS += $(MXLIBS)
endif
Expand All @@ -329,6 +334,7 @@ ifdef BUILD_IB
IBLIBS := -L@IB_LIBDIR@ \
-lvapi -lmtl_common -lmosal -lmpga -lpthread -ldl
LIBS += $(IBLIBS)
DEPLIBS += $(IBLIBS)
LIBS_THREADED += $(IBLIBS)
SERVERLIBS += $(IBLIBS)
endif
Expand All @@ -339,6 +345,7 @@ ifndef BUILD_IB
endif
OPENIBLIBS := -L@OPENIB_LIBDIR@ -libverbs
LIBS += $(OPENIBLIBS)
DEPLIBS += $(OPENIBLIBS)
LIBS_THREADED += $(OPENIBLIBS)
SERVERLIBS += $(OPENIBLIBS)
endif
Expand All @@ -349,6 +356,7 @@ ifdef BUILD_PORTALS
ifneq (,@PORTALS_LIBS@)
PORTALS_LIBS := @PORTALS_LIBS@
LIBS += $(PORTALS_LIBS)
DEPLIBS += $(PORTALS_LIBS)
LIBS_THREADED += $(PORTALS_LIBS)
SERVERLIBS += $(PORTALS_LIBS)
endif
Expand Down Expand Up @@ -647,13 +655,13 @@ lib/libpvfs2-threaded.a: $(LIBTHREADEDOBJS)
lib/libpvfs2.so: $(LIBPICOBJS)
$(Q) " LDSO $@"
$(E)$(INSTALL) -d lib
$(E)$(LDSHARED) -o $@ $(LIBPICOBJS)
$(E)$(LDSHARED) -o $@ $(LIBPICOBJS) $(DEPLIBS)

# rule for building the pvfs2 _multithreaded_ library
lib/libpvfs2-threaded.so: $(LIBTHREADEDPICOBJS)
$(Q) " LDSO $@"
$(E)$(INSTALL) -d lib
$(E)$(LDSHARED) -o $@ $(LIBTHREADEDPICOBJS)
$(E)$(LDSHARED) -o $@ $(LIBTHREADEDPICOBJS) $(DEPLIBS)

# rule for building the pvfs2 server library
lib/libpvfs2-server.a: $(SERVEROBJS)
Expand Down

0 comments on commit dce1c1d

Please sign in to comment.