Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 1 | From 3d53d02af7c45763eb33f7bbe5f9e389fbcb7e21 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 2 Sep 2022 17:55:48 -0700 |
| 4 | Subject: [PATCH 2/4] Add ImageProcessor only when DISBALE_IMAGEPROCESSOR_BUILD |
| 5 | is not set |
| 6 | |
| 7 | Upstream-Status: Pending |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
Patrick Williams | 8e7b46e | 2023-05-01 14:19:06 -0500 | [diff] [blame^] | 10 | Makefile.am | 8 +++++++- |
| 11 | 1 file changed, 7 insertions(+), 1 deletion(-) |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 12 | |
| 13 | diff --git a/Makefile.am b/Makefile.am |
| 14 | index 5f75759..73421b1 100644 |
| 15 | --- a/Makefile.am |
| 16 | +++ b/Makefile.am |
| 17 | @@ -597,7 +597,11 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp |
| 18 | prnt/hpcups/ImageProcessor.h |
| 19 | |
| 20 | hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) |
| 21 | -hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS) |
| 22 | +hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS) |
| 23 | +if !DISBALE_IMAGEPROCESSOR_BUILD |
| 24 | +hpcups_LDADD += "-lImageProcessor" |
| 25 | +endif #DISABLE_IMAGEPROCESSOR |
| 26 | + |
| 27 | #else |
| 28 | #hpcupsdir = $(cupsfilterdir) |
| 29 | #hpcups_PROGRAMS = hpcups |
Patrick Williams | 8e7b46e | 2023-05-01 14:19:06 -0500 | [diff] [blame^] | 30 | @@ -687,6 +692,7 @@ |
| 31 | |
| 32 | install-data-hook: |
| 33 | if HPLIP_BUILD |
| 34 | +if !DISBALE_IMAGEPROCESSOR_BUILD |
| 35 | if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ |
| 36 | cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ |
| 37 | chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ |
| 38 | @@ -697,6 +703,7 @@ |
| 39 | chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ |
| 40 | ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ |
| 41 | fi |
| 42 | +endif #DISABLE_IMAGEPROCESSOR |
| 43 | if [ -d "/usr/share/ipp-usb/quirks/" ]; then \ |
| 44 | echo "ipp-usb directory exists"; \ |
| 45 | cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \ |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 46 | -- |
| 47 | 2.37.3 |
| 48 | |