From d967c743c53f2954b4eecf53821a0976a65215a2 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Sat, 30 Aug 2003 23:54:29 +0000
Subject: [PATCH] fix Solaris issues for ssh2rpd and double linking of
libsocket.
git-svn-id: http://root.cern.ch/svn/root/trunk@7189 27541ba8-7e3a-0410-8455-c3a389f83636
---
config/Makefile.solaris | 2 +-
config/Makefile.solarisCC5 | 2 +-
config/Makefile.solariskcc | 2 +-
main/Module.mk | 5 +++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/config/Makefile.solaris b/config/Makefile.solaris
index d425ff50067..2983b589bed 100644
--- a/config/Makefile.solaris
+++ b/config/Makefile.solaris
@@ -38,7 +38,7 @@ CILIBS = -lm -ltermcap -ldl -L/usr/ccs/lib -lgen
# Fortran:
F77 = /opt/SUNWspro/bin/f77
-F77LIBS = -lM77 -lF77 -lsunmath -lsocket -lnsl
+F77LIBS = -lM77 -lF77 -lsunmath
# Override default in Makefile.config
INSTALL := cp -pR
diff --git a/config/Makefile.solarisCC5 b/config/Makefile.solarisCC5
index f8ddd41edb8..9f3fa130d55 100644
--- a/config/Makefile.solarisCC5
+++ b/config/Makefile.solarisCC5
@@ -50,7 +50,7 @@ CILIBS = -lm -ltermcap -ldl
# Fortran:
#F77 = /opt/SUNWspro/bin/f77
F77 = f77
-F77LIBS = -lM77 -lF77 -lsunmath -lsocket -lnsl
+F77LIBS = -lM77 -lF77 -lsunmath
# Override default in Makefile.config
INSTALL := cp -pR
diff --git a/config/Makefile.solariskcc b/config/Makefile.solariskcc
index 0ed84f99f16..409202e1cda 100644
--- a/config/Makefile.solariskcc
+++ b/config/Makefile.solariskcc
@@ -64,7 +64,7 @@ CRYPTLIBS =
# Fortran:
F77 = f77
F77FLAGS =
-F77LIBS = -L/opt/SUNWspro/lib -lM77 -lF77 -lsunmath -lsocket -lnsl
+F77LIBS = -L/opt/SUNWspro/lib -lM77 -lF77 -lsunmath
# Override default in Makefile.config
INSTALL := cp -pR
diff --git a/main/Module.mk b/main/Module.mk
index 24ce477aa5d..cb00eb85605 100644
--- a/main/Module.mk
+++ b/main/Module.mk
@@ -87,7 +87,8 @@ endif
endif
# include all dependency files
-INCLUDEFILES += $(ROOTEXEDEP) $(PROOFSERVDEP) $(HADDDEP) $(H2ROOTDEP)
+INCLUDEFILES += $(ROOTEXEDEP) $(PROOFSERVDEP) $(HADDDEP) $(H2ROOTDEP) \
+ $(SSH2RPDDEP)
##### local rules #####
$(ROOTEXE): $(ROOTEXEO) $(CORELIB) $(CINTLIB) $(HISTLIB) \
@@ -110,7 +111,7 @@ $(HADD): $(HADDO) $(CORELIB) $(CINTLIB) $(HISTLIB) \
$(LD) $(LDFLAGS) -o $@ $(HADDO) $(RPATH) $(ROOTLIBS) $(SYSLIBS)
$(SSH2RPD): $(SSH2RPDO)
- $(LD) $(LDFLAGS) -o $@ $(SSH2RPDO)
+ $(LD) $(LDFLAGS) -o $@ $(SSH2RPDO) $(SYSLIBS)
$(H2ROOT): $(H2ROOTO) $(CORELIB) $(CINTLIB) $(HISTLIB) \
$(GRAFLIB) $(G3DLIB) $(TREELIB) $(MATRIXLIB)
--
GitLab