several extensive changes in configure and in several Module.mk's:

  - automatic architecture detection (first architecture argument
    only needed if non-default compiler is required)
  - better detection and avoidance of duplicate libraries for the
    authentication modules (afs, krb5 and srp modules can be build
    at the same time)
Mods by Christian Holm and me.


git-svn-id: http://root.cern.ch/svn/root/trunk@7197 27541ba8-7e3a-0410-8455-c3a389f83636

Makefile

@@ -126,11 +126,9 @@ endif
 ifneq ($(SRPUTILLIB),)
 MODULES      += srputils
 endif
-ifneq ($(KRB5INCDIR),)
 ifneq ($(KRB5LIB),)
 MODULES      += krb5auth
 endif
-endif
 ifneq ($(LDAPINCDIR),)
 ifneq ($(LDAPCLILIB),)
 MODULES      += ldap
@@ -430,6 +428,7 @@ distclean:: clean
 	@rm -f bin/roota lib/libRoot.a
 	@rm -f $(CINTDIR)/include/*.dll $(CINTDIR)/include/sys/*.dll
 	@rm -f $(CINTDIR)/stl/*.dll README/ChangeLog build/dummy.d
+	@$(MAKECINTDLLS) clean
 	-@cd test && $(MAKE) distclean
 	-@cd test/RootShower && $(MAKE) distclean
 
@@ -462,7 +461,7 @@ html: $(ROOTEXE) changelog
 	@$(MAKELOGHTML)
 	@$(MAKEHTML)
 
-install:
+install: all
 	@if [ -d $(BINDIR) ]; then \
 	   inode1=`ls -id $(BINDIR) | awk '{ print $$1 }'`; \
 	fi; \

config/ARCHS

-Architectures supported:
-
 aix                  for AIX 4.x xlC
 aix5                 for AIX 5.x xlC
 aixegcs              for AIX 4.x egcs 1.1.x

config/Makefile.alphakcc

@@ -60,7 +60,7 @@ SOEXT         = so
 SYSLIBS       = -lm
 XLIBS         = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lX11
 CILIBS        = -lm -ltermcap -lbsd
-CRYPTLIBS     = -L$(ROOTSYS)/lib -lcrypt
+CRYPTLIBS     = -lcrypt
 
 # Fortran:
 F77           = f77

config/Makefile.in

@@ -121,6 +121,14 @@ KRB5LIB        := @krb5lib@
 KRB5LIBDIR     := @krb5libdir@
 KRB5INCDIR     := @krb5incdir@
 
+COMERRLIB      := @comerrlib@
+COMERRLIBDIR   := @comerrlibdir@
+
+RESOLVLIB      := @resolvlib@
+
+CRYPTOLIB      := @cryptolib@
+CRYPTOLIBDIR   := @cryptolibdir@
+
 GLOBUSLIB      := @globuslib@
 GLOBUSLIBDIR   := @globuslibdir@
 GLOBUSINCDIR   := @globusincdir@

krb5auth/Module.mk

@@ -34,7 +34,9 @@ include/%.h:    $(KRB5AUTHDIRI)/%.h
 $(KRB5AUTHLIB): $(KRB5AUTHO) $(MAINLIBS)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libKrb5Auth.$(SOEXT) $@ "$(KRB5AUTHO)" \
-		   "$(KRB5AUTHLIBEXTRA) $(KRB5LIBDIR) $(KRB5LIB)"
+		   "$(KRB5AUTHLIBEXTRA) $(KRB5LIBDIR) $(KRB5LIB) \
+		    $(COMERRLIBDIR) $(COMERRLIB) $(RESOLVLIB) \
+		    $(CRYPTOLIBDIR) $(CRYPTOLIB)"
 
 all-krb5auth:   $(KRB5AUTHLIB)
 

net/Module.mk

@@ -51,7 +51,3 @@ distclean-net:  clean-net
 		@rm -f $(NETDEP) $(NETDS) $(NETDH)
 
 distclean::     distclean-net
-
-##### extra rules ######
-$(NETO): %.o: %.cxx
-		$(CXX) $(OPT) $(CXXFLAGS) $(EXTRA_AUTHFLAGS) -o $@ -c $<

proofd/Module.mk

@@ -31,7 +31,7 @@ include/%.h:    $(PROOFDDIRI)/%.h
 
 $(PROOFDEXE):   $(PROOFDEXEO) $(RSAO) $(RPDUTILO)
 		$(LD) $(LDFLAGS) -o $@ $(PROOFDEXEO) $(RPDUTILO) $(RSAO) \
-		   $(CRYPTLIBS) $(SYSLIBS) $(AUTHLIBS)
+		   $(AUTHLIBS) $(CRYPTLIBS) $(SYSLIBS)
 
 all-proofd:     $(PROOFDEXE)
 

rootd/Module.mk

@@ -31,7 +31,7 @@ include/%.h:    $(ROOTDDIRI)/%.h
 
 $(ROOTD):       $(ROOTDO) $(RSAO) $(RPDUTILO)
 		$(LD) $(LDFLAGS) -o $@ $(ROOTDO) $(RPDUTILO) $(RSAO) \
-		   $(CRYPTLIBS) $(SYSLIBS) $(AUTHLIBS)
+		   $(AUTHLIBS) $(CRYPTLIBS) $(SYSLIBS)
 
 all-rootd:      $(ROOTD)
 

rpdutils/Module.mk

@@ -32,19 +32,19 @@ endif
 
 # use SRP for authentication
 ifneq ($(SRPLIB),)
-SRPFLAGS     := -DR__SRP -I$(SRPINCDIR)
+SRPFLAGS     := -I$(SRPINCDIR)
 SRPLIBS      := $(SRPLIBDIR) $(SRPLIB)
 endif
 
 # use krb5 for authentication
 ifneq ($(KRB5LIB),)
-KRB5FLAGS     := -DR__KRB5 -I$(KRB5INCDIR)
+KRB5FLAGS     := -I$(KRB5INCDIR)
 KRB5LIBS      := $(KRB5LIBDIR) $(KRB5LIB)
 endif
 
 # use Globus for authentication
 ifneq ($(GLOBUSLIB),)
-GLBSFLAGS     := -DR__GLBS -I$(GLOBUSINCDIR)
+GLBSFLAGS     := -I$(GLOBUSINCDIR)
 GLBSLIBS      := $(GLOBUSLIBDIR) $(GLOBUSLIB)
 else
 RPDUTILS      := $(filter-out $(MODDIRS)/globus.cxx,$(RPDUTILS))
@@ -52,9 +52,11 @@ RPDUTILO      := $(filter-out $(MODDIRS)/globus.o,$(RPDUTILO))
 endif
 
 # Combined...
-AUTHFLAGS     := $(SHADOWFLAGS) $(AFSFLAGS) $(SRPFLAGS) $(KRB5FLAGS) \
-                 $(GLBSFLAGS) $(EXTRA_AUTHFLAGS)
-AUTHLIBS      := $(GLBSLIBS) $(SHADOWLIBS) $(AFSLIBS) $(SRPLIBS) $(KRB5LIBS)
+AUTHFLAGS     := $(EXTRA_AUTHFLAGS) $(SHADOWFLAGS) $(AFSFLAGS) $(SRPFLAGS) \
+                 $(KRB5FLAGS) $(GLBSFLAGS)
+AUTHLIBS      := $(SHADOWLIBS) $(AFSLIBS) $(SRPLIBS) $(KRB5LIBS) $(GLBSLIBS) \
+                 $(COMERRLIBDIR) $(COMERRLIB) $(RESOLVLIB) \
+                 $(CRYPTOLIBDIR) $(CRYPTOLIB)
 
 # used in the main Makefile
 ALLHDRS       += $(patsubst $(MODDIRI)/%.h,include/%.h,$(RPDUTILH))

srputils/Module.mk

@@ -47,15 +47,17 @@ include/%.h:    $(SRPUTILSDIRI)/%.h
 $(SRPUTILSLIB): $(SRPUTILSO) $(MAINLIBS)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libSRPAuth.$(SOEXT) $@ "$(SRPUTILSO)" \
-		   "$(SRPUTILSLIBEXTRA) $(SRPLIBDIR) $(SRPLIB)"
+		   "$(SRPUTILSLIBEXTRA) $(SRPLIBDIR) $(SRPLIB) \
+		    $(CRYPTOLIBDIR) $(CRYPTOLIB)"
 
 $(RPASSWD):     $(RPASSWDO)
 		$(LD) $(LDFLAGS) -o $@ $(RPASSWDO) \
-		   $(SRPUTILLIBDIR) $(SRPLIBDIR) $(SRPUTILLIB) $(SRPLIB) -lcrack
+		   $(SRPUTILLIBDIR) $(SRPLIBDIR) $(SRPUTILLIB) $(SRPLIB) \
+		   $(CRYPTOLIBDIR) $(CRYPTOLIB) -lcrack
 
 $(RTCONF):      $(RTCONFO)
 		$(LD) $(LDFLAGS) -o $@ $(RTCONFO) \
-		   $(SRPLIBDIR) $(SRPLIB)
+		   $(SRPLIBDIR) $(SRPLIB) $(CRYPTOLIBDIR) $(CRYPTOLIB)
 
 all-srputils:   $(SRPUTILSLIB) $(RPASSWD) $(RTCONF)