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

Fixes for "make distcheck" on cygwin. 

Allow "make dist" when translations are disabled.
Allow "make check" to work by linking in liblib.la.

Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
merge-requests/1/head
Chris Bagwell 2011-01-02 20:00:22 -06:00
rodzic 650ea7cf8a
commit 9de4dcd8a5
5 zmienionych plików z 10 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
ChangeLog
Wyświetl plik

@ -4,6 +4,9 @@
* m4/*: Added new libtool helper files.
* ltmain.sh: updated to latest libtool and added back special
sane soname work around.
* po/Makefile.am: Allow "make dist" to work when translations
disabled.
* sanei/Makefile.am: allow "make check" to work on cygwin.
2010-12-28 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.conf.in backend/genesys_devices.c backend/genesys_gl646.c

3
po/Makefile.am
Wyświetl plik

@ -20,11 +20,12 @@ SRC_FILES=$(shell if test -r $(srcdir)/POTFILES; then grep -v "^\#" $(srcdir)/PO
PO_FILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
MO_FILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.mo "; done)
EXTRA_DIST = README $(GETTEXT_PACKAGE).pot LINGUAS POTFILES
EXTRA_DIST = README LINGUAS POTFILES
EXTRA_DIST += $(PO_FILES)
if ENABLE_TRANSLATIONS
EXTRA_DIST += $(GETTEXT_PACKAGE).pot
INSTALL_TRANSLATIONS = install-translations
UNINSTALL_TRANSLATIONS = uninstall-translations
ALL = all-mos

4
po/Makefile.in
Wyświetl plik

@ -35,6 +35,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@ENABLE_TRANSLATIONS_TRUE@am__append_1 = $(GETTEXT_PACKAGE).pot
subdir = po
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -221,8 +222,7 @@ PO_LINGUAS = $(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/
SRC_FILES = $(shell if test -r $(srcdir)/POTFILES; then grep -v "^\#" $(srcdir)/POTFILES; else echo ""; fi)
PO_FILES = $(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
MO_FILES = $(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.mo "; done)
EXTRA_DIST = README $(GETTEXT_PACKAGE).pot LINGUAS POTFILES \
$(PO_FILES)
EXTRA_DIST = README LINGUAS POTFILES $(PO_FILES) $(am__append_1)
@ENABLE_TRANSLATIONS_FALSE@INSTALL_TRANSLATIONS =
@ENABLE_TRANSLATIONS_TRUE@INSTALL_TRANSLATIONS = install-translations
@ENABLE_TRANSLATIONS_FALSE@UNINSTALL_TRANSLATIONS =

2
sanei/Makefile.am
Wyświetl plik

@ -24,7 +24,7 @@ endif
EXTRA_DIST = linux_sg3_err.h os2_srb.h sanei_DomainOS.c sanei_DomainOS.h
test_wire_SOURCES = test_wire.c
test_wire_LDADD = libsanei.la
test_wire_LDADD = libsanei.la ../lib/liblib.la
clean-local:
rm -f test_wire.out

4
sanei/Makefile.in
Wyświetl plik

@ -68,7 +68,7 @@ am_libsanei_la_OBJECTS = sanei_ab306.lo sanei_constrain_value.lo \
libsanei_la_OBJECTS = $(am_libsanei_la_OBJECTS)
am_test_wire_OBJECTS = test_wire.$(OBJEXT)
test_wire_OBJECTS = $(am_test_wire_OBJECTS)
test_wire_DEPENDENCIES = libsanei.la
test_wire_DEPENDENCIES = libsanei.la ../lib/liblib.la
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/sane
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -268,7 +268,7 @@ libsanei_la_SOURCES = sanei_ab306.c sanei_constrain_value.c \
sanei_udp.c sanei_magic.c $(am__append_1)
EXTRA_DIST = linux_sg3_err.h os2_srb.h sanei_DomainOS.c sanei_DomainOS.h
test_wire_SOURCES = test_wire.c
test_wire_LDADD = libsanei.la
test_wire_LDADD = libsanei.la ../lib/liblib.la
all: all-am
.SUFFIXES: