Rework DSO support

This reworks the DSO support in HylaFAX slightly, bringing improvements:

1) libraries have the form:
   libhylafax-${ABI_VERSION}.so.${API_PATCH}
   We've never made any attempt at having a stable ABI, even though we
   callied it "libfaxutil.so".  This makes it explicit.

2) libfaxserver is not longer built as a DSO.
   It actually took more room to have libfaxserver.so + binaries then the
   plain binaries by them self, mainly do to the fact that almost all of
   code in libfaxserver is *not* shared, and has larger representation in
   the shared object then directly in the single binary.

3) The make/configure/defs interaction is more straight forward.

diff --git a/Makefile.in b/Makefile.in
index 03f466d65b99bac50d80132e5b003ec481efe958..0b15e35f4a7b28e6754a915ec5a5bc8dca7dd3e6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,7 @@ DIRS= libhylafax \
        config \
        etc \
        man
-DSODIRS        = faxd libhylafax
+DSODIRS        = libhylafax
 
 TARGETS=hylafax
 

diff --git a/config.site b/config.site
index 7451e2fd5519212dd5c4c390b73ed8def788fd20..6b1ecbd798ba92311baeca3400deb2b00feccfc7 100644 (file)
--- a/config.site
+++ b/config.site
@@ -56,7 +56,7 @@
 # Directory parameters.
 #
 #DIR_BIN="/usr/local/bin"              # directory for client apps
-#DIR_LIB="/usr/local/lib"              # directory for libhylafax, libfaxserver
+#DIR_LIB="/usr/local/lib"              # directory for libhylafax
 #DIR_LIBDATA="/usr/lib/fax"            # directory for client data
 #DIR_LIBEXEC="/usr/lib/fax"            # directory for libraries&hidden apps
 #DIR_MAN="/usr/local/man"              # directory for manual pages

diff --git a/configure b/configure
index 7065675702b306352403bb2552107004bb46a1c6..60a4dcd448cc38f1ae32079d03ced58f83d8ed4f 100755 (executable)
--- a/configure
+++ b/configure
@@ -83,8 +83,6 @@ REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
 DBLIB=no
 LIBDB="-L/usr/local/lib -ldb"
 DBLIBINC=/usr/local/include
-LIBFAXSERVER='libfaxserver.${DSO}'
-LIBUTIL='${UTIL}/libhylafax.${DSO}'
 CONFIG_OSFCNH=auto
 MANNUM4_5=4F
 MANNUM1_8=1M
@@ -105,6 +103,8 @@ RM="rm -f"
 #
 VAR1="ANSICPP
 ANSICXXPP
+ABI_VERSION
+ABI_PATCH
 AR
 AROPTS
 AWK
@@ -143,7 +143,6 @@ ECHO
 ENABLE_NLS
 ENCODING
 ENVOPTS
-FAXD
 FAXGID
 FAXUID
 FAXQ_SERVER
@@ -167,11 +166,9 @@ INSTALL
 LIBDATA                DIR_LIBDATA
 LIBDIR         DIR_LIB
 LIBEXEC                DIR_LIBEXEC
-LIBFAXSERVER
 LIBPORT
 LIBREGEX
 LIBTIFF
-LIBUTIL
 LIBZ
 LIBDB
 LLDOPTS
@@ -463,12 +460,19 @@ exec 5>./config.log                       # compiler messages and the like
 
 DATE=`date`
 
-eval `cat $SRCDIR/VERSION | sed 's/\([0-9][0-9]*\)\.\([0-9][0-9]*\)\(.*\)/DIST_MAJOR=\1; DIST_MINOR=\2; DIST_TYPE=\3/'`
+eval `cat $SRCDIR/VERSION | sed 's/\([0-9][0-9]*\)\.\([0-9][0-9]*\)[.-]\([0-9]*\)\(.*\)/DIST_MAJOR=\1; DIST_MINOR=\2; DIST_PATCH=\3; DIST_TYPE=\4/'`
 DIST_ALPHA=`awk '{print $3}' $SRCDIR/dist/hylafax.alpha`
-VERSION="${DIST_MAJOR}.${DIST_MINOR}${DIST_TYPE}"
+VERSION="${DIST_MAJOR}.${DIST_MINOR}.${DIST_PATCH}${DIST_TYPE}"
 if [ "$DIST_TYPE" = beta ]; then
     VERSION="${VERSION}${DIST_ALPHA}"
 fi
+ABI_VERSION="${DIST_MAJOR}.${DIST_MINOR}"
+if [ -n "$DIST_PATCH" ]
+then
+        ABI_PATCH="${DIST_PATCH}"
+else
+        ABI_PATCH="0"
+fi
 
 Note()
 {
@@ -3431,10 +3435,8 @@ if [ "$DSO" = auto ]; then
            USE_RPATH=''
        fi
        DSOSUF=so
-       LIBUTIL=''
-       LIBFAXSERVER='-lfaxserver'
        DSOOPTS='-shared -fpic -Wl,-soname,$@'
-       LLDOPTS='-L${UTIL} -L${FAXD} -lhylafax'$USE_RPATH
+       LLDOPTS=$USE_RPATH
        GCOPTS="${GCOPTS} -fpic"
        GCXXOPTS="${GCXXOPTS} -fpic"
        DSO=LINUX
@@ -3464,21 +3466,18 @@ if [ "$DSO" = auto ]; then
            USE_RPATH=''
        fi
        DSOSUF=so
-       LIBUTIL=''
-       LIBFAXSERVER='-L${FAXD} -lfaxserver'
        # options here are passed directly to ld, not through g++ first
        if [ ${ISGCC} = "yes" ] ; then
            DSOOPTS='-shared -Wl,-G,-h,$@'
-           LLDOPTS='-L${UTIL} -L${FAXD} -R${LIBDIR} -lhylafax -lstdc++'
+           LLDOPTS="$USE_RPATH -lstdc++"
            GCOPTS="${GCOPTS} -fpic"
            GCXXOPTS="${GCXXOPTS} -fpic"
        else
            DSOOPTS='-G -h $@'
-           LLDOPTS='-L${UTIL} -L${FAXD} -R${LIBDIR} -lhylafax -lCrun'
+           LLDOPTS='-L${UTIL} -R${LIBDIR} -lhylafax-${ABI_VERSION} -lCrun'
            GCOPTS="${GCOPTS} -Kpic"
            GCXXOPTS="${GCXXOPTS} -Kpic"
        fi
-       #LLDOPTS='-L${UTIL} -L${FAXD} -R${LIBDIR} -lhylafax'
        DSO=SOLARIS
        CheckCCDSO()
        {

diff --git a/debian/hylafax-client.install b/debian/hylafax-client.install
index 5c957d95b3883dd2e065f35a9a5fda706d9505b3..e1d445586ab5e0838945f3cf82d8991914ac6a86 100644 (file)
--- a/debian/hylafax-client.install
+++ b/debian/hylafax-client.install
@@ -1 +1 @@
-util/libhylafax.so*    usr/lib/hylafax
+libhylafax/libhylafax-*.so*    usr/lib/hylafax

diff --git a/debian/hylafax-server.install b/debian/hylafax-server.install
deleted file mode 100644 (file)
index 2e2dc9c..0000000
--- a/debian/hylafax-server.install
+++ /dev/null
@@ -1 +0,0 @@
-faxd/libfaxserver.so*  usr/lib/hylafax

diff --git a/defs.in b/defs.in
index 65f9114f581c5626bb9dd979a59bfcdd1710e9b1..05691a106640ec55013c61edb49a3267b13e5738 100644 (file)
--- a/defs.in
+++ b/defs.in
@@ -38,6 +38,10 @@
 @SETMAKE@
 MAKEFILE       = Makefile
 SHELL          = @SCRIPT_SH@
+VERSION         = @VERSION@
+
+ABI_VERSION      = @ABI_VERSION@
+ABI_PATCH        = @ABI_PATCH@
 #
 # Directory locations setup at configuration time.
 # Note that changing these parameters here is likely
@@ -133,8 +137,8 @@ CVERSION    = @ENVOPTS@
 C++FILE                = @CXXFILE@
 
 # default definitions for programs--overide them as desired
-LIBS           = ${LIBUTIL}
-LLDLIBS                = ${LIBS} @PAMLIBS@ @LIBJBIG@ ${LIBTIFF} ${LIBZ} ${LIBREGEX} ${LIBPORT} ${MACHDEPLIBS}
+LIBS           = ${UTIL}/libhylafax-${ABI_VERSION}.${DSO}
+LLDLIBS                = -L${UTIL} -lhylafax-${ABI_VERSION} @PAMLIBS@ @LIBJBIG@ ${LIBTIFF} ${LIBZ} ${LIBREGEX} ${LIBPORT} ${MACHDEPLIBS}
 #
 # Override this definition to eliminate shared library use.
 #
@@ -191,8 +195,6 @@ LIBREGEX    = @LIBREGEX@
 # random utility functions and classes
 UTIL           = ${DEPTH}/libhylafax
 FAXD           = ${DEPTH}/faxd
-LIBFAXSERVER   = @LIBFAXSERVER@
-LIBUTIL                = @LIBUTIL@
 LIBPORT                = @LIBPORT@
 
 #

diff --git a/faxd/Makefile.IRIXdso b/faxd/Makefile.IRIXdso
deleted file mode 100644 (file)
index 6b7573e..0000000
--- a/faxd/Makefile.IRIXdso
+++ /dev/null
@@ -1,43 +0,0 @@
-#      $Id$
-#
-# HylaFAX Facsimile Software
-#
-# Copyright (c) 1990-1996 Sam Leffler
-# Copyright (c) 1991-1996 Silicon Graphics, Inc.
-# HylaFAX is a trademark of Silicon Graphics
-# 
-# Permission to use, copy, modify, distribute, and sell this software and 
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-# 
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-# 
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-# OF THIS SOFTWARE.
-#
-
-#
-# DSO-specific rules for the faxd directory.
-#
-LDIRT  += libfaxserver.a
-
-libfaxserver.${DSO}: ${SERVER_OBJS} ${MODEM_OBJS}
-       ${C++} ${DSOOPTS} -o libfaxserver.${DSO} \
-           ${SERVER_OBJS} ${MODEM_OBJS} ${LLDLIBS}
-
-installDSO: libfaxserver.${DSO}
-       ${PUTSERV} -F ${LIBEXEC} -m 444 -O libfaxserver.${DSO}
-
-cleanDSO::
-       -${RM} -f libfaxserver.${DSO}
-

diff --git a/faxd/Makefile.LINUXdso b/faxd/Makefile.LINUXdso
deleted file mode 100644 (file)
index 40882fb..0000000
--- a/faxd/Makefile.LINUXdso
+++ /dev/null
@@ -1,46 +0,0 @@
-#      $Id$
-#
-# HylaFAX Facsimile Software
-#
-# Copyright (c) 1990-1996 Sam Leffler
-# Copyright (c) 1991-1996 Silicon Graphics, Inc.
-# HylaFAX is a trademark of Silicon Graphics
-# 
-# Permission to use, copy, modify, distribute, and sell this software and 
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-# 
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-# 
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-# OF THIS SOFTWARE.
-#
-
-#
-# DSO-specific rules for the faxd directory.
-#
-LDIRT  += libfaxserver.a
-
-libfaxserver.${DSO}: ${SERVER_OBJS} ${MODEM_OBJS}
-       ${C++} ${DSOOPTS} -o libfaxserver.${DSO}.${LIBVERSION} \
-           ${SERVER_OBJS} ${MODEM_OBJS} ${LLDLIBS}
-       ln -sf libfaxserver.${DSO}.${LIBVERSION} libfaxserver.${DSO}
-
-installDSO: libfaxserver.${DSO}
-       ${PUTSERV} -F ${LIBDIR} -m 755 -O libfaxserver.${DSO}.${LIBVERSION}
-       ${PUTSERV} -F ${LIBDIR} -O -lns libfaxserver.${DSO}.${LIBVERSION} libfaxserver.${DSO}
-
-
-cleanDSO::
-       -${RM} -f libfaxserver.${DSO}.${LIBVERSION}
-

diff --git a/faxd/Makefile.SOLARISdso b/faxd/Makefile.SOLARISdso
deleted file mode 100644 (file)
index 36b076b..0000000
--- a/faxd/Makefile.SOLARISdso
+++ /dev/null
@@ -1,45 +0,0 @@
-#      $Id$
-#
-# HylaFAX Facsimile Software
-#
-# Copyright (c) 1990-1996 Sam Leffler
-# Copyright (c) 1991-1996 Silicon Graphics, Inc.
-# HylaFAX is a trademark of Silicon Graphics
-# 
-# Permission to use, copy, modify, distribute, and sell this software and 
-# its documentation for any purpose is hereby granted without fee, provided
-# that (i) the above copyright notices and this permission notice appear in
-# all copies of the software and related documentation, and (ii) the names of
-# Sam Leffler and Silicon Graphics may not be used in any advertising or
-# publicity relating to the software without the specific, prior written
-# permission of Sam Leffler and Silicon Graphics.
-# 
-# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-# 
-# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-# OF THIS SOFTWARE.
-#
-
-#
-# DSO-specific rules for the faxd directory.
-#
-LDIRT  += libfaxserver.a
-
-libfaxserver.${DSO}: ${SERVER_OBJS} ${MODEM_OBJS}
-       ${C++} ${DSOOPTS} -o libfaxserver.${DSO}.${LIBVERSION} \
-           ${SERVER_OBJS} ${MODEM_OBJS} ${LLDLIBS}
-       ln -sf libfaxserver.${DSO}.${LIBVERSION} libfaxserver.${DSO}
-
-installDSO: libfaxserver.${DSO}
-       ${PUTSERV} -F ${LIBDIR} -m 755 -O libfaxserver.${DSO}.${LIBVERSION}
-       (cd ${LIBDIR}; ln -sf libfaxserver.${DSO}.${LIBVERSION} libfaxserver.${DSO})
-
-cleanDSO::
-       -${RM} -f libfaxserver.${DSO}.${LIBVERSION} libfaxserver.${DSO}
-

diff --git a/faxd/Makefile.in b/faxd/Makefile.in
index 8c476861fb1f35bb81adb3863d29c4ad55f89aab..939c414a324783a271034d48a2fea184403ea7f9 100644 (file)
--- a/faxd/Makefile.in
+++ b/faxd/Makefile.in
@@ -154,7 +154,7 @@ FAXQOBJS=JobControl.o \
 FAXSENDOBJS=  faxSendApp.o
 FAXQCLEANOBJS=faxQCleanApp.o
 FAXGETTYOBJS= Getty.o Getty@GETTY@.o faxGettyApp.o
-TARGETS=libfaxserver.${DSO} \
+TARGETS=libfaxserver.a \
        faxq faxsend faxgetty pagesend faxqclean \
        tsitest tagtest cqtest choptest
 
@@ -166,13 +166,14 @@ targets: $(TARGETS)
 
 @MAKEINCLUDE@ @MAKELQUOTE@${COMMONRULES}@MAKERQUOTE@
 
+
+LIBFAXSERVER=-L. -lfaxserver
+
 libfaxserver.a: ${SERVER_OBJS} ${MODEM_OBJS}
        ${AR} ${AROPTS} libfaxserver.a $?
        ${RANLIB} libfaxserver.a
 
-@MAKEDSOINCLUDE@ @MAKELQUOTE@${SRCDIR}/Makefile.@DSO@dso@MAKERQUOTE@
-
-LDIRT  = hash.h mkhash
+LDIRT  = hash.h mkhash libfaxserver*
 
 hash.h:        mkhash
        rm -f hash.h; ./mkhash > hash.h
@@ -182,29 +183,29 @@ mkhash:   ${SRCDIR}/mkhash.c
 faxQueueApp.o FaxRecv.o:
 incdepend: hash.h
 
-faxq:  ${FAXQOBJS} libfaxserver.${DSO} ${LIBS}
+faxq:  ${FAXQOBJS} libfaxserver.a ${LIBS}
        ${C++F} -o $@ ${FAXQOBJS} ${LIBFAXSERVER} ${LDFLAGS}
-faxsend: ${FAXSENDOBJS} libfaxserver.${DSO} ${LIBS}
+faxsend: ${FAXSENDOBJS} libfaxserver.a ${LIBS}
        ${C++F} -o $@ ${FAXSENDOBJS} ${LIBFAXSERVER} ${LDFLAGS}
-faxgetty: ${FAXGETTYOBJS} libfaxserver.${DSO} ${LIBS}
+faxgetty: ${FAXGETTYOBJS} libfaxserver.a ${LIBS}
        ${C++F} -o $@ ${FAXGETTYOBJS} ${LIBFAXSERVER} ${LDFLAGS}
-faxqclean: ${FAXQCLEANOBJS} libfaxserver.${DSO} ${LIBS}
+faxqclean: ${FAXQCLEANOBJS} libfaxserver.a ${LIBS}
        ${C++F} -o $@ ${FAXQCLEANOBJS} ${LIBFAXSERVER} ${LDFLAGS}
 
 PAGESENDOBJS=\
        pageSendApp.o
-pagesend:${PAGESENDOBJS} libfaxserver.${DSO} ${LIBS}
+pagesend:${PAGESENDOBJS} libfaxserver.a ${LIBS}
        ${C++F} -o $@ ${PAGESENDOBJS} ${LIBFAXSERVER} ${LDFLAGS}
 
-tagtest: tagtest.o libfaxserver.${DSO} ${LIBS}
+tagtest: tagtest.o libfaxserver.a ${LIBS}
        ${C++F} -o $@ tagtest.o ${LIBFAXSERVER} ${LDFLAGS}
-cqtest:        cqtest.o libfaxserver.${DSO} ${LIBS}
+cqtest:        cqtest.o libfaxserver.a ${LIBS}
        ${C++F} -o $@ cqtest.o ${LIBFAXSERVER} ${LDFLAGS}
-choptest: choptest.o libfaxserver.${DSO} ${LIBS}
+choptest: choptest.o libfaxserver.a ${LIBS}
        ${C++F} -o $@ choptest.o ${LIBFAXSERVER} ${LDFLAGS}
-tsitest: tsitest.o libfaxserver.${DSO} ${LIBS}
+tsitest: tsitest.o libfaxserver.a ${LIBS}
        ${C++F} -o $@ tsitest.o ${LIBFAXSERVER} ${LDFLAGS}
-trigtest: trigtest.o libfaxserver.${DSO} ${LIBS}
+trigtest: trigtest.o libfaxserver.a ${LIBS}
        ${C++F} -o $@ trigtest.o ${LIBFAXSERVER} ${LDFLAGS}
 
 PUTSERV=${INSTALL} -idb ${PRODUCT}.sw.server

diff --git a/libhylafax/Makefile.LINUXdso b/libhylafax/Makefile.LINUXdso
index 7c8d77f243315fcd803b9674258f30e3d408c6ff..a3d8d01b785c2a7bde4aeee86fba64a448c23f43 100644 (file)
--- a/libhylafax/Makefile.LINUXdso
+++ b/libhylafax/Makefile.LINUXdso
@@ -30,18 +30,19 @@
 # DSO-specific rules for the util directory.
 #
 
-libhylafax.${DSO}: ${OBJECTS}
-       ${C++} ${DSOOPTS} -o libhylafax.${DSO}.${LIBVERSION} ${OBJECTS} \
+libhylafax-${ABI_VERSION}.${DSO}: libhylafax-${ABI_VERSION}.${DSO}.${ABI_PATCH}
+       ln -sf $< $@
+
+libhylafax-${ABI_VERSION}.${DSO}.${ABI_PATCH}: ${OBJECTS}
+       ${C++} ${DSOOPTS} -o $@ ${OBJECTS} \
            ${DSODELAY} ${LIBTIFF} ${DSODELAY} ${LIBZ} ${DSODELAY} ${LIBREGEX} \
            ${MACHDEPLIBS}
-       ln -sf libhylafax.${DSO}.${LIBVERSION} libhylafax.${DSO}
-
-../util/libhylafax.${DSO}: libhylafax.${DSO}
 
-installDSO: libhylafax.${DSO}
-       ${PUTCLIENT} -F ${LIBDIR} -m 755 -O libhylafax.${DSO}.${LIBVERSION}
-       ${PUTCLIENT} -F ${LIBDIR} -O -lns libhylafax.${DSO}.${LIBVERSION} libhylafax.${DSO}
+#../util/libhylafax-${ABI_VERSION}.${DSO}: libhylafax-${ABI_VERSION}.${DSO}
 
+installDSO: libhylafax-${ABI_VERSION}.${DSO}.${ABI_PATCH}
+       ${PUTCLIENT} -F ${LIBDIR} -m 755 -O libhylafax-${ABI_VERSION}.${DSO}.${ABI_PATCH}
+       #${PUTCLIENT} -F ${LIBDIR} -O -lns libhylafax-${ABI_VERSION}.${DSO}.${ABI_PATCH} libhylafax-${ABI_VERSION}.${DSO}
 
 cleanDSO::
-       -${RM} -f libhylafax.${DSO}.${LIBVERSION}
+       -${RM} -f libhylafax-${ABI_VERSION}.${DSO}.${ABI_PATCH}

diff --git a/libhylafax/Makefile.SOLARISdso b/libhylafax/Makefile.SOLARISdso
index 5bbcbeebad40199cc0289cf41a60928878c90ccb..0b6898529372753e43dc88e16df9204f14061251 100644 (file)
--- a/libhylafax/Makefile.SOLARISdso
+++ b/libhylafax/Makefile.SOLARISdso
@@ -30,15 +30,15 @@
 # DSO-specific rules for the util directory.
 #
 
-libhylafax.${DSO}: ${OBJECTS}
-       ${C++} ${DSOOPTS} -o libhylafax.${DSO}.${LIBVERSION} ${OBJECTS}
-       ln -fs libhylafax.${DSO}.${LIBVERSION} libhylafax.${DSO}
+libhylafaxutil.${DSO}: ${OBJECTS}
+       ${C++} ${DSOOPTS} -o libhylafaxutil.${DSO}.${LIBVERSION} ${OBJECTS}
+       ln -fs libhylafaxutil.${DSO}.${LIBVERSION} libhylafaxutil.${DSO}
 
-../util/libhylafax.${DSO}: libhylafax.${DSO}
+../util/libhylafaxutil.${DSO}: libhylafaxutil.${DSO}
 
-installDSO: libhylafax.${DSO}
-       ${PUTCLIENT} -F ${LIBDIR} -m 755 -O libhylafax.${DSO}.${LIBVERSION}
-       (cd ${LIBDIR}; ln -fs libhylafax.${DSO}.${LIBVERSION} libhylafax.${DSO})
+installDSO: libhylafaxutil.${DSO}
+       ${PUTCLIENT} -F ${LIBDIR} -m 755 -O libhylafaxutil.${DSO}.${LIBVERSION}
+       (cd ${LIBDIR}; ln -fs libhylafaxutil.${DSO}.${LIBVERSION} libhylafaxutil.${DSO})
 
 cleanDSO::
        -${RM} -f libhylafax.${DSO}.${LIBVERSION} libhylafax.${DSO}

diff --git a/libhylafax/Makefile.in b/libhylafax/Makefile.in
index b0065f06e419a96a7ab4734da8f484189190212a..1c5ca1e155d115f1651c062cf395de43fe8c0bb9 100644 (file)
--- a/libhylafax/Makefile.in
+++ b/libhylafax/Makefile.in
@@ -58,7 +58,7 @@ C++FILES=Array.c++ \
 
 CFILES= cvtfacility.c fxassert.c
 
-TARGETS=libhylafax.${DSO}
+TARGETS=libhylafax-${ABI_VERSION}.${DSO}
 
 default all::
        @${MAKE} incdepend
@@ -68,13 +68,13 @@ targets: $(TARGETS)
 
 @MAKEINCLUDE@ @MAKELQUOTE@${COMMONRULES}@MAKERQUOTE@
 
-libhylafax.a: ${OBJECTS}
+libhylafax-${ABI_VERSION}.a: ${OBJECTS}
        @rm -f $@;
        @echo "${AR} ${AROPTS} $@ ${OBJECTS}"; \
            ${AR} ${AROPTS} $@ ${OBJECTS} ${C++FILT}
        ${RANLIB} $@
 
-../libhylafax/libhylafax.a: libhylafax.a
+../libhylafax/libhylafax-${ABI_VERSION}.a: libhylafax-${ABI_VERSION}.a
 
 PUTCLIENT      = ${INSTALL} -idb ${PRODUCT}.sw.client
 

diff --git a/port/irix/so_locations b/port/irix/so_locations
index 643c90227146128fff4dfd61d52876d8226fb321..705d32623e1ed135825a71164e7bf9e3573a33b4 100644 (file)
--- a/port/irix/so_locations
+++ b/port/irix/so_locations
@@ -17,6 +17,6 @@ libz.so \
 libhylafax.so \
                :st = .text 0x5ff60000, 0x00070000:\
                :st = .data 0x5ffd0000, 0x00010000:
-libfaxserver.so \
+libhylafaxserver.so \
                :st = .text 0x5ff00000, 0x00050000:\
                :st = .data 0x5ff50000, 0x00010000:

diff --git a/util/Makefile.in b/util/Makefile.in
index 4900d6d15d4d9035c9d5ef81d30a377e52d4f2e8..5273bb62dff23f80148f8345471a25d8078ffb35 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -39,7 +39,6 @@
 DEPTH=..
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@
 
-LIBVERSION     = @VERSION@
 SRCDIR = ${DEPTH}/${TOPSRCDIR}/util
 VPATH  = ../@SRCDIR@/util