PERFORCE change 64392 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=64392

Change 64392 by peter at peter_daintree on 2004/11/06 00:17:47

	Tidy up

Affected files ...

.. //depot/projects/hammer/Makefile#26 edit
.. //depot/projects/hammer/Makefile.inc1#70 edit

Differences ...

==== //depot/projects/hammer/Makefile#26 (text+ko) ====

@@ -70,7 +70,7 @@
 	obj objlink regress rerelease tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \
-	_build32 _install32
+	build32 install32
 
 BITGTS=	files includes
 BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}

==== //depot/projects/hammer/Makefile.inc1#70 (text+ko) ====

@@ -203,26 +203,34 @@
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 # 32 bit world
-CCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32
-CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32
-OBJCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include/objc -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32
+LIB32PREFLAGS=	-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT
+LIB32POSTFLAGS=	-I${LIB32TMP}/usr/include \
+		-L${LIB32TMP}/usr/lib32 \
+		-B${LIB32TMP}/usr/lib32
+LIB32CC=	${LIB32PREFLAGS} \
+		${LIB32POSTFLAGS}
+LIB32CXX=	${LIB32CPUFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \
+		${LIB32POSTFLAGS}
+LIB32OBJC=	${LIB32CPUFLAGS} -I${LIB32TMP}/usr/include/objc \
+		${LIB32POSTFLAGS}
 
 LIB32MAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
-		CC="cc ${CCARGS}" \
-		CXX="c++ ${CXXARGS}" \
-		OBJC="cc ${OBJCARGS}" \
+		CC="cc ${LIB32CC}" \
+		CXX="c++ ${LIB32CXX}" \
+		OBJC="cc ${LIB32OBJC}" \
 		LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
 		AS="as --32" \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32
 
-LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT -DNO_BIND -DNOMAN -DNODOC -DNOINFO \
-		CC="cc ${CCARGS}" \
-		CXX="c++ ${CXXARGS}" \
-		OBJC="cc ${OBJCARGS}" \
+LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
+		-DNO_BIND -DNOMAN -DNODOC -DNOINFO \
+		CC="cc ${LIB32CC}" \
+		CXX="c++ ${LIB32CXX}" \
+		OBJC="cc ${LIB32OBJC}" \
 		LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
 		AS="as --32" \
 		LIBDIR=/usr/lib32 \
@@ -365,8 +373,8 @@
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-all
-.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
-_build32:
+.if ${MACHINE_ARCH} == amd64
+build32:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 5.1: building 32 bit libraries"
@@ -392,7 +400,7 @@
 	    ${MAKE} -DNOMAN -DNODOC -DNOINFO CC="cc ${CCARGS}" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t}
 .endfor
 
-_install32:
+install32:
 	mkdir -p ${DESTDIR}/usr/lib32
 	cd ${.CURDIR}/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install
 	cd ${.CURDIR}/gnu/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install
@@ -411,7 +419,7 @@
 .endif
 WMAKE_TGTS+=	_includes _libraries _depend everything
 .if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
-WMAKE_TGTS+=	_build32
+WMAKE_TGTS+=	build32
 .endif
 
 buildworld: ${WMAKE_TGTS}
@@ -544,7 +552,7 @@
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
 .if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
-	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _install32
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
 .endif
 
 redistribute: