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

Merge branch 'backend-built-sources' into 'master' 

backend/Makefile: Fix handling of built sources

See merge request sane-project/backends!726
escl-add-user-and-password
Ralph Little 2022-04-25 14:17:15 +00:00
rodzic ac42d6e684 76aa009316
commit e0aad8e814
2 zmienionych plików z 24 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

42
backend/Makefile.am
Wyświetl plik

@ -18,6 +18,8 @@ DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-number $(V_MAJOR):
LIBTOOL += --silent
FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan epjitsu
BUILT_SOURCES =
# Needed by most backends as they add sane_strstatus.lo to their list
# of libraries to link with via libsane_${BACKEND}_la_LIBADD. Due to
# the implicit dependency, automake does not notice the need to clean
@ -1429,7 +1431,9 @@ libsane_pint_la_LIBADD = $(COMMON_LIBS) \
../sanei/sanei_config.lo \
sane_strstatus.lo
libpixma_la_SOURCES = pixma/pixma.c \
libpixma_la_SOURCES = \
pixma/pixma_sane_options.h \
pixma/pixma.c \
pixma/pixma.h \
pixma/pixma_io_sanei.c \
pixma/pixma_io.h \
@ -1446,26 +1450,25 @@ libpixma_la_SOURCES = pixma/pixma.c \
pixma/pixma_rename.h
libpixma_la_CPPFLAGS = $(AM_CPPFLAGS) $(XML_CFLAGS) -DBACKEND_NAME=pixma
# Generate options files included by pixma/pixma.c from said file.
# The circular dependency means we cannot add it as a prerequisite
# for the targets that build the options files.
pixma/pixma.c: pixma/pixma_sane_options.h pixma/pixma_sane_options.c
pixma/pixma_sane_options.h:
$(AM_V_GEN)
@if $(AM_V_P); then echo Generating $@ from $(@D)/pixma.c; fi
@(cd $(@D); $(PYTHON) scripts/pixma_gen_options.py h < pixma.c > $(@F))
pixma/pixma_sane_options.c:
$(AM_V_GEN)
@if $(AM_V_P); then echo Generating $@ from $(@D)/pixma.c; fi
@(cd $(@D); $(PYTHON) scripts/pixma_gen_options.py < pixma.c > $(@F))
$(srcdir)/pixma/pixma_sane_options.h: $(srcdir)/pixma/pixma.c
@if $(AM_V_P); then \
echo "Generating pixma/$(@F) from pixma/$(^F)"; \
else \
echo " GEN pixma/$(@F)"; \
fi
@$(PYTHON) $(srcdir)/pixma/scripts/pixma_gen_options.py h < $^ > $@
$(srcdir)/pixma/pixma_sane_options.c: $(srcdir)/pixma/pixma.c
@if $(AM_V_P); then \
echo "Generating pixma/$(@F) from pixma/$(^F)"; \
else \
echo " GEN pixma/$(@F)"; \
fi
@$(PYTHON) $(srcdir)/pixma/scripts/pixma_gen_options.py < $^ > $@
BUILT_SOURCES += pixma/pixma_sane_options.c
BUILT_SOURCES += pixma/pixma_sane_options.h
EXTRA_DIST += pixma/pixma_sane_options.c
EXTRA_DIST += pixma/pixma_sane_options.h
EXTRA_DIST += pixma/scripts/pixma_gen_options.py
CLEANFILES += pixma/pixma_sane_options.c
CLEANFILES += pixma/pixma_sane_options.h
nodist_libsane_pixma_la_SOURCES = pixma-s.c
libsane_pixma_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pixma
@ -1959,6 +1962,7 @@ libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) \
$(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
EXTRA_DIST += xerox_mfp.conf.in
nodist_libdll_preload_la_SOURCES = dll-preload.h
libdll_preload_la_SOURCES = dll.c
libdll_preload_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll -DENABLE_PRELOAD
libdll_preload_la_LIBADD = ../sanei/sanei_usb.lo \
@ -1967,7 +1971,7 @@ libdll_la_SOURCES = dll.c
libdll_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
libdll_la_LIBADD = ../sanei/sanei_usb.lo \
$(USB_LIBS) $(XML_LIBS)
BUILT_SOURCES = dll-preload.h
BUILT_SOURCES += dll-preload.h
CLEANFILES += dll-preload.h
nodist_libsane_dll_la_SOURCES = dll-s.c

2
po/Makevars
Wyświetl plik

@ -52,4 +52,4 @@ EXTRA_LOCALE_CATEGORIES =
# Selected files in POTFILES.in are generated. Make sure they are
# available when needed.
$(top_srcdir)/backend/pixma/pixma_sane_options.c:
cd ../backend; make pixma/pixma_sane_options.c
$(MAKE) -C ../backend pixma/pixma_sane_options.c