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

use automake instead of autoreconf so libtoolize is not run

merge-requests/1/head
m. allan noah 2012-11-28 21:43:08 -05:00
rodzic 9b142567fa
commit ed7a5f227d
4 zmienionych plików z 8 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
Makefile.am
Wyświetl plik

@ -17,7 +17,7 @@ EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1 ChangeLog-1.0.2 \
ChangeLog-1.0.7 ChangeLog-1.0.8 ChangeLog-1.0.9 ChangeLog-1.0.10 \
ChangeLog-1.0.12 ChangeLog-1.0.13 ChangeLog-1.0.14 ChangeLog-1.0.15 \
ChangeLog-1.0.16 ChangeLog-1.0.17 ChangeLog-1.0.18 ChangeLog-1.0.19 \
ChangeLog-1.0.20 ChangeLog-1.0.21 ChangeLog-1.0.22 \
ChangeLog-1.0.20 ChangeLog-1.0.21 ChangeLog-1.0.22 ChangeLog-1.0.23 \
$(PACKAGE).lsm
#

5
backend/Makefile.in
Wyświetl plik

@ -736,7 +736,8 @@ libsane_kodakaio_la_DEPENDENCIES = $(COMMON_LIBS) libkodakaio.la \
sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo \
../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
nodist_libsane_kodakaio_la_OBJECTS = \
libsane_kodakaio_la-kodakaio-s.lo
libsane_kodakaio_la_OBJECTS = $(nodist_libsane_kodakaio_la_OBJECTS)
@ -2151,7 +2152,7 @@ libkodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodakaio
nodist_libsane_kodakaio_la_SOURCES = kodakaio-s.c
libsane_kodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodakaio
libsane_kodakaio_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
libsane_kodakaio_la_LIBADD = $(COMMON_LIBS) libkodakaio.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(USB_LIBS) $(SOCKET_LIBS) $(MATH_LIB) $(RESMGR_LIBS)
libsane_kodakaio_la_LIBADD = $(COMMON_LIBS) libkodakaio.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(USB_LIBS) $(SOCKET_LIBS) $(AVAHI_LIBS) $(MATH_LIB) $(RESMGR_LIBS)
libkvs1025_la_SOURCES = kvs1025.c kvs1025_low.c kvs1025_opt.c kvs1025_usb.c \
kvs1025.h kvs1025_low.h kvs1025_usb.h kvs1025_cmds.h

4
doc/Makefile.in
Wyświetl plik

@ -37,8 +37,8 @@ host_triplet = @host@
subdir = doc
DIST_COMMON = $(dist_doc_DATA) $(nobase_dist_doc_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/doxygen-sanei.conf.in \
$(srcdir)/doxygen-genesys.conf.in
$(srcdir)/doxygen-genesys.conf.in \
$(srcdir)/doxygen-sanei.conf.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \

4
doc/releases.txt
Wyświetl plik

@ -22,7 +22,7 @@ Before the release:
* configure.in: set is_release=yes
* OPTIONAL: aclocal.m4: recreate by running aclocal
* OPTIONAL: include/sane/config.h.in: recreate (autoheader in root of checkout)
* DONT run automake, it will overwrite our custom ltmain.sh
* DONT run autoreconf, it will overwrite our custom ltmain.sh
* configure: recreate by running autoconf
* NEWS: update and enter date of release
* sane-backends.lsm: update
@ -71,7 +71,7 @@ After the release:
* move ChangeLog to ChangeLog-"version"
* start a new ChangeLog
* add ChangeLog-"version" to EXTRA_DIST in Makefile.in
* add ChangeLog-"version" to EXTRA_DIST in Makefile.in and Makefile.am
* configure.in: bump textual version & add 'git' suffix
* configure.in: bump V_REV
* configure.in: set is_release=no