git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
remove-libadmin-real-dependancies-20010327
[openafs.git] / src / Makefile
diff --git a/src/Makefile b/src/Makefile
index ac5937b..628966a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,7 @@ INSTALL=${SRCDIR}bin/install
 WASHTOOL=${SRCDIR}bin/washtool
 
 #WASHTOOLRCSUPDATE=${WASHTOOL} rcsupdate
-WASHTOOLCMD=make
+WASHTOOLCMD=$(MAKE)
 WASHTOOLFLAGS=-argument install
 
 COMPILE_PART1=${WASHTOOL} ${WASHTOOLCMD}
@@ -32,7 +32,7 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 all:
        set ${SYS_NAME}/dest; $(MKDIR_IF_NEEDED)
-       $(MAKE) install "COMPILE_PART1=cd obj; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME} "WASHTOOL=echo No washtool: "
+       $(MAKE) install "COMPILE_PART1=cd obj; cd" "COMPILE_PART2=; $(MAKE) install SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ SRCDIR=`pwd`/${SYS_NAME}/dest/" "COMPILE_PART3=; $(MAKE) test SYS_NAME=${SYS_NAME} DESTDIR=`pwd`/${SYS_NAME}/dest/ SRCDIR=`pwd`/${SYS_NAME}/dest/" SYS_NAME=${SYS_NAME} "WASHTOOL=echo No washtool: "
 
 basics:
        -if test -f "${WASHTOOL}"; \
@@ -69,7 +69,7 @@ comerr: basics util
 cmd: basics comerr
        ${COMPILE_PART1} cmd ${COMPILE_PART2}
        @case ${SYS_NAME} in \
-       sgi_6* | sun4x_57 | sun4x_58 | hp_ux11* ) \
+       sgi_6* | sun4x_57 | sun4x_58 | hp_ux11* | sparc64_linux* | alpha_linux* ) \
                ${COMPILE_PART1} cmd ${COMPILE_PART2} install64 ;; \
        esac
 
@@ -95,7 +95,7 @@ rxincls: rxobj
        ${COMPILE_PART1} rx ${COMPILE_PART2}
 
 rxtests: rxobj
-       ${COMPILE_PART1} rx ${COMPILE_PART2}
+       ${COMPILE_PART1} rx ${COMPILE_PART3}
 
 fsint: project kfsint
 
@@ -138,8 +138,9 @@ auth: project comerr des lwp rx sys rxkad audit
 ubik: project auth 
        ${COMPILE_PART1} ubik ${COMPILE_PART2}
 
+#      cd obj/ubik; $(MAKE) test SYS_NAME=${SYS_NAME} 
 ubiktests: ubik sys
-       cd obj/ubik; $(MAKE) test SYS_NAME=${SYS_NAME} 
+       ${COMPILE_PART1} ubik ${COMPILE_PART3}
 
 ptserver: project ubik cmd comerr auth audit
        ${COMPILE_PART1} ptserver ${COMPILE_PART2}
@@ -201,7 +202,7 @@ null: project
 
 gtx: project null auth # kauth rxkad ?
        case ${SYS_NAME} in \
-         rs_aix* | sun4x_5? | sgi_6? | *linux*) \
+         rs_aix* | sun4x_5? | sgi_6? | *linux* | ppc_darwin*) \
                rm -f ${DESTDIR}lib/afs/libtermlib.a; \
                ln -s libnull.a ${DESTDIR}lib/afs/libtermlib.a; \
                ${COMPILE_PART1} gtx ${COMPILE_PART2};; \
@@ -233,6 +234,7 @@ ntp: project volser
        case ${SYS_NAME} in \
          sun4x_58 ) echo skipping ntp for ${SYS_NAME} ;; \
          *linux* ) echo skipping ntp for ${SYS_NAME} ;; \
+         ppc_darwin* ) echo skipping ntp for ${SYS_NAME} ;; \
          * ) ${COMPILE_PART1} ntp ${COMPILE_PART2} ;; \
        esac
 
@@ -251,11 +253,7 @@ bozo: project ntp audit
 vfsck: minproject vol
        set -x; \
        case ${SYS_NAME} in \
-       sgi_* | *linux*) \
-               echo skip vfsck for ${SYS_NAME} ;; \
-       rs_aix42)       \
-               echo skip vfsck for ${SYS_NAME} ;; \
-       sun4x_58 )  \
+       sgi_* | *linux* | rs_aix42 | ppc_darwin* ) \
                echo skip vfsck for ${SYS_NAME} ;; \
         * ) \
                ${COMPILE_PART1} vfsck ${COMPILE_PART2} ;; \
@@ -275,6 +273,8 @@ login: project kauth rxkad
                 ${COMPILE_PART1} login ${COMPILE_PART2} ;; \
        sun4x_* | hp_ux11* | *linux* ) \
                ${COMPILE_PART1} pam ${COMPILE_PART2} ;; \
+       ppc_darwin* ) \
+               echo Skipping login for ${SYS_NAME} ;; \
        * ) \
                ${COMPILE_PART1} login ${COMPILE_PART2} ;; \
        esac
@@ -412,12 +412,22 @@ tests: rxtests ubiktests
 
 # pthread based user space RX library
 libafsrpc: rx rxkad des
-       ${COMPILE_PART1} libafsrpc  ${COMPILE_PART2}
+       case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux*) \
+       ${COMPILE_PART1} libafsrpc  ${COMPILE_PART2} ;; \
+       *) \
+               echo Not building MT libafsrpc for ${SYS_NAME} ;; \
+       esac
 
 libafsauthent: ubik auth kauth libafsrpc
-       ${COMPILE_PART1} libafsauthent  ${COMPILE_PART2}
+       case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux*) \
+       ${COMPILE_PART1} libafsauthent  ${COMPILE_PART2} ;; \
+       *) \
+               echo Not building MT libafsrpc for ${SYS_NAME} ;; \
+       esac
 
-libadmin: libafsauthent bozo
+libadmin_real: 
        ${COMPILE_PART1} libadmin ${COMPILE_PART2}
        ${COMPILE_PART1} libadmin/adminutil ${COMPILE_PART2}
        ${COMPILE_PART1} libadmin/vos ${COMPILE_PART2}
@@ -429,6 +439,19 @@ libadmin: libafsauthent bozo
        ${COMPILE_PART1} libadmin/test ${COMPILE_PART2}
        ${COMPILE_PART1} libadmin/samples ${COMPILE_PART2}
 
+libadmin: libafsauthent bozo
+       case ${SYS_NAME} in \
+       alpha_dux*|sgi_*|sun4x_*|rs_aix*|*linux*|hp_ux*) \
+                       $(MAKE) libadmin_real SYS_NAME=$(SYS_NAME) \
+                       WASHTOOL="$(WASHTOOL)" \
+                       COMPILE_PART1="$(COMPILE_PART1)" \
+                       COMPILE_PART2="$(COMPILE_PART2)" \
+                       SRCDIR=$(SRCDIR) DESTDIR=$(DESTDIR) \
+                       DBG_DEFS=$(DBG_DEFS) ;; \
+       *) \
+               echo Not building MT libadmin for ${SYS_NAME} ;; \
+       esac
+
 finale: project cmd comerr afsd allrcmds butc tbutc libafs libuafs audit kauth log package \
        ptserver scout bu_utils ubik uss bozo vfsck volser \
        venus update xstat afsmonitor dauth tests libafsrpc \
@@ -444,7 +467,7 @@ libafs_setup: config minproject export
 # Warning: The next few lines are _extremely_ sensitive to spaces and tabs.
        ${WASHTOOL} object libafs
        case ${SYS_NAME} in \
-       alpha_dux4* ) \
+       alpha_dux* ) \
                MKAFS_OSTYPE=DUX;; \
        hp_ux* ) \
                MKAFS_OSTYPE=HPUX;; \
@@ -456,6 +479,8 @@ libafs_setup: config minproject export
                MKAFS_OSTYPE=IRIX;; \
        sun4x_5* ) \
                MKAFS_OSTYPE=SOLARIS;; \
+       ppc_darwin* ) \
+               MKAFS_OSTYPE=DARWIN;; \
        * ) \
                echo WARNING: No MakefileProto for sys ${SYS_NAME} ; \
        esac; \
@@ -475,10 +500,12 @@ libuafs_setup: config minproject export
                MKAFS_OSTYPE=AIX;; \
        sun4x_5* ) \
                MKAFS_OSTYPE=SOLARIS;; \
-       alpha_dux4* ) \
+       alpha_dux* ) \
                MKAFS_OSTYPE=DUX;; \
        sgi_6* ) \
                MKAFS_OSTYPE=IRIX;; \
+       ppc_darwin* ) \
+               MKAFS_OSTYPE=DARWIN;; \
        * ) \
                echo WARNING: No MakefileProto for sys ${SYS_NAME} ; \
        esac; \
@@ -486,8 +513,9 @@ libuafs_setup: config minproject export
 
 # "COMPILE_PART1=${COMPILE_PART1}" "COMPILE_PART2=${COMPILE_PART2}" SYS_NAME=${SYS_NAME} ;; 
 
+TARGET=finale
 install:
-       $(MAKE) finale "SYS_NAME=${SYS_NAME}" "WASHTOOL=${WASHTOOL}" \
+       $(MAKE) $(TARGET) "SYS_NAME=${SYS_NAME}" "WASHTOOL=${WASHTOOL}" \
                "COMPILE_PART1=${COMPILE_PART1}" \
                "COMPILE_PART2=${COMPILE_PART2}" \
                 DESTDIR=`pwd`/${SYS_NAME}/dest/ \
@@ -522,12 +550,14 @@ links:
        - /bin/rm -rf @sys/dest/* ;
        - /bin/mkdir @sys/obj ;
        echo "Create the obj directories"
+       here=`pwd` ; \
        cd src; \
        for file in `find [!NW]* -type d -print` ; do \
-               /bin/mkdir ../obj/$${file} ; \
+               /bin/mkdir $${here}/obj/$${file} ; \
        done;
        echo "Create the obj file links"
+       here=`pwd` ; \
        cd src; \
        for file in `find [!NW]* -type f -print` ; do \
-               /bin/ln -s `pwd`/$${file} ../obj/$${file} ; \
+               /bin/ln -s `pwd`/$${file} $${here}/obj/$${file} ; \
        done;
OpenAFS Master Repository