mirror of
https://github.com/lcn2/calc.git
synced 2025-08-16 01:03:29 +03:00
Release calc version 2.12.2.1
This commit is contained in:
Landon Curt Noll
49
CHANGES
49
CHANGES
@@ -1,4 +1,47 @@
|
||||
The following are the changes from calc version 2.12.1.10 to date:
|
||||
The following are the changes from calc version 2.12.1.1 to date:
|
||||
|
||||
Added an explicit Solaris target.
|
||||
|
||||
Fixed confusion in Makefile where some uses of ${EXT} were misnamed ${EXE}.
|
||||
|
||||
Added a "make strip" rule, per suggestion from Igor Furlan <primorec
|
||||
at sbcglobal dot net>, to allow one to strip previously built binary
|
||||
executables and libraries.
|
||||
|
||||
Under the Darwin / OS X target, ${DARWIN_ARCH} is left empty meaning
|
||||
that calc is compiled for the native CPU type instead of Universal
|
||||
Binary (Intel and PPC).
|
||||
|
||||
By default, the calc binary that is built for the rpm forces
|
||||
${LD_SHARE} to be empty. An empty ${LD_SHARE} means that the calc
|
||||
from the rpm does not set rpath. This in turn causes the default
|
||||
system path to be searched when looking for libcalc and libcustcalc.
|
||||
|
||||
The Makefile shipped with calc still sets ${LD_SHARE} for host targets.
|
||||
By default, the dynamic shared library search path for all targets
|
||||
starts with the source directory. Starting the search in the source
|
||||
directory is convenient for testing and debugging but is not appropriate
|
||||
for installation on a production system. To get the same effect
|
||||
as the calc binary in the calc rpm, try:
|
||||
|
||||
make clobber
|
||||
make calc-dynamic-only BLD_TYPE=calc-dynamic-only LD_SHARE=
|
||||
make install
|
||||
|
||||
The libcalc and libcustcalc shared libraries are now tied to
|
||||
the 4 level calc version instead of just 3 levels. For example,
|
||||
under Linux calc version 2.12.2.1 uses /usr/lib/libcalc.so.2.12.2.1
|
||||
instead of just the /usr/lib/libcalc.so.2.12.2 file. This change
|
||||
was made so that calc produced by 'make clobber; make all install'
|
||||
is consistent with the calc rpm.
|
||||
|
||||
Calc is now releasing the calc-debuginfo rpm for those RPM users who
|
||||
which to use non-stripped libraries and binaries for debugging
|
||||
purposes. By default, the calc rpm installed stripped binaries
|
||||
and libraries.
|
||||
|
||||
|
||||
The following are the changes from calc version 2.12.1.10 to 2.12.2:
|
||||
|
||||
Put back the missing -s flags on the cscripts: mersenne, 4dsphere,
|
||||
fprodcut, plus, and powerterm. Thanks goes to Bradley Reed
|
||||
@@ -6592,8 +6635,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
|
||||
## received a copy with calc; if not, write to Free Software Foundation, Inc.
|
||||
## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
##
|
||||
## @(#) $Revision: 30.8 $
|
||||
## @(#) $Id: CHANGES,v 30.8 2007/09/02 06:26:38 chongo Exp $
|
||||
## @(#) $Revision: 30.10 $
|
||||
## @(#) $Id: CHANGES,v 30.10 2007/09/06 08:10:54 chongo Exp $
|
||||
## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
|
||||
##
|
||||
## Under source code control: 1993/06/02 18:12:57
|
||||
|
||||
221
Makefile
221
Makefile
@@ -38,8 +38,8 @@
|
||||
# received a copy with calc; if not, write to Free Software Foundation, Inc.
|
||||
# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
MAKEFILE_REV= $$Revision: 30.18 $$
|
||||
# @(#) $Id: Makefile.ship,v 30.18 2007/09/02 05:38:34 chongo Exp $
|
||||
MAKEFILE_REV= $$Revision: 30.21 $$
|
||||
# @(#) $Id: Makefile.ship,v 30.21 2007/09/06 08:08:39 chongo Exp $
|
||||
# @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
|
||||
#
|
||||
# Under source code control: 1990/02/15 01:48:41
|
||||
@@ -965,7 +965,7 @@ EXT=
|
||||
|
||||
# The default calc versions
|
||||
#
|
||||
VERSION= 2.12.2
|
||||
VERSION= 2.12.2.1
|
||||
VERS= 2.12.2
|
||||
VER= 2.12
|
||||
VE= 2
|
||||
@@ -973,6 +973,7 @@ VE= 2
|
||||
# Names of shared libraries with versions
|
||||
#
|
||||
LIB_EXT= .so
|
||||
LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}
|
||||
LIB_EXT_VERS= ${LIB_EXT}.${VERS}
|
||||
LIB_EXT_VER= ${LIB_EXT}.${VER}
|
||||
LIB_EXT_VE= ${LIB_EXT}.${VE}
|
||||
@@ -1010,6 +1011,7 @@ LN= ln
|
||||
LDCONFIG= ldconfig
|
||||
# assume the X11 makedepend tool for the depend rule
|
||||
MAKEDEPEND= makedepend
|
||||
STRIP= strip
|
||||
|
||||
# Extra compiling and linking flags
|
||||
#
|
||||
@@ -1105,8 +1107,8 @@ CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERS}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERS}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LD_STATIC=
|
||||
@@ -1132,7 +1134,7 @@ ifeq ($(target),Darwin)
|
||||
BLD_TYPE= calc-dynamic-only
|
||||
#
|
||||
CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/sw/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= ${DARWIN_ARCH}
|
||||
LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib
|
||||
LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib
|
||||
@@ -1152,11 +1154,14 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
|
||||
#
|
||||
# Darmin dynamic shared lib filenames
|
||||
LIB_EXT:= .dylib
|
||||
LIB_EXT_VERSION:= .${VERSION}${LIB_EXT}
|
||||
LIB_EXT_VERS:= .${VERS}${LIB_EXT}
|
||||
LIB_EXT_VER:= .${VER}${LIB_EXT}
|
||||
LIB_EXT_VE:= .${VE}${LIB_EXT}
|
||||
# compile Universal by default
|
||||
DARWIN_ARCH= -arch i386 -arch ppc
|
||||
# DARWIN_ARCH= -arch i386 -arch ppc # Universal binary
|
||||
# DARWIN_ARCH= -arch i386 # Intel binary
|
||||
# DARWIN_ARCH= -arch ppc # PPC binary
|
||||
DARWIN_ARCH= # native binary
|
||||
MACOSX_DEPLOYMENT_TARGET=10.4
|
||||
#
|
||||
endif
|
||||
@@ -1179,8 +1184,8 @@ CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERS}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERS}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LD_STATIC=
|
||||
@@ -1199,6 +1204,37 @@ MAKE= gmake
|
||||
#
|
||||
endif
|
||||
|
||||
######################
|
||||
# Sun Solaris target #
|
||||
######################
|
||||
|
||||
# XXX - this needs to be tested
|
||||
ifeq ($(target),solaris)
|
||||
#
|
||||
BLD_TYPE= calc-dynamic-only
|
||||
#
|
||||
CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LIBCALC_STATIC=
|
||||
LIBCUSTCALC_STATIC=
|
||||
LD_STATIC=
|
||||
#
|
||||
CCWARN= -Wall -W -Wno-comment
|
||||
CCWERR=
|
||||
CCOPT= ${DEBUG}
|
||||
CCMISC=
|
||||
#
|
||||
LCC= gcc
|
||||
CC= ${PURIFY} ${LCC} ${CCWERR}
|
||||
#
|
||||
endif
|
||||
|
||||
#######################################################
|
||||
# simple target - values used to form Makefile.simple #
|
||||
#######################################################
|
||||
@@ -1215,8 +1251,8 @@ CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERS}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERS}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LD_STATIC=
|
||||
@@ -1262,8 +1298,8 @@ CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERS}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERS}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LIBCALC_STATIC=
|
||||
@@ -1426,15 +1462,21 @@ UTIL_TMP= ll_tmp fpos_tmp fposv_tmp const_tmp uid_tmp newstr_tmp vs_tmp \
|
||||
memmv_tmp offscl_tmp posscl_tmp newstr_tmp \
|
||||
getsid_tmp gettime_tmp getprid_tmp rusage_tmp strdup_tmp
|
||||
|
||||
# these utility progs may be created in the process of building BUILD_H_SRC
|
||||
# these utility executables may be created in the process of
|
||||
# building the BUILD_H_SRC file set
|
||||
#
|
||||
UTIL_PROGS= align32${EXT} fposval${EXT} have_uid_t${EXT} have_const${EXT} \
|
||||
endian${EXT} longbits${EXT} have_newstr${EXT} have_stdvs${EXT} \
|
||||
have_varvs${EXT} have_ustat${EXT} have_getsid${EXT} \
|
||||
have_getpgid${EXT} have_gettime${EXT} have_getprid${EXT} \
|
||||
ver_calc${EXT} have_strdup${EXT} no_implicit${EXT} no_implicit.arg \
|
||||
ver_calc${EXT} have_strdup${EXT} no_implicit${EXT} \
|
||||
have_unused${EXT} have_fpos${EXT} have_fpos_pos${EXT} \
|
||||
have_offscl${EXT} have_rusage${EXT} have_args.sh
|
||||
have_offscl${EXT} have_rusage${EXT}
|
||||
|
||||
# these utility files and scripts may be created in the process of building
|
||||
# the BUILD_H_SRC file set
|
||||
#
|
||||
UTIL_FILES= no_implicit.arg have_args.sh
|
||||
|
||||
# Any .h files that are needed to compile sample code.
|
||||
#
|
||||
@@ -1653,11 +1695,12 @@ CALC_STATIC_LIBS= libcalc.a libcustcalc.a
|
||||
|
||||
# Libaraies created and used to build calc
|
||||
#
|
||||
CALC_DYNAMIC_LIBS= libcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VERS}
|
||||
CALC_DYNAMIC_LIBS= libcalc${LIB_EXT_VERSION} libcustcalc${LIB_EXT_VERSION}
|
||||
|
||||
# Symlinks of dymanic shared libraries
|
||||
#
|
||||
SYM_DYNAMIC_LIBS= libcalc${LIB_EXT_VER} libcalc${LIB_EXT_VE} libcalc${LIB_EXT} \
|
||||
libcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VERSION} \
|
||||
libcustcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VER} \
|
||||
libcustcalc${LIB_EXT_VE} libcustcalc${LIB_EXT}
|
||||
|
||||
@@ -1666,11 +1709,11 @@ SYM_DYNAMIC_LIBS= libcalc${LIB_EXT_VER} libcalc${LIB_EXT_VE} libcalc${LIB_EXT} \
|
||||
# NOTE: The ${SAMPLE_TARGETS} and ${SAMPLE_STATIC_TARGETS} are built but
|
||||
# not installed at this time.
|
||||
#
|
||||
# NOTE: There must be a foo-static${EXE} in SAMPLE_STATIC_TARGETS for
|
||||
# every foo${EXE} in ${SAMPLE_TARGETS}.
|
||||
# NOTE: There must be a foo-static${EXT} in SAMPLE_STATIC_TARGETS for
|
||||
# every foo${EXT} in ${SAMPLE_TARGETS}.
|
||||
#
|
||||
SAMPLE_TARGETS= sample_rand${EXE} sample_many${EXE}
|
||||
SAMPLE_STATIC_TARGETS= sample_rand-static${EXE} sample_many-static${EXE}
|
||||
SAMPLE_TARGETS= sample_rand${EXT} sample_many${EXT}
|
||||
SAMPLE_STATIC_TARGETS= sample_rand-static${EXT} sample_many-static${EXT}
|
||||
|
||||
# list of cscript programs to that need to be built to satisfy cscript/.all
|
||||
#
|
||||
@@ -1776,7 +1819,7 @@ calc-static-only: ${STATIC_FIRST_TARGETS} ${EARLY_TARGETS} \
|
||||
exit 3; \
|
||||
fi
|
||||
${Q} for i in .dynamic ${CALC_DYNAMIC_LIBS} ${SYM_DYNAMIC_LIBS} \
|
||||
custom/libcustcalc${LIB_EXT_VERS}; do \
|
||||
custom/libcustcalc${LIB_EXT_VERSION}; do \
|
||||
r="calc-static-only"; \
|
||||
if [ -e "$$i" ]; then \
|
||||
echo "Found the dynamic target $$i file. You must:" 1>&2; \
|
||||
@@ -1797,18 +1840,22 @@ calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
|
||||
${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
|
||||
${READLINE_LIB} -o $@
|
||||
|
||||
libcalc${LIB_EXT_VERS}: ${LIBOBJS} ver_calc${EXE} ${MAKE_FILE}
|
||||
${CC} ${LIBCALC_SHLIB} ${LIBOBJS} -o libcalc${LIB_EXT_VERS}
|
||||
libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}
|
||||
${CC} ${LIBCALC_SHLIB} ${LIBOBJS} -o libcalc${LIB_EXT_VERSION}
|
||||
|
||||
libcalc${LIB_EXT_VER}: libcalc${LIB_EXT_VERS}
|
||||
libcalc${LIB_EXT_VERS}: libcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcalc${LIB_EXT_VE}: libcalc${LIB_EXT_VERS}
|
||||
libcalc${LIB_EXT_VER}: libcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcalc${LIB_EXT}: libcalc${LIB_EXT_VERS}
|
||||
libcalc${LIB_EXT_VE}: libcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcalc${LIB_EXT}: libcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
@@ -1851,11 +1898,11 @@ calc.usage: calc.1 ${MAKE_FILE}
|
||||
|
||||
sample: ${SAMPLE_TARGETS}
|
||||
|
||||
sample_rand${EXE}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
|
||||
sample_rand${EXT}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
|
||||
${CC} sample_rand.o ${CLDFALGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
|
||||
${READLINE_LIB} -o $@
|
||||
|
||||
sample_many${EXE}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
|
||||
sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
|
||||
${CC} sample_many.o ${CLDFALGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
|
||||
${READLINE_LIB} -o $@
|
||||
|
||||
@@ -3202,6 +3249,7 @@ win32_hsrc: win32.mkdef ${MAKE_FILE}
|
||||
${RM} -f ${UTIL_MISC_SRC}; \
|
||||
${RM} -f ${UTIL_OBJS}; \
|
||||
${RM} -f ${UTIL_PROGS}; \
|
||||
${RM} -f ${UTIL_FILES}; \
|
||||
${RM} -f ${MAKE_FILE})
|
||||
${Q} echo 'win32 directory formed'
|
||||
|
||||
@@ -3275,26 +3323,30 @@ custom/.all: custom/Makefile
|
||||
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
custom/libcustcalc${LIB_EXT_VERS}: custom/Makefile
|
||||
custom/libcustcalc${LIB_EXT_VERSION}: custom/Makefile
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
|
||||
${V} echo '=-=-=-=-= Invoking all rule for custom =-=-=-=-='
|
||||
cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} $@
|
||||
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
libcustcalc${LIB_EXT_VERS}: custom/libcustcalc${LIB_EXT_VERS}
|
||||
libcustcalc${LIB_EXT_VERSION}: custom/libcustcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${CP} -p $? $@
|
||||
|
||||
libcustcalc${LIB_EXT_VER}: libcustcalc${LIB_EXT_VERS}
|
||||
libcustcalc${LIB_EXT_VERS}: custom/libcustcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcustcalc${LIB_EXT_VE}: libcustcalc${LIB_EXT_VERS}
|
||||
libcustcalc${LIB_EXT_VER}: libcustcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcustcalc${LIB_EXT}: libcustcalc${LIB_EXT_VERS}
|
||||
libcustcalc${LIB_EXT_VE}: libcustcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcustcalc${LIB_EXT}: libcustcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
@@ -3323,11 +3375,11 @@ libcalc.a: ${LIBOBJS} ${MAKE_FILE}
|
||||
custom/libcustcalc.a: custom/Makefile
|
||||
cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} libcustcalc.a
|
||||
|
||||
sample_rand-static${EXE}: sample_rand.o ${CALC_STATIC_LIBS} ${MAKE_FILE}
|
||||
sample_rand-static${EXT}: sample_rand.o ${CALC_STATIC_LIBS} ${MAKE_FILE}
|
||||
${CC} ${LDFLAGS} sample_rand.o ${LD_STATIC} \
|
||||
${CALC_STATIC_LIBS} ${READLINE_LIB} -o $@
|
||||
|
||||
sample_many-static${EXE}: sample_many.o ${CALC_STATIC_LIBS} ${MAKE_FILE}
|
||||
sample_many-static${EXT}: sample_many.o ${CALC_STATIC_LIBS} ${MAKE_FILE}
|
||||
${CC} ${LDFLAGS} sample_many.o ${LD_STATIC} \
|
||||
${CALC_STATIC_LIBS} ${READLINE_LIB} -o $@
|
||||
|
||||
@@ -3760,6 +3812,7 @@ env:
|
||||
@echo 'UTIL_C_SRC=${UTIL_C_SRC}'; echo ''
|
||||
@echo 'UTIL_MISC_SRC=${UTIL_MISC_SRC}'; echo ''
|
||||
@echo 'UTIL_OBJS=${UTIL_OBJS}'; echo ''
|
||||
@echo 'UTIL_FILES=${UTIL_FILES}'; echo ''
|
||||
@echo 'UTIL_PROGS=${UTIL_PROGS}'; echo ''
|
||||
@echo 'UTIL_TMP=${UTIL_TMP}'; echo ''
|
||||
@echo 'V=${V}'; echo ''
|
||||
@@ -3841,8 +3894,7 @@ gdb:
|
||||
|
||||
rpm: clobber rpm.mk calc.spec.in
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
|
||||
${RM} -rf /var/tmp/redhat /var/tmp/calc-root
|
||||
${MAKE} -f rpm.mk RHDIR=/var/tmp/redhat TMPDIR=/var/tmp/redhat V=${V}
|
||||
${MAKE} -f rpm.mk V=${V}
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
# rpm static rules
|
||||
@@ -3953,6 +4005,7 @@ clean: custom/Makefile
|
||||
${RM} -f ${UTIL_OBJS}
|
||||
${RM} -f ${UTIL_TMP}
|
||||
${RM} -f ${UTIL_PROGS}
|
||||
${RM} -f ${UTIL_FILES}
|
||||
${RM} -f ${SAMPLE_OBJ}
|
||||
${RM} -f .libcustcalc_error
|
||||
${RM} -f calc.spec.sed
|
||||
@@ -3992,16 +4045,18 @@ clobber: custom/Makefile clean
|
||||
${RM} -f calc.pixie calc.rf calc.Counts calc.cord
|
||||
${RM} -rf gen_h skel Makefile.bak tmp.patch
|
||||
${RM} -f calc.spec inst_files rpm.mk.patch tmp
|
||||
${RM} -f libcalc${LIB_EXT_VERSION}
|
||||
${RM} -f libcalc${LIB_EXT_VERS}
|
||||
${RM} -f libcalc${LIB_EXT_VER}
|
||||
${RM} -f libcalc${LIB_EXT_VE}
|
||||
${RM} -f libcalc*${LIB_EXT}
|
||||
${RM} -f libcustcalc${LIB_EXT_VERSION}
|
||||
${RM} -f libcustcalc${LIB_EXT_VERS}
|
||||
${RM} -f libcustcalc${LIB_EXT_VER}
|
||||
${RM} -f libcustcalc${LIB_EXT_VE}
|
||||
${RM} -f libcustcalc*${LIB_EXT}
|
||||
${RM} -f libcustcalc.a
|
||||
${RM} -f calc-static${EXE}
|
||||
${RM} -f calc-static${EXT}
|
||||
${RM} -f ${CALC_STATIC_LIBS}
|
||||
${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
|
||||
-cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} clobber
|
||||
@@ -4151,7 +4206,7 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
|
||||
${MV} -f ${T}${BINDIR}/calc.new${EXT} ${T}${BINDIR}/calc${EXT}; \
|
||||
echo "installed ${T}${BINDIR}/calc${EXT}"; \
|
||||
fi
|
||||
-${Q} if [ -f calc-static${EXE} ]; then \
|
||||
-${Q} if [ -f calc-static${EXT} ]; then \
|
||||
if ${CMP} -s calc-static${EXT} \
|
||||
${T}${BINDIR}/calc-static${EXT}; then \
|
||||
${TRUE}; \
|
||||
@@ -4189,43 +4244,49 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
|
||||
echo "installed ${T}${LIBDIR}/libcalc.a"; \
|
||||
fi; \
|
||||
fi
|
||||
${Q}# NOTE: The this makefile installs libcustcalc${LIB_EXT_VERS}
|
||||
${Q}# NOTE: The this makefile installs libcustcalc${LIB_EXT_VERSION}
|
||||
${Q}# because we only want to perform one ${LDCONFIG} for both
|
||||
${Q}# libcalc${LIB_EXT_VERS} and libcustcalc${LIB_EXT_VERS}.
|
||||
-${Q} if ${CMP} -s libcalc${LIB_EXT_VERS} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERS} && \
|
||||
${CMP} -s custom/libcustcalc${LIB_EXT_VERS} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}; then \
|
||||
${Q}# libcalc${LIB_EXT_VERSION} and libcustcalc${LIB_EXT_VERSION}.
|
||||
-${Q} if ${CMP} -s libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERSION} && \
|
||||
${CMP} -s custom/libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}; then \
|
||||
${TRUE}; \
|
||||
else \
|
||||
${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}.new; \
|
||||
${CP} -f libcalc${LIB_EXT_VERS} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERS}.new; \
|
||||
${MV} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}.new \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERS}; \
|
||||
${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new; \
|
||||
${CP} -f libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new; \
|
||||
${MV} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERS}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VER}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VE}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
|
||||
${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}.new; \
|
||||
${CP} -f custom/libcustcalc${LIB_EXT_VERS} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}.new; \
|
||||
${MV} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}.new \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}; \
|
||||
${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new; \
|
||||
${CP} -f custom/libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new; \
|
||||
${MV} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}; \
|
||||
echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}; \
|
||||
echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}; \
|
||||
echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
|
||||
if [ -z "${T}" -o "/" = "${T}" ]; then \
|
||||
@@ -4385,12 +4446,12 @@ uninstall: custom/Makefile
|
||||
echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
|
||||
fi; \
|
||||
fi
|
||||
-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \
|
||||
${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
|
||||
if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \
|
||||
echo "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
|
||||
-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \
|
||||
${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
|
||||
if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \
|
||||
echo "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
|
||||
else \
|
||||
echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
|
||||
echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
|
||||
fi; \
|
||||
fi
|
||||
-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT}" ]; then \
|
||||
@@ -4425,12 +4486,12 @@ uninstall: custom/Makefile
|
||||
echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
|
||||
fi; \
|
||||
fi
|
||||
-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \
|
||||
${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
|
||||
if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \
|
||||
echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
|
||||
-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \
|
||||
${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
|
||||
if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \
|
||||
echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
|
||||
else \
|
||||
echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
|
||||
echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
|
||||
fi; \
|
||||
fi
|
||||
-${Q} if [ -z "${T}" -o "/" = "${T}" ]; then \
|
||||
@@ -4496,6 +4557,20 @@ splint: #hsrc
|
||||
${SPLINT} ${SPLINT_OPTS} -DCALC_SRC -I. \
|
||||
${CALCSRC} ${LIBSRC} ${BUILD_C_SRC} ${UTIL_C_SRC}
|
||||
|
||||
# strip - for reducing the size of the binary files
|
||||
#
|
||||
strip:
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
|
||||
${Q} for i in ${UTIL_PROGS} ${SAMPLE_TARGETS} ${SAMPLE_STATIC_TARGETS} \
|
||||
calc${EXT} calc-static${EXT} ${CALC_DYNAMIC_LIBS} \
|
||||
${CALC_STATIC_LIBS}; do \
|
||||
if [ -s "$$i" -a -w "$$i" ]; then \
|
||||
${STRIP} "$$i"; \
|
||||
echo "stripped $$i"; \
|
||||
fi; \
|
||||
done
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
###
|
||||
#
|
||||
# make depend stuff
|
||||
|
||||
169
Makefile.simple
169
Makefile.simple
@@ -38,8 +38,8 @@
|
||||
# received a copy with calc; if not, write to Free Software Foundation, Inc.
|
||||
# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
MAKEFILE_REV= $$Revision: 30.18 $$
|
||||
# @(#) $Id: Makefile.ship,v 30.18 2007/09/02 05:38:34 chongo Exp $
|
||||
MAKEFILE_REV= $$Revision: 30.21 $$
|
||||
# @(#) $Id: Makefile.ship,v 30.21 2007/09/06 08:08:39 chongo Exp $
|
||||
# @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
|
||||
#
|
||||
# Under source code control: 1990/02/15 01:48:41
|
||||
@@ -950,7 +950,7 @@ EXT=
|
||||
|
||||
# The default calc versions
|
||||
#
|
||||
VERSION= 2.12.2
|
||||
VERSION= 2.12.2.1
|
||||
VERS= 2.12.2
|
||||
VER= 2.12
|
||||
VE= 2
|
||||
@@ -958,6 +958,7 @@ VE= 2
|
||||
# Names of shared libraries with versions
|
||||
#
|
||||
LIB_EXT= .so
|
||||
LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}
|
||||
LIB_EXT_VERS= ${LIB_EXT}.${VERS}
|
||||
LIB_EXT_VER= ${LIB_EXT}.${VER}
|
||||
LIB_EXT_VE= ${LIB_EXT}.${VE}
|
||||
@@ -995,6 +996,7 @@ LN= ln
|
||||
LDCONFIG= ldconfig
|
||||
# assume the X11 makedepend tool for the depend rule
|
||||
MAKEDEPEND= makedepend
|
||||
STRIP= strip
|
||||
|
||||
# Extra compiling and linking flags
|
||||
#
|
||||
@@ -1084,8 +1086,8 @@ CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERS}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERS}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LD_STATIC=
|
||||
@@ -1232,15 +1234,21 @@ UTIL_TMP= ll_tmp fpos_tmp fposv_tmp const_tmp uid_tmp newstr_tmp vs_tmp \
|
||||
memmv_tmp offscl_tmp posscl_tmp newstr_tmp \
|
||||
getsid_tmp gettime_tmp getprid_tmp rusage_tmp strdup_tmp
|
||||
|
||||
# these utility progs may be created in the process of building BUILD_H_SRC
|
||||
# these utility executables may be created in the process of
|
||||
# building the BUILD_H_SRC file set
|
||||
#
|
||||
UTIL_PROGS= align32${EXT} fposval${EXT} have_uid_t${EXT} have_const${EXT} \
|
||||
endian${EXT} longbits${EXT} have_newstr${EXT} have_stdvs${EXT} \
|
||||
have_varvs${EXT} have_ustat${EXT} have_getsid${EXT} \
|
||||
have_getpgid${EXT} have_gettime${EXT} have_getprid${EXT} \
|
||||
ver_calc${EXT} have_strdup${EXT} no_implicit${EXT} no_implicit.arg \
|
||||
ver_calc${EXT} have_strdup${EXT} no_implicit${EXT} \
|
||||
have_unused${EXT} have_fpos${EXT} have_fpos_pos${EXT} \
|
||||
have_offscl${EXT} have_rusage${EXT} have_args.sh
|
||||
have_offscl${EXT} have_rusage${EXT}
|
||||
|
||||
# these utility files and scripts may be created in the process of building
|
||||
# the BUILD_H_SRC file set
|
||||
#
|
||||
UTIL_FILES= no_implicit.arg have_args.sh
|
||||
|
||||
# Any .h files that are needed to compile sample code.
|
||||
#
|
||||
@@ -1459,11 +1467,12 @@ CALC_STATIC_LIBS= libcalc.a libcustcalc.a
|
||||
|
||||
# Libaraies created and used to build calc
|
||||
#
|
||||
CALC_DYNAMIC_LIBS= libcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VERS}
|
||||
CALC_DYNAMIC_LIBS= libcalc${LIB_EXT_VERSION} libcustcalc${LIB_EXT_VERSION}
|
||||
|
||||
# Symlinks of dymanic shared libraries
|
||||
#
|
||||
SYM_DYNAMIC_LIBS= libcalc${LIB_EXT_VER} libcalc${LIB_EXT_VE} libcalc${LIB_EXT} \
|
||||
libcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VERSION} \
|
||||
libcustcalc${LIB_EXT_VERS} libcustcalc${LIB_EXT_VER} \
|
||||
libcustcalc${LIB_EXT_VE} libcustcalc${LIB_EXT}
|
||||
|
||||
@@ -1472,11 +1481,11 @@ SYM_DYNAMIC_LIBS= libcalc${LIB_EXT_VER} libcalc${LIB_EXT_VE} libcalc${LIB_EXT} \
|
||||
# NOTE: The ${SAMPLE_TARGETS} and ${SAMPLE_STATIC_TARGETS} are built but
|
||||
# not installed at this time.
|
||||
#
|
||||
# NOTE: There must be a foo-static${EXE} in SAMPLE_STATIC_TARGETS for
|
||||
# every foo${EXE} in ${SAMPLE_TARGETS}.
|
||||
# NOTE: There must be a foo-static${EXT} in SAMPLE_STATIC_TARGETS for
|
||||
# every foo${EXT} in ${SAMPLE_TARGETS}.
|
||||
#
|
||||
SAMPLE_TARGETS= sample_rand${EXE} sample_many${EXE}
|
||||
SAMPLE_STATIC_TARGETS= sample_rand-static${EXE} sample_many-static${EXE}
|
||||
SAMPLE_TARGETS= sample_rand${EXT} sample_many${EXT}
|
||||
SAMPLE_STATIC_TARGETS= sample_rand-static${EXT} sample_many-static${EXT}
|
||||
|
||||
# list of cscript programs to that need to be built to satisfy cscript/.all
|
||||
#
|
||||
@@ -1582,7 +1591,7 @@ calc-static-only: ${STATIC_FIRST_TARGETS} ${EARLY_TARGETS} \
|
||||
exit 3; \
|
||||
fi
|
||||
${Q} for i in .dynamic ${CALC_DYNAMIC_LIBS} ${SYM_DYNAMIC_LIBS} \
|
||||
custom/libcustcalc${LIB_EXT_VERS}; do \
|
||||
custom/libcustcalc${LIB_EXT_VERSION}; do \
|
||||
r="calc-static-only"; \
|
||||
if [ -e "$$i" ]; then \
|
||||
echo "Found the dynamic target $$i file. You must:" 1>&2; \
|
||||
@@ -1603,18 +1612,22 @@ calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
|
||||
${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
|
||||
${READLINE_LIB} -o $@
|
||||
|
||||
libcalc${LIB_EXT_VERS}: ${LIBOBJS} ver_calc${EXE} ${MAKE_FILE}
|
||||
${CC} ${LIBCALC_SHLIB} ${LIBOBJS} -o libcalc${LIB_EXT_VERS}
|
||||
libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}
|
||||
${CC} ${LIBCALC_SHLIB} ${LIBOBJS} -o libcalc${LIB_EXT_VERSION}
|
||||
|
||||
libcalc${LIB_EXT_VER}: libcalc${LIB_EXT_VERS}
|
||||
libcalc${LIB_EXT_VERS}: libcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcalc${LIB_EXT_VE}: libcalc${LIB_EXT_VERS}
|
||||
libcalc${LIB_EXT_VER}: libcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcalc${LIB_EXT}: libcalc${LIB_EXT_VERS}
|
||||
libcalc${LIB_EXT_VE}: libcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcalc${LIB_EXT}: libcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
@@ -1657,11 +1670,11 @@ calc.usage: calc.1 ${MAKE_FILE}
|
||||
|
||||
sample: ${SAMPLE_TARGETS}
|
||||
|
||||
sample_rand${EXE}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
|
||||
sample_rand${EXT}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
|
||||
${CC} sample_rand.o ${CLDFALGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
|
||||
${READLINE_LIB} -o $@
|
||||
|
||||
sample_many${EXE}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
|
||||
sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
|
||||
${CC} sample_many.o ${CLDFALGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
|
||||
${READLINE_LIB} -o $@
|
||||
|
||||
@@ -3008,6 +3021,7 @@ win32_hsrc: win32.mkdef ${MAKE_FILE}
|
||||
${RM} -f ${UTIL_MISC_SRC}; \
|
||||
${RM} -f ${UTIL_OBJS}; \
|
||||
${RM} -f ${UTIL_PROGS}; \
|
||||
${RM} -f ${UTIL_FILES}; \
|
||||
${RM} -f ${MAKE_FILE})
|
||||
${Q} echo 'win32 directory formed'
|
||||
|
||||
@@ -3081,26 +3095,30 @@ custom/.all: custom/Makefile
|
||||
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
custom/libcustcalc${LIB_EXT_VERS}: custom/Makefile
|
||||
custom/libcustcalc${LIB_EXT_VERSION}: custom/Makefile
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
|
||||
${V} echo '=-=-=-=-= Invoking all rule for custom =-=-=-=-='
|
||||
cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} $@
|
||||
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
libcustcalc${LIB_EXT_VERS}: custom/libcustcalc${LIB_EXT_VERS}
|
||||
libcustcalc${LIB_EXT_VERSION}: custom/libcustcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${CP} -p $? $@
|
||||
|
||||
libcustcalc${LIB_EXT_VER}: libcustcalc${LIB_EXT_VERS}
|
||||
libcustcalc${LIB_EXT_VERS}: custom/libcustcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcustcalc${LIB_EXT_VE}: libcustcalc${LIB_EXT_VERS}
|
||||
libcustcalc${LIB_EXT_VER}: libcustcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcustcalc${LIB_EXT}: libcustcalc${LIB_EXT_VERS}
|
||||
libcustcalc${LIB_EXT_VE}: libcustcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
libcustcalc${LIB_EXT}: libcustcalc${LIB_EXT_VERSION}
|
||||
${Q} ${RM} -f $@
|
||||
${LN} -s $? $@
|
||||
|
||||
@@ -3129,11 +3147,11 @@ libcalc.a: ${LIBOBJS} ${MAKE_FILE}
|
||||
custom/libcustcalc.a: custom/Makefile
|
||||
cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} libcustcalc.a
|
||||
|
||||
sample_rand-static${EXE}: sample_rand.o ${CALC_STATIC_LIBS} ${MAKE_FILE}
|
||||
sample_rand-static${EXT}: sample_rand.o ${CALC_STATIC_LIBS} ${MAKE_FILE}
|
||||
${CC} ${LDFLAGS} sample_rand.o ${LD_STATIC} \
|
||||
${CALC_STATIC_LIBS} ${READLINE_LIB} -o $@
|
||||
|
||||
sample_many-static${EXE}: sample_many.o ${CALC_STATIC_LIBS} ${MAKE_FILE}
|
||||
sample_many-static${EXT}: sample_many.o ${CALC_STATIC_LIBS} ${MAKE_FILE}
|
||||
${CC} ${LDFLAGS} sample_many.o ${LD_STATIC} \
|
||||
${CALC_STATIC_LIBS} ${READLINE_LIB} -o $@
|
||||
|
||||
@@ -3540,6 +3558,7 @@ env:
|
||||
@echo 'UTIL_C_SRC=${UTIL_C_SRC}'; echo ''
|
||||
@echo 'UTIL_MISC_SRC=${UTIL_MISC_SRC}'; echo ''
|
||||
@echo 'UTIL_OBJS=${UTIL_OBJS}'; echo ''
|
||||
@echo 'UTIL_FILES=${UTIL_FILES}'; echo ''
|
||||
@echo 'UTIL_PROGS=${UTIL_PROGS}'; echo ''
|
||||
@echo 'UTIL_TMP=${UTIL_TMP}'; echo ''
|
||||
@echo 'V=${V}'; echo ''
|
||||
@@ -3621,8 +3640,7 @@ gdb:
|
||||
|
||||
rpm: clobber rpm.mk calc.spec.in
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
|
||||
${RM} -rf /var/tmp/redhat /var/tmp/calc-root
|
||||
${MAKE} -f rpm.mk RHDIR=/var/tmp/redhat TMPDIR=/var/tmp/redhat V=${V}
|
||||
${MAKE} -f rpm.mk V=${V}
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
# rpm static rules
|
||||
@@ -3733,6 +3751,7 @@ clean: custom/Makefile
|
||||
${RM} -f ${UTIL_OBJS}
|
||||
${RM} -f ${UTIL_TMP}
|
||||
${RM} -f ${UTIL_PROGS}
|
||||
${RM} -f ${UTIL_FILES}
|
||||
${RM} -f ${SAMPLE_OBJ}
|
||||
${RM} -f .libcustcalc_error
|
||||
${RM} -f calc.spec.sed
|
||||
@@ -3772,16 +3791,18 @@ clobber: custom/Makefile clean
|
||||
${RM} -f calc.pixie calc.rf calc.Counts calc.cord
|
||||
${RM} -rf gen_h skel Makefile.bak tmp.patch
|
||||
${RM} -f calc.spec inst_files rpm.mk.patch tmp
|
||||
${RM} -f libcalc${LIB_EXT_VERSION}
|
||||
${RM} -f libcalc${LIB_EXT_VERS}
|
||||
${RM} -f libcalc${LIB_EXT_VER}
|
||||
${RM} -f libcalc${LIB_EXT_VE}
|
||||
${RM} -f libcalc*${LIB_EXT}
|
||||
${RM} -f libcustcalc${LIB_EXT_VERSION}
|
||||
${RM} -f libcustcalc${LIB_EXT_VERS}
|
||||
${RM} -f libcustcalc${LIB_EXT_VER}
|
||||
${RM} -f libcustcalc${LIB_EXT_VE}
|
||||
${RM} -f libcustcalc*${LIB_EXT}
|
||||
${RM} -f libcustcalc.a
|
||||
${RM} -f calc-static${EXE}
|
||||
${RM} -f calc-static${EXT}
|
||||
${RM} -f ${CALC_STATIC_LIBS}
|
||||
${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
|
||||
-cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} clobber
|
||||
@@ -3927,7 +3948,7 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
|
||||
${MV} -f ${T}${BINDIR}/calc.new${EXT} ${T}${BINDIR}/calc${EXT}; \
|
||||
echo "installed ${T}${BINDIR}/calc${EXT}"; \
|
||||
fi
|
||||
-${Q} if [ -f calc-static${EXE} ]; then \
|
||||
-${Q} if [ -f calc-static${EXT} ]; then \
|
||||
if ${CMP} -s calc-static${EXT} \
|
||||
${T}${BINDIR}/calc-static${EXT}; then \
|
||||
${TRUE}; \
|
||||
@@ -3965,43 +3986,49 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
|
||||
echo "installed ${T}${LIBDIR}/libcalc.a"; \
|
||||
fi; \
|
||||
fi
|
||||
${Q}# NOTE: The this makefile installs libcustcalc${LIB_EXT_VERS}
|
||||
${Q}# NOTE: The this makefile installs libcustcalc${LIB_EXT_VERSION}
|
||||
${Q}# because we only want to perform one ${LDCONFIG} for both
|
||||
${Q}# libcalc${LIB_EXT_VERS} and libcustcalc${LIB_EXT_VERS}.
|
||||
-${Q} if ${CMP} -s libcalc${LIB_EXT_VERS} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERS} && \
|
||||
${CMP} -s custom/libcustcalc${LIB_EXT_VERS} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}; then \
|
||||
${Q}# libcalc${LIB_EXT_VERSION} and libcustcalc${LIB_EXT_VERSION}.
|
||||
-${Q} if ${CMP} -s libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERSION} && \
|
||||
${CMP} -s custom/libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}; then \
|
||||
${TRUE}; \
|
||||
else \
|
||||
${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}.new; \
|
||||
${CP} -f libcalc${LIB_EXT_VERS} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERS}.new; \
|
||||
${MV} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}.new \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERS}; \
|
||||
${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new; \
|
||||
${CP} -f libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new; \
|
||||
${MV} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VERS}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VER}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT_VE}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcalc${LIB_EXT}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
|
||||
${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}.new; \
|
||||
${CP} -f custom/libcustcalc${LIB_EXT_VERS} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}.new; \
|
||||
${MV} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}.new \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}; \
|
||||
${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new; \
|
||||
${CP} -f custom/libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new; \
|
||||
${MV} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}; \
|
||||
echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}; \
|
||||
echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}; \
|
||||
echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERS} \
|
||||
${LN} -f -s libcustcalc${LIB_EXT_VERSION} \
|
||||
${T}${LIBDIR}/libcustcalc${LIB_EXT}; \
|
||||
echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
|
||||
if [ -z "${T}" -o "/" = "${T}" ]; then \
|
||||
@@ -4161,12 +4188,12 @@ uninstall: custom/Makefile
|
||||
echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
|
||||
fi; \
|
||||
fi
|
||||
-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \
|
||||
${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
|
||||
if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \
|
||||
echo "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
|
||||
-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \
|
||||
${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
|
||||
if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \
|
||||
echo "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
|
||||
else \
|
||||
echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
|
||||
echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
|
||||
fi; \
|
||||
fi
|
||||
-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT}" ]; then \
|
||||
@@ -4201,12 +4228,12 @@ uninstall: custom/Makefile
|
||||
echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
|
||||
fi; \
|
||||
fi
|
||||
-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \
|
||||
${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
|
||||
if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \
|
||||
echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
|
||||
-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \
|
||||
${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
|
||||
if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \
|
||||
echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
|
||||
else \
|
||||
echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
|
||||
echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
|
||||
fi; \
|
||||
fi
|
||||
-${Q} if [ -z "${T}" -o "/" = "${T}" ]; then \
|
||||
@@ -4272,6 +4299,20 @@ splint: #hsrc
|
||||
${SPLINT} ${SPLINT_OPTS} -DCALC_SRC -I. \
|
||||
${CALCSRC} ${LIBSRC} ${BUILD_C_SRC} ${UTIL_C_SRC}
|
||||
|
||||
# strip - for reducing the size of the binary files
|
||||
#
|
||||
strip:
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
|
||||
${Q} for i in ${UTIL_PROGS} ${SAMPLE_TARGETS} ${SAMPLE_STATIC_TARGETS} \
|
||||
calc${EXT} calc-static${EXT} ${CALC_DYNAMIC_LIBS} \
|
||||
${CALC_STATIC_LIBS}; do \
|
||||
if [ -s "$$i" -a -w "$$i" ]; then \
|
||||
${STRIP} "$$i"; \
|
||||
echo "stripped $$i"; \
|
||||
fi; \
|
||||
done
|
||||
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
###
|
||||
#
|
||||
# make depend stuff
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
# received a copy with calc; if not, write to Free Software Foundation, Inc.
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# @(#) $Revision: 30.4 $
|
||||
# @(#) $Id: calc.spec.in,v 30.4 2007/09/02 05:38:34 chongo Exp $
|
||||
# @(#) $Revision: 30.5 $
|
||||
# @(#) $Id: calc.spec.in,v 30.5 2007/09/06 06:13:46 chongo Exp $
|
||||
# @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.spec.in,v $
|
||||
#
|
||||
# Under source code control: 2003/02/16 20:21:39
|
||||
@@ -37,7 +37,7 @@
|
||||
Summary: Arbitrary precision calculator.
|
||||
Name: calc
|
||||
Version: <<<PROJECT_VERSION>>>
|
||||
Release: 1.0
|
||||
Release: 1.1
|
||||
License: LGPL
|
||||
Group: Applications/Engineering
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
@@ -86,7 +86,7 @@ echo '-=- calc.spec beginning make clobber (again) -=-'
|
||||
make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ clobber
|
||||
echo '-=- calc.spec ending make clobber (again) -=-'
|
||||
echo '-=- calc.spec beginning make calc-dynamic-only -=-'
|
||||
make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ calc-dynamic-only BLD_TYPE=calc-dynamic-only
|
||||
make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ calc-dynamic-only BLD_TYPE=calc-dynamic-only LD_SHARE=
|
||||
echo '-=- calc.spec ending make calc-dynamic-only -=-'
|
||||
echo '-=- calc.spec beginning make chk -=-'
|
||||
make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ chk
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
# received a copy with calc; if not, write to Free Software Foundation, Inc.
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# @(#) $Revision: 30.12 $
|
||||
# @(#) $Id: Makefile.head,v 30.12 2007/09/01 19:54:03 chongo Exp $
|
||||
# @(#) $Revision: 30.14 $
|
||||
# @(#) $Id: Makefile.head,v 30.14 2007/09/06 08:08:39 chongo Exp $
|
||||
# @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile.head,v $
|
||||
#
|
||||
# Under source code control: 1997/03/09 02:28:54
|
||||
@@ -63,14 +63,16 @@ CUSTOM_CALC_FILES= argv.cal halflen.cal pzasusb8.cal pmodm127.cal register.cal
|
||||
#
|
||||
CUSTOM_HELP= argv devnull help sysinfo pzasusb8 pmodm127 register
|
||||
|
||||
# Any .h files that are needed by programs that use libcustcalc${LIB_EXT_VERS}
|
||||
# Any .h files that are needed by programs that use
|
||||
# libcustcalc${LIB_EXT_VERSION}
|
||||
#
|
||||
# Put any .h files that you add which might be useful to other
|
||||
# programs here.
|
||||
#
|
||||
CUSTOM_H_SRC=
|
||||
|
||||
# Any .c files that are needed to build libcustcalc${LIB_EXT_VERS}.
|
||||
# Any .c files that are needed to build libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# Don't put ${REQUIRED_SRC} files in this list.
|
||||
#
|
||||
# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
|
||||
@@ -80,7 +82,9 @@ CUSTOM_H_SRC=
|
||||
CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c c_pzasusb8.c \
|
||||
c_pmodm127.c c_register.c
|
||||
|
||||
# Any .o files that are needed by program that use libcustcalc${LIB_EXT_VERS}.
|
||||
# Any .o files that are needed by program that use
|
||||
# libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# Don't put ${REQUIRED_OBJ} files in this list.
|
||||
#
|
||||
# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
|
||||
@@ -362,7 +366,7 @@ EXT=
|
||||
|
||||
# The default calc versions
|
||||
#
|
||||
VERSION= 2.12.2
|
||||
VERSION= 2.12.2.1
|
||||
VERS= 2.12.2
|
||||
VER= 2.12
|
||||
VE= 2
|
||||
@@ -370,6 +374,7 @@ VE= 2
|
||||
# Names of shared libraries with versions
|
||||
#
|
||||
LIB_EXT= .so
|
||||
LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}
|
||||
LIB_EXT_VERS= ${LIB_EXT}.${VERS}
|
||||
LIB_EXT_VER= ${LIB_EXT}.${VER}
|
||||
LIB_EXT_VE= ${LIB_EXT}.${VE}
|
||||
@@ -518,8 +523,8 @@ CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERS}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERS}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LD_STATIC=
|
||||
@@ -545,7 +550,7 @@ ifeq ($(target),Darwin)
|
||||
BLD_TYPE= calc-dynamic-only
|
||||
#
|
||||
CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/sw/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= ${DARWIN_ARCH}
|
||||
LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib
|
||||
LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib
|
||||
@@ -565,11 +570,14 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
|
||||
#
|
||||
# Darmin dynamic shared lib filenames
|
||||
LIB_EXT:= .dylib
|
||||
LIB_EXT_VERSION:= .${VERSION}${LIB_EXT}
|
||||
LIB_EXT_VERS:= .${VERS}${LIB_EXT}
|
||||
LIB_EXT_VER:= .${VER}${LIB_EXT}
|
||||
LIB_EXT_VE:= .${VE}${LIB_EXT}
|
||||
# compile Universal by default
|
||||
DARWIN_ARCH= -arch i386 -arch ppc
|
||||
# DARWIN_ARCH= -arch i386 -arch ppc # Universal binary
|
||||
# DARWIN_ARCH= -arch i386 # Intel binary
|
||||
# DARWIN_ARCH= -arch ppc # PPC binary
|
||||
DARWIN_ARCH= # native binary
|
||||
MACOSX_DEPLOYMENT_TARGET=10.4
|
||||
#
|
||||
endif
|
||||
@@ -592,8 +600,8 @@ CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERS}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERS}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LD_STATIC=
|
||||
@@ -612,6 +620,37 @@ MAKE= gmake
|
||||
#
|
||||
endif
|
||||
|
||||
######################
|
||||
# Sun Solaris target #
|
||||
######################
|
||||
|
||||
# XXX - this needs to be tested
|
||||
ifeq ($(target),solaris)
|
||||
#
|
||||
BLD_TYPE= calc-dynamic-only
|
||||
#
|
||||
CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LIBCALC_STATIC=
|
||||
LIBCUSTCALC_STATIC=
|
||||
LD_STATIC=
|
||||
#
|
||||
CCWARN= -Wall -W -Wno-comment
|
||||
CCWERR=
|
||||
CCOPT= ${DEBUG}
|
||||
CCMISC=
|
||||
#
|
||||
LCC= gcc
|
||||
CC= ${PURIFY} ${LCC} ${CCWERR}
|
||||
#
|
||||
endif
|
||||
|
||||
#######################################################
|
||||
# simple target - values used to form Makefile.simple #
|
||||
#######################################################
|
||||
@@ -628,8 +667,8 @@ CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERS}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERS}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LD_STATIC=
|
||||
@@ -675,8 +714,8 @@ CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERS}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERS}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LIBCALC_STATIC=
|
||||
@@ -730,14 +769,14 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
|
||||
##############################################################################
|
||||
|
||||
# These .c files are required for the main custom interface and
|
||||
# for the custom support functions for libcustcalc${LIB_EXT_VERS}.
|
||||
# for the custom support functions for libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# There MUST be a .c for every .o in REQUIRED_OBJ.
|
||||
#
|
||||
REQUIRED_SRC= custtbl.c
|
||||
|
||||
# These .o files correspond to the .c files in REQUIRED_SRC
|
||||
# for libcustcalc${LIB_EXT_VERS}.
|
||||
# for libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# There MUST be a .o for every .c in REQUIRED_SRC.
|
||||
#
|
||||
@@ -747,11 +786,11 @@ REQUIRED_OBJ= custtbl.o
|
||||
#
|
||||
INSTALL_H_SRC= ${CUSTOM_H_SRC}
|
||||
|
||||
# These .c files are used to form libcustcalc${LIB_EXT_VERS}.
|
||||
# These .c files are used to form libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
CUSTCALC_SRC= ${REQUIRED_SRC} ${CUSTOM_SRC}
|
||||
|
||||
# These .o files are used to form libcustcalc${LIB_EXT_VERS}.
|
||||
# These .o files are used to form libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
CUSTCALC_OBJ= ${REQUIRED_OBJ} ${CUSTOM_OBJ}
|
||||
|
||||
@@ -778,7 +817,7 @@ CALCLIBLIST= ${CUSTCALC_SRC} ${INSTALL_H_SRC} ${MAKE_FILE} HOW_TO_ADD
|
||||
|
||||
# This is the custom dynbamic shared library that is build
|
||||
#
|
||||
CALC_DYNAMIC_LIBCUSTCALC= libcustcalc${LIB_EXT_VERS}
|
||||
CALC_DYNAMIC_LIBCUSTCALC= libcustcalc${LIB_EXT_VERSION}
|
||||
|
||||
# This is the custom static library that is build
|
||||
#
|
||||
@@ -801,10 +840,10 @@ calc-dynamic-only: ${CUSTCALC_OBJ} ${CALC_DYNAMIC_LIBCUSTCALC}
|
||||
|
||||
calc-static-only: ${CUSTCALC_OBJ} ${CALC_STATIC_LIBCUSTCALC}
|
||||
|
||||
custom/libcustcalc${LIB_EXT_VERS}: libcustcalc${LIB_EXT_VERS} \
|
||||
custom/libcustcalc${LIB_EXT_VERSION}: libcustcalc${LIB_EXT_VERSION} \
|
||||
${CALC_STATIC_LIBCUSTCALC}
|
||||
|
||||
libcustcalc${LIB_EXT_VERS}: ${CUSTCALC_OBJ} ${MAKE_FILE}
|
||||
libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
|
||||
${CC} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@
|
||||
|
||||
##
|
||||
@@ -1014,6 +1053,7 @@ clean:
|
||||
clobber: clean
|
||||
${RM} -f ${BLD_TYPE}
|
||||
${RM} -f .all ${MAKE_FILE}.tmp ${MAKE_FILE}.bak
|
||||
${RM} -f libcustcalc${LIB_EXT_VERSION}
|
||||
${RM} -f libcustcalc${LIB_EXT_VERS}
|
||||
${RM} -f libcustcalc${LIB_EXT_VER}
|
||||
${RM} -f libcustcalc${LIB_EXT_VE}
|
||||
@@ -1173,9 +1213,10 @@ install: all
|
||||
fi; \
|
||||
fi; \
|
||||
fi
|
||||
${Q}# NOTE: The upper level makefile installs libcustcalc${LIB_EXT_VERS}
|
||||
${Q}# because we only want to perform one ${LDCONFIG} for both
|
||||
${Q}# libcalc${LIB_EXT_VERS} and libcustcalc${LIB_EXT_VERS}.
|
||||
${Q}# NOTE: The upper level makefile installs the file
|
||||
${Q}# libcustcalc${LIB_EXT_VERSION} because we only want to
|
||||
${Q}# perform one ${LDCONFIG} for both libcalc${LIB_EXT_VERSION}
|
||||
${Q}# and libcustcalc${LIB_EXT_VERSION}.
|
||||
|
||||
# Try to remove everything that was installed
|
||||
#
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
# received a copy with calc; if not, write to Free Software Foundation, Inc.
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# @(#) $Revision: 30.12 $
|
||||
# @(#) $Id: Makefile.head,v 30.12 2007/09/01 19:54:03 chongo Exp $
|
||||
# @(#) $Revision: 30.14 $
|
||||
# @(#) $Id: Makefile.head,v 30.14 2007/09/06 08:08:39 chongo Exp $
|
||||
# @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile.head,v $
|
||||
#
|
||||
# Under source code control: 1997/03/09 02:28:54
|
||||
@@ -63,14 +63,16 @@ CUSTOM_CALC_FILES= argv.cal halflen.cal pzasusb8.cal pmodm127.cal register.cal
|
||||
#
|
||||
CUSTOM_HELP= argv devnull help sysinfo pzasusb8 pmodm127 register
|
||||
|
||||
# Any .h files that are needed by programs that use libcustcalc${LIB_EXT_VERS}
|
||||
# Any .h files that are needed by programs that use
|
||||
# libcustcalc${LIB_EXT_VERSION}
|
||||
#
|
||||
# Put any .h files that you add which might be useful to other
|
||||
# programs here.
|
||||
#
|
||||
CUSTOM_H_SRC=
|
||||
|
||||
# Any .c files that are needed to build libcustcalc${LIB_EXT_VERS}.
|
||||
# Any .c files that are needed to build libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# Don't put ${REQUIRED_SRC} files in this list.
|
||||
#
|
||||
# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
|
||||
@@ -80,7 +82,9 @@ CUSTOM_H_SRC=
|
||||
CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c c_pzasusb8.c \
|
||||
c_pmodm127.c c_register.c
|
||||
|
||||
# Any .o files that are needed by program that use libcustcalc${LIB_EXT_VERS}.
|
||||
# Any .o files that are needed by program that use
|
||||
# libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# Don't put ${REQUIRED_OBJ} files in this list.
|
||||
#
|
||||
# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
|
||||
@@ -362,7 +366,7 @@ EXT=
|
||||
|
||||
# The default calc versions
|
||||
#
|
||||
VERSION= 2.12.2
|
||||
VERSION= 2.12.2.1
|
||||
VERS= 2.12.2
|
||||
VER= 2.12
|
||||
VE= 2
|
||||
@@ -370,6 +374,7 @@ VE= 2
|
||||
# Names of shared libraries with versions
|
||||
#
|
||||
LIB_EXT= .so
|
||||
LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}
|
||||
LIB_EXT_VERS= ${LIB_EXT}.${VERS}
|
||||
LIB_EXT_VER= ${LIB_EXT}.${VER}
|
||||
LIB_EXT_VE= ${LIB_EXT}.${VE}
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
# received a copy with calc; if not, write to Free Software Foundation, Inc.
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
# @(#) $Revision: 30.12 $
|
||||
# @(#) $Id: Makefile.head,v 30.12 2007/09/01 19:54:03 chongo Exp $
|
||||
# @(#) $Revision: 30.14 $
|
||||
# @(#) $Id: Makefile.head,v 30.14 2007/09/06 08:08:39 chongo Exp $
|
||||
# @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile.head,v $
|
||||
#
|
||||
# Under source code control: 1997/03/09 02:28:54
|
||||
@@ -48,14 +48,16 @@ CUSTOM_CALC_FILES= argv.cal halflen.cal pzasusb8.cal pmodm127.cal register.cal
|
||||
#
|
||||
CUSTOM_HELP= argv devnull help sysinfo pzasusb8 pmodm127 register
|
||||
|
||||
# Any .h files that are needed by programs that use libcustcalc${LIB_EXT_VERS}
|
||||
# Any .h files that are needed by programs that use
|
||||
# libcustcalc${LIB_EXT_VERSION}
|
||||
#
|
||||
# Put any .h files that you add which might be useful to other
|
||||
# programs here.
|
||||
#
|
||||
CUSTOM_H_SRC=
|
||||
|
||||
# Any .c files that are needed to build libcustcalc${LIB_EXT_VERS}.
|
||||
# Any .c files that are needed to build libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# Don't put ${REQUIRED_SRC} files in this list.
|
||||
#
|
||||
# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
|
||||
@@ -65,7 +67,9 @@ CUSTOM_H_SRC=
|
||||
CUSTOM_SRC= c_argv.c c_devnull.c c_help.c c_sysinfo.c c_pzasusb8.c \
|
||||
c_pmodm127.c c_register.c
|
||||
|
||||
# Any .o files that are needed by program that use libcustcalc${LIB_EXT_VERS}.
|
||||
# Any .o files that are needed by program that use
|
||||
# libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# Don't put ${REQUIRED_OBJ} files in this list.
|
||||
#
|
||||
# There MUST be a .c in CUSTOM_SRC for every .o in CUSTOM_OBJ.
|
||||
@@ -347,7 +351,7 @@ EXT=
|
||||
|
||||
# The default calc versions
|
||||
#
|
||||
VERSION= 2.12.2
|
||||
VERSION= 2.12.2.1
|
||||
VERS= 2.12.2
|
||||
VER= 2.12
|
||||
VE= 2
|
||||
@@ -355,6 +359,7 @@ VE= 2
|
||||
# Names of shared libraries with versions
|
||||
#
|
||||
LIB_EXT= .so
|
||||
LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}
|
||||
LIB_EXT_VERS= ${LIB_EXT}.${VERS}
|
||||
LIB_EXT_VER= ${LIB_EXT}.${VER}
|
||||
LIB_EXT_VE= ${LIB_EXT}.${VE}
|
||||
@@ -472,8 +477,8 @@ CC_SHARE= -fPIC
|
||||
DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
|
||||
LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
|
||||
"-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERS}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERS}"
|
||||
LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
|
||||
LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
|
||||
#
|
||||
CC_STATIC=
|
||||
LD_STATIC=
|
||||
@@ -511,14 +516,14 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
|
||||
##############################################################################
|
||||
|
||||
# These .c files are required for the main custom interface and
|
||||
# for the custom support functions for libcustcalc${LIB_EXT_VERS}.
|
||||
# for the custom support functions for libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# There MUST be a .c for every .o in REQUIRED_OBJ.
|
||||
#
|
||||
REQUIRED_SRC= custtbl.c
|
||||
|
||||
# These .o files correspond to the .c files in REQUIRED_SRC
|
||||
# for libcustcalc${LIB_EXT_VERS}.
|
||||
# for libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# There MUST be a .o for every .c in REQUIRED_SRC.
|
||||
#
|
||||
@@ -528,11 +533,11 @@ REQUIRED_OBJ= custtbl.o
|
||||
#
|
||||
INSTALL_H_SRC= ${CUSTOM_H_SRC}
|
||||
|
||||
# These .c files are used to form libcustcalc${LIB_EXT_VERS}.
|
||||
# These .c files are used to form libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
CUSTCALC_SRC= ${REQUIRED_SRC} ${CUSTOM_SRC}
|
||||
|
||||
# These .o files are used to form libcustcalc${LIB_EXT_VERS}.
|
||||
# These .o files are used to form libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
CUSTCALC_OBJ= ${REQUIRED_OBJ} ${CUSTOM_OBJ}
|
||||
|
||||
@@ -559,7 +564,7 @@ CALCLIBLIST= ${CUSTCALC_SRC} ${INSTALL_H_SRC} ${MAKE_FILE} HOW_TO_ADD
|
||||
|
||||
# This is the custom dynbamic shared library that is build
|
||||
#
|
||||
CALC_DYNAMIC_LIBCUSTCALC= libcustcalc${LIB_EXT_VERS}
|
||||
CALC_DYNAMIC_LIBCUSTCALC= libcustcalc${LIB_EXT_VERSION}
|
||||
|
||||
# This is the custom static library that is build
|
||||
#
|
||||
@@ -582,10 +587,10 @@ calc-dynamic-only: ${CUSTCALC_OBJ} ${CALC_DYNAMIC_LIBCUSTCALC}
|
||||
|
||||
calc-static-only: ${CUSTCALC_OBJ} ${CALC_STATIC_LIBCUSTCALC}
|
||||
|
||||
custom/libcustcalc${LIB_EXT_VERS}: libcustcalc${LIB_EXT_VERS} \
|
||||
custom/libcustcalc${LIB_EXT_VERSION}: libcustcalc${LIB_EXT_VERSION} \
|
||||
${CALC_STATIC_LIBCUSTCALC}
|
||||
|
||||
libcustcalc${LIB_EXT_VERS}: ${CUSTCALC_OBJ} ${MAKE_FILE}
|
||||
libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
|
||||
${CC} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@
|
||||
|
||||
##
|
||||
@@ -783,6 +788,7 @@ clean:
|
||||
clobber: clean
|
||||
${RM} -f ${BLD_TYPE}
|
||||
${RM} -f .all ${MAKE_FILE}.tmp ${MAKE_FILE}.bak
|
||||
${RM} -f libcustcalc${LIB_EXT_VERSION}
|
||||
${RM} -f libcustcalc${LIB_EXT_VERS}
|
||||
${RM} -f libcustcalc${LIB_EXT_VER}
|
||||
${RM} -f libcustcalc${LIB_EXT_VE}
|
||||
@@ -939,9 +945,10 @@ install: all
|
||||
fi; \
|
||||
fi; \
|
||||
fi
|
||||
${Q}# NOTE: The upper level makefile installs libcustcalc${LIB_EXT_VERS}
|
||||
${Q}# because we only want to perform one ${LDCONFIG} for both
|
||||
${Q}# libcalc${LIB_EXT_VERS} and libcustcalc${LIB_EXT_VERS}.
|
||||
${Q}# NOTE: The upper level makefile installs the file
|
||||
${Q}# libcustcalc${LIB_EXT_VERSION} because we only want to
|
||||
${Q}# perform one ${LDCONFIG} for both libcalc${LIB_EXT_VERSION}
|
||||
${Q}# and libcustcalc${LIB_EXT_VERSION}.
|
||||
|
||||
# Try to remove everything that was installed
|
||||
#
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
##############################################################################
|
||||
|
||||
# These .c files are required for the main custom interface and
|
||||
# for the custom support functions for libcustcalc${LIB_EXT_VERS}.
|
||||
# for the custom support functions for libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# There MUST be a .c for every .o in REQUIRED_OBJ.
|
||||
#
|
||||
REQUIRED_SRC= custtbl.c
|
||||
|
||||
# These .o files correspond to the .c files in REQUIRED_SRC
|
||||
# for libcustcalc${LIB_EXT_VERS}.
|
||||
# for libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
# There MUST be a .o for every .c in REQUIRED_SRC.
|
||||
#
|
||||
@@ -20,11 +20,11 @@ REQUIRED_OBJ= custtbl.o
|
||||
#
|
||||
INSTALL_H_SRC= ${CUSTOM_H_SRC}
|
||||
|
||||
# These .c files are used to form libcustcalc${LIB_EXT_VERS}.
|
||||
# These .c files are used to form libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
CUSTCALC_SRC= ${REQUIRED_SRC} ${CUSTOM_SRC}
|
||||
|
||||
# These .o files are used to form libcustcalc${LIB_EXT_VERS}.
|
||||
# These .o files are used to form libcustcalc${LIB_EXT_VERSION}.
|
||||
#
|
||||
CUSTCALC_OBJ= ${REQUIRED_OBJ} ${CUSTOM_OBJ}
|
||||
|
||||
@@ -51,7 +51,7 @@ CALCLIBLIST= ${CUSTCALC_SRC} ${INSTALL_H_SRC} ${MAKE_FILE} HOW_TO_ADD
|
||||
|
||||
# This is the custom dynbamic shared library that is build
|
||||
#
|
||||
CALC_DYNAMIC_LIBCUSTCALC= libcustcalc${LIB_EXT_VERS}
|
||||
CALC_DYNAMIC_LIBCUSTCALC= libcustcalc${LIB_EXT_VERSION}
|
||||
|
||||
# This is the custom static library that is build
|
||||
#
|
||||
@@ -74,10 +74,10 @@ calc-dynamic-only: ${CUSTCALC_OBJ} ${CALC_DYNAMIC_LIBCUSTCALC}
|
||||
|
||||
calc-static-only: ${CUSTCALC_OBJ} ${CALC_STATIC_LIBCUSTCALC}
|
||||
|
||||
custom/libcustcalc${LIB_EXT_VERS}: libcustcalc${LIB_EXT_VERS} \
|
||||
custom/libcustcalc${LIB_EXT_VERSION}: libcustcalc${LIB_EXT_VERSION} \
|
||||
${CALC_STATIC_LIBCUSTCALC}
|
||||
|
||||
libcustcalc${LIB_EXT_VERS}: ${CUSTCALC_OBJ} ${MAKE_FILE}
|
||||
libcustcalc${LIB_EXT_VERSION}: ${CUSTCALC_OBJ} ${MAKE_FILE}
|
||||
${CC} ${LIBCUSTCALC_SHLIB} ${CUSTCALC_OBJ} -o $@
|
||||
|
||||
##
|
||||
@@ -287,6 +287,7 @@ clean:
|
||||
clobber: clean
|
||||
${RM} -f ${BLD_TYPE}
|
||||
${RM} -f .all ${MAKE_FILE}.tmp ${MAKE_FILE}.bak
|
||||
${RM} -f libcustcalc${LIB_EXT_VERSION}
|
||||
${RM} -f libcustcalc${LIB_EXT_VERS}
|
||||
${RM} -f libcustcalc${LIB_EXT_VER}
|
||||
${RM} -f libcustcalc${LIB_EXT_VE}
|
||||
@@ -446,9 +447,10 @@ install: all
|
||||
fi; \
|
||||
fi; \
|
||||
fi
|
||||
${Q}# NOTE: The upper level makefile installs libcustcalc${LIB_EXT_VERS}
|
||||
${Q}# because we only want to perform one ${LDCONFIG} for both
|
||||
${Q}# libcalc${LIB_EXT_VERS} and libcustcalc${LIB_EXT_VERS}.
|
||||
${Q}# NOTE: The upper level makefile installs the file
|
||||
${Q}# libcustcalc${LIB_EXT_VERSION} because we only want to
|
||||
${Q}# perform one ${LDCONFIG} for both libcalc${LIB_EXT_VERSION}
|
||||
${Q}# and libcustcalc${LIB_EXT_VERSION}.
|
||||
|
||||
# Try to remove everything that was installed
|
||||
#
|
||||
|
||||
6
rpm.mk
6
rpm.mk
@@ -19,8 +19,8 @@
|
||||
# received a copy with calc; if not, write to Free Software Foundation, Inc.
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
MAKEFILE_REV= $$Revision: 30.2 $$
|
||||
# @(#) $Id: rpm.mk,v 30.2 2007/09/02 05:38:34 chongo Exp chongo $
|
||||
MAKEFILE_REV= $$Revision: 30.3 $$
|
||||
# @(#) $Id: rpm.mk,v 30.3 2007/09/02 09:30:11 chongo Exp $
|
||||
# @(#) $Source: /usr/local/src/cmd/calc/RCS/rpm.mk,v $
|
||||
#
|
||||
# Under source code control: 2003/02/16 20:21:39
|
||||
@@ -113,7 +113,7 @@ srcpkg: make_rhdir
|
||||
${V} echo '=-=-=-=-= rpm.mk start of $@ rule =-=-=-=-='
|
||||
${FIND} . -depth -print | \
|
||||
${EGREP} -v '/RCS|/CVS|/NOTES|/\.|\.out$$|\.safe$$' | \
|
||||
${EGREP} -v '/old[._-]|\.old$$|\.tar\.gz$$' | \
|
||||
${EGREP} -v '/old[._-]|\.old$$|\.tar\.gz$$|/ver_calc$$' | \
|
||||
LANG=C ${SORT} | \
|
||||
${CPIO} -dumpv "$(TMPDIR)/$(PROJECT)"
|
||||
(cd "$(TMPDIR)"; ${TAR} cf - "$(PROJECT)") | \
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
* received a copy with calc; if not, write to Free Software Foundation, Inc.
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
* @(#) $Revision: 30.3 $
|
||||
* @(#) $Id: version.c,v 30.3 2007/07/15 02:09:35 chongo Exp $
|
||||
* @(#) $Revision: 30.4 $
|
||||
* @(#) $Id: version.c,v 30.4 2007/09/06 06:14:11 chongo Exp $
|
||||
* @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
|
||||
*
|
||||
* Under source code control: 1990/05/22 11:00:58
|
||||
@@ -49,7 +49,7 @@ static char *program;
|
||||
#define MAJOR_VER 2 /* major library version */
|
||||
#define MINOR_VER 12 /* minor library version */
|
||||
#define MAJOR_PATCH 2 /* major software level under library version */
|
||||
#define MINOR_PATCH 0 /* minor software level or 0 if none */
|
||||
#define MINOR_PATCH 1 /* minor software level or 0 if none */
|
||||
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user