From 419cc4b7e99657b500fb0e173483e82a28e26df1 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Mon, 12 Mar 2018 13:37:19 +0100 Subject: Make dat2drv and locateppd build dependent of class driver enabling; copes with its source code removal from source --- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 7b4b5bb68..1b097c4f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -620,12 +620,14 @@ endif # FAX_BUILD endif # HPCUPS ONLY endif # HPCUPS_INSTALL +if HPLIP_CLASS_DRIVER dat2drvdir = $(hplipdir) dat2drv_PROGRAMS = dat2drv dat2drv_SOURCES = Common.h Dat2drv.cpp Dat2drv.h Normalize.cpp Normalize.h if GCC_GE_47 dat2drv_CXXFLAGS = -std=c++11 endif +endif # HPLIP_CLASS_DRIVER if HPPS_INSTALL hppsdir = $(cupsfilterdir) @@ -636,6 +638,7 @@ hpps_LDADD = -lcups $(DBUS_LIBS) endif #HPPS_INSTALL +if HPLIP_CLASS_DRIVER #locate driver locatedriverdir = $(hplipdir) locatedriver_PROGRAMS = locatedriver @@ -643,7 +646,6 @@ locatedriver_SOURCES = FindPPD.cpp FindPPD.h if GCC_GE_47 locatedriver_CXXFLAGS = -std=c++11 endif -if HPLIP_CLASS_DRIVER dist_locatedriver_DATA = locatedriver endif #HPLIP_CLASS_DRIVER