mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Library version definition fixes

merge-requests/1/head
Mattias Ellert 2008-02-20 00:37:10 +00:00
rodzic 2781ca398a
commit d9e30e41a0
3 zmienionych plików z 7 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -1,3 +1,7 @@
2008-02-20 Mattias Ellert <mattias.ellert@tsl.uu.se>
* backend/Makefile.in, ltmain.sh: Library version definition fixes
* backend/coolscan3.c: Fix format warnings
2008-02-18 Alessandro Zummo <a.zummo@towertech.it> 2008-02-18 Alessandro Zummo <a.zummo@towertech.it>
* backend/coolscan3.c: added new coolscan3 backend * backend/coolscan3.c: added new coolscan3 backend
with improved stability and infrared support. with improved stability and infrared support.

4
backend/Makefile.in
Wyświetl plik

@ -214,7 +214,7 @@ DISTFILES = Makefile.in saned.conf.in sane_strstatus.c stubs.c \
libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS) libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
@$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \ @$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
$(LDFLAGS) $(BACKENDLIBS) $^ @LIBTOOL_LINK_EXTRA@ -rpath $(libsanedir) \ $(LDFLAGS) $(BACKENDLIBS) $^ @LIBTOOL_LINK_EXTRA@ -rpath $(libsanedir) \
-version-info $(V_MAJOR):$(V_REV):$(V_MINOR) $(DYNAMIC_FLAG) -version-number $(V_MAJOR):$(V_MINOR):$(V_REV) $(DYNAMIC_FLAG)
%-s.lo: %-s.c %-s.lo: %-s.c
@$(LIBTOOL) $(MCOMP) $(COMPILE) -DSTUBS -DBACKEND_NAME=$* $< @$(LIBTOOL) $(MCOMP) $(COMPILE) -DSTUBS -DBACKEND_NAME=$* $<
@ -321,7 +321,7 @@ dll-preload.c:
libsane.la: dll.lo dll-s.lo $(EXTRA) $(addsuffix .lo,$(DLL_PRELOAD)) $(LIBOBJS) libsane.la: dll.lo dll-s.lo $(EXTRA) $(addsuffix .lo,$(DLL_PRELOAD)) $(LIBOBJS)
@$(LIBTOOL) $(MLINK) $(CC) -o $@ $(LDFLAGS) $(BACKENDLIBS) $^ \ @$(LIBTOOL) $(MLINK) $(CC) -o $@ $(LDFLAGS) $(BACKENDLIBS) $^ \
$(addsuffix .lo,$(DLL_PRELOAD_EXTRAS)) @LIBTOOL_LINK_EXTRA@ \ $(addsuffix .lo,$(DLL_PRELOAD_EXTRAS)) @LIBTOOL_LINK_EXTRA@ \
-rpath $(libdir) -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) -rpath $(libdir) -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
# Generate .conf files for all existing .conf.in files # Generate .conf files for all existing .conf.in files
becfg: $(patsubst %.conf.in,%.conf,$(wildcard *.conf.in)) becfg: $(patsubst %.conf.in,%.conf,$(wildcard *.conf.in))

7
ltmain.sh
Wyświetl plik

@ -27,7 +27,6 @@
# Local changes for sane-backends (search for "Local change"): # Local changes for sane-backends (search for "Local change"):
# 2003-04-30: Henning Meier-Geinitz # 2003-04-30: Henning Meier-Geinitz
# * soname changed to "libsane" for every backend (all systems but AIX) # * soname changed to "libsane" for every backend (all systems but AIX)
# * fix version number for Irix
basename="s,^.*/,,g" basename="s,^.*/,,g"
@ -3277,11 +3276,7 @@ EOF
;; ;;
irix | nonstopux) irix | nonstopux)
# Local change for sane-backends: old version: major=`expr $current - $age + 1`
# major=`expr $current - $age + 1`
# New version:
major=`expr $current - $age`
# End of local change.
case $version_type in case $version_type in
nonstopux) verstring_prefix=nonstopux ;; nonstopux) verstring_prefix=nonstopux ;;