|
 |
dafb8f4 |
--- opensm-3.2.1/libvendor/Makefile.am.rpath 2008-01-15 15:23:51.000000000 -0500
|
|
|
dafb8f4 |
+++ opensm-3.2.1/libvendor/Makefile.am 2008-06-30 11:03:22.000000000 -0400
|
|
|
dafb8f4 |
@@ -94,8 +94,8 @@ EXTRA_DIST = $(srcdir)/libosmvendor.map
|
|
|
dafb8f4 |
# name. What we can do it create a link to the installed file such
|
|
|
dafb8f4 |
# that it will mark it with an alias...
|
|
|
dafb8f4 |
# we find the new lib by traversing the links
|
|
|
dafb8f4 |
-install-exec-hook:
|
|
|
dafb8f4 |
- if test -L $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; fi; \
|
|
|
dafb8f4 |
- lname=`\ls -l $(DESTDIR)/$(libdir)/libosmvendor.so | awk '{print $$NF}'`; \
|
|
|
dafb8f4 |
- ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor_$(with_osmv).so; \
|
|
|
dafb8f4 |
- ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so
|
|
|
dafb8f4 |
+#install-exec-hook:
|
|
|
dafb8f4 |
+# if test -L $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; fi; \
|
|
|
dafb8f4 |
+# lname=`\ls -l $(DESTDIR)/$(libdir)/libosmvendor.so | awk '{print $$NF}'`; \
|
|
|
dafb8f4 |
+# ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor_$(with_osmv).so; \
|
|
|
dafb8f4 |
+# ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so
|
|
|
dafb8f4 |
--- opensm-3.2.1/opensm/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400
|
|
|
dafb8f4 |
+++ opensm-3.2.1/opensm/Makefile.am 2008-06-30 11:11:40.000000000 -0400
|
|
|
dafb8f4 |
@@ -79,7 +79,7 @@ endif
|
|
|
dafb8f4 |
if OSMV_SIM
|
|
|
dafb8f4 |
USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
|
dafb8f4 |
libopensm.la: $(libopensm_la_OBJECTS) $(libopensm_la_DEPENDENCIES)
|
|
|
dafb8f4 |
- $(USEGPPLINK) -rpath $(libdir) $(libopensm_la_LDFLAGS) $(libopensm_la_OBJECTS) $(libopensm_la_LIBADD) $(LIBS)
|
|
|
dafb8f4 |
+ $(USEGPPLINK) $(libopensm_la_LDFLAGS) $(libopensm_la_OBJECTS) $(libopensm_la_LIBADD) $(LIBS)
|
|
|
dafb8f4 |
opensm$(EXEEXT): $(opensm_OBJECTS) $(opensm_DEPENDENCIES)
|
|
|
dafb8f4 |
@rm -f opensm$(EXEEXT)
|
|
|
dafb8f4 |
$(USEGPPLINK) $(opensm_LDFLAGS) $(opensm_OBJECTS) $(opensm_LDADD) $(LIBS)
|
|
|
dafb8f4 |
@@ -87,9 +87,9 @@ endif
|
|
|
dafb8f4 |
|
|
|
dafb8f4 |
# we need to be able to load libraries from local build subtree before make install
|
|
|
dafb8f4 |
# we always give precedence to local tree libs and then use the pre-installed ones.
|
|
|
dafb8f4 |
-opensm_LDADD = -L../complib -L../libvendor -L. $(OSMV_LDADD) -lopensm -losmcomp -losmvendor
|
|
|
dafb8f4 |
+opensm_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor -L. -lopensm
|
|
|
dafb8f4 |
|
|
|
dafb8f4 |
-opensm_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -lpthread -ldl
|
|
|
dafb8f4 |
+opensm_LDFLAGS = -lpthread -ldl
|
|
|
dafb8f4 |
|
|
|
dafb8f4 |
opensmincludedir = $(includedir)/infiniband/opensm
|
|
|
dafb8f4 |
|
|
|
dafb8f4 |
@@ -124,10 +124,10 @@ EXTRA_DIST = $(srcdir)/libopensm.map $(s
|
|
|
dafb8f4 |
# name. What we can do it create a link to the installed file such
|
|
|
dafb8f4 |
# that it will mark it with an alias...
|
|
|
dafb8f4 |
# we find the new lib by traversing the links
|
|
|
dafb8f4 |
-install-exec-hook:
|
|
|
dafb8f4 |
- if test -L $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; fi; \
|
|
|
dafb8f4 |
- lname=`\ls -l $(DESTDIR)/$(libdir)/libopensm.so | awk '{print $$NF}'`; \
|
|
|
dafb8f4 |
- ln -s $$lname $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so
|
|
|
dafb8f4 |
+#install-exec-hook:
|
|
|
dafb8f4 |
+# if test -L $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; fi; \
|
|
|
dafb8f4 |
+# lname=`\ls -l $(DESTDIR)/$(libdir)/libopensm.so | awk '{print $$NF}'`; \
|
|
|
dafb8f4 |
+# ln -s $$lname $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so
|
|
|
dafb8f4 |
|
|
|
dafb8f4 |
# generate c and h files from the lex and yacc files
|
|
|
dafb8f4 |
dist-hook: $(srcdir)/osm_qos_parser_y.c $(srcdir)/osm_qos_parser_l.c
|
|
|
dafb8f4 |
--- opensm-3.2.1/osmtest/Makefile.am.rpath 2008-03-12 17:43:17.000000000 -0400
|
|
|
dafb8f4 |
+++ opensm-3.2.1/osmtest/Makefile.am 2008-06-30 11:03:22.000000000 -0400
|
|
|
dafb8f4 |
@@ -18,10 +18,10 @@ osmtest_CFLAGS = -Wall $(OSMV_CFLAGS) -D
|
|
|
dafb8f4 |
else
|
|
|
dafb8f4 |
osmtest_CFLAGS = -Wall $(OSMV_CFLAGS) -DVENDOR_RMPP_SUPPORT $(DBGFLAGS)
|
|
|
dafb8f4 |
endif
|
|
|
dafb8f4 |
-osmtest_LDADD = -L../complib -L../libvendor -L../opensm -L$(libdir) -L. \
|
|
|
dafb8f4 |
- $(OSMV_LDADD) -lopensm -losmcomp -losmvendor
|
|
|
dafb8f4 |
+osmtest_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor \
|
|
|
dafb8f4 |
+ -L../opensm -lopensm
|
|
|
dafb8f4 |
|
|
|
dafb8f4 |
-osmtest_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -lpthread -L../opensm
|
|
|
dafb8f4 |
+osmtest_LDFLAGS = -lpthread
|
|
|
dafb8f4 |
# for linking with the simulator client library we have to use g++:
|
|
|
dafb8f4 |
if OSMV_SIM
|
|
|
dafb8f4 |
USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
|
dafb8f4 |
--- opensm-3.2.1/complib/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400
|
|
|
dafb8f4 |
+++ opensm-3.2.1/complib/Makefile.am 2008-06-30 11:03:22.000000000 -0400
|
|
|
dafb8f4 |
@@ -85,7 +85,7 @@ EXTRA_DIST = $(srcdir)/libosmcomp.map $(
|
|
|
dafb8f4 |
# name. What we can do it create a link to the installed file such
|
|
|
dafb8f4 |
# that it will mark it with an alias...
|
|
|
dafb8f4 |
# we find the new lib by traversing the links
|
|
|
dafb8f4 |
-install-exec-hook:
|
|
|
dafb8f4 |
- if test -L $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; fi; \
|
|
|
dafb8f4 |
- lname=`\ls -l $(DESTDIR)/$(libdir)/libosmcomp.so | awk '{print $$NF}'`; \
|
|
|
dafb8f4 |
- ln -s $$lname $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so
|
|
|
dafb8f4 |
+#install-exec-hook:
|
|
|
dafb8f4 |
+# if test -L $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; fi; \
|
|
|
dafb8f4 |
+# lname=`\ls -l $(DESTDIR)/$(libdir)/libosmcomp.so | awk '{print $$NF}'`; \
|
|
|
dafb8f4 |
+# ln -s $$lname $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so
|
|
|
dafb8f4 |
--- opensm-3.2.1/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400
|
|
|
dafb8f4 |
+++ opensm-3.2.1/Makefile.am 2008-06-30 11:03:22.000000000 -0400
|
|
|
dafb8f4 |
@@ -9,16 +9,16 @@ MAINTAINERCLEANFILES = Makefile.in acloc
|
|
|
dafb8f4 |
ACLOCAL = aclocal -I $(ac_aux_dir)
|
|
|
dafb8f4 |
|
|
|
dafb8f4 |
# we should provide a hint for other apps about the build mode of this project
|
|
|
dafb8f4 |
-install-exec-hook:
|
|
|
dafb8f4 |
- mkdir -p $(DESTDIR)/$(includedir)
|
|
|
dafb8f4 |
-if DEBUG
|
|
|
dafb8f4 |
- echo "define osm_build_type \"debug\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h
|
|
|
dafb8f4 |
-else
|
|
|
dafb8f4 |
- echo "define osm_build_type \"free\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h
|
|
|
dafb8f4 |
-endif
|
|
|
dafb8f4 |
- $(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d
|
|
|
dafb8f4 |
- cp $(top_builddir)/scripts/opensm.init $(DESTDIR)/$(sysconfdir)/init.d/opensmd
|
|
|
dafb8f4 |
- chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/opensmd
|
|
|
dafb8f4 |
+#install-exec-hook:
|
|
|
dafb8f4 |
+# mkdir -p $(DESTDIR)/$(includedir)
|
|
|
dafb8f4 |
+#if DEBUG
|
|
|
dafb8f4 |
+# echo "define osm_build_type \"debug\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h
|
|
|
dafb8f4 |
+#else
|
|
|
dafb8f4 |
+# echo "define osm_build_type \"free\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h
|
|
|
dafb8f4 |
+#endif
|
|
|
dafb8f4 |
+# $(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d
|
|
|
dafb8f4 |
+# cp $(top_builddir)/scripts/opensm.init $(DESTDIR)/$(sysconfdir)/init.d/opensmd
|
|
|
dafb8f4 |
+# chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/opensmd
|
|
|
dafb8f4 |
|
|
|
dafb8f4 |
|
|
|
dafb8f4 |
man_MANS = man/opensm.8 man/osmtest.8
|