From cf7227b59848ce7d124f7494c607b8c924a7b153 Mon Sep 17 00:00:00 2001 From: Olaf Meeuwissen Date: Sat, 14 Mar 2020 15:48:19 +0900 Subject: [PATCH] Pass Avahi related preprocessor flags where needed --- backend/Makefile.am | 4 ++-- frontend/Makefile.am | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/Makefile.am b/backend/Makefile.am index 5880e228e..b592a9d66 100644 --- a/backend/Makefile.am +++ b/backend/Makefile.am @@ -682,10 +682,10 @@ libsane_kodak_la_LIBADD = $(COMMON_LIBS) libkodak.la ../sanei/sanei_init_debug.l EXTRA_DIST += kodak.conf.in libkodakaio_la_SOURCES = kodakaio.c kodakaio.h -libkodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodakaio +libkodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) $(AVAHI_CFLAGS) -DBACKEND_NAME=kodakaio nodist_libsane_kodakaio_la_SOURCES = kodakaio-s.c -libsane_kodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodakaio +libsane_kodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) $(AVAHI_CFLAGS) -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) $(AVAHI_LIBS) $(MATH_LIB) $(RESMGR_LIBS) EXTRA_DIST += kodakaio.conf.in diff --git a/frontend/Makefile.am b/frontend/Makefile.am index 525953f6b..d27acf280 100644 --- a/frontend/Makefile.am +++ b/frontend/Makefile.am @@ -21,6 +21,7 @@ scanimage_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \ $(PNG_LIBS) $(JPEG_LIBS) saned_SOURCES = saned.c +saned_CPPFLAGS = $(AM_CPPFLAGS) $(AVAHI_CFLAGS) saned_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \ $(SYSLOG_LIBS) $(SYSTEMD_LIBS) $(AVAHI_LIBS)