libcupsfilters, parallel, test1284: Moved device-ID-related functions into libcupsfilters

Author: tillkamppeter

Makefile.am

@@ -53,18 +53,17 @@ check_PROGRAMS = test1284
 #TESTS = test1284
 
 parallel_SOURCES = \
-	backend/backend-private.h \
-	backend/ieee1284.c \
 	backend/parallel.c
 parallel_LDADD = \
+	libcupsfilters.la \
 	libppd.la \
 	$(CUPS_LIBS)
 parallel_CFLAGS = \
+	-I$(srcdir)/cupsfilters/ \
 	-I$(srcdir)/ppd/ \
 	$(CUPS_CFLAGS)
 
 serial_SOURCES = \
-	backend/backend-private.h \
 	backend/serial.c
 serial_LDADD = \
 	libppd.la \
@@ -74,7 +73,6 @@ serial_CFLAGS = \
 	$(CUPS_CFLAGS)
 
 beh_SOURCES = \
-	backend/backend-private.h \
 	backend/beh.c
 beh_LDADD = \
 	libppd.la \
@@ -84,7 +82,6 @@ beh_CFLAGS = \
 	$(CUPS_CFLAGS)
 
 implicitclass_SOURCES = \
-	backend/backend-private.h \
 	backend/implicitclass.c
 implicitclass_LDADD = \
 	libcupsfilters.la \
@@ -96,13 +93,13 @@ implicitclass_CFLAGS = \
 	$(CUPS_CFLAGS)
 
 test1284_SOURCES = \
-	backend/backend-private.h \
-	backend/ieee1284.c \
 	backend/test1284.c
 test1284_LDADD = \
+	libcupsfilters.la \
 	libppd.la \
 	$(CUPS_LIBS)
 test1284_CFLAGS = \
+	-I$(srcdir)/cupsfilters/ \
 	-I$(srcdir)/ppd/ \
 	$(CUPS_CFLAGS)
 
@@ -247,6 +244,7 @@ pkgfiltersinclude_DATA = \
 	cupsfilters/colormanager.h \
 	cupsfilters/driver.h \
 	cupsfilters/filter.h \
+	cupsfilters/ieee1284.h \
 	cupsfilters/image.h \
 	cupsfilters/ipp.h \
 	cupsfilters/log.h \
@@ -288,6 +286,7 @@ libcupsfilters_la_SOURCES = \
 	cupsfilters/dither.c \
 	cupsfilters/filter.c \
 	cupsfilters/ghostscript.c \
+	cupsfilters/ieee1284.c \
 	cupsfilters/image.c \
 	cupsfilters/image-bmp.c \
 	cupsfilters/image-colorspace.c \

NEWS

@@ -3,6 +3,9 @@ NEWS - OpenPrinting CUPS Filters v1.27.5 - 2020-06-05
 
 CHANGES IN V2.0.0
 
+	- libcupsfilters, parallel, test1284: Moved
+	  IEEE1284-device-ID-related functions into the public API of
+	  libcupsfilters.
 	- foomatic-rip: Remove temporary file created during pdf-to-ps
 	  conversion (Pull request #313).
 	- libppd: Added PPD collection handling functions (based on

backend/beh.c

@@ -19,9 +19,15 @@
  * Include necessary headers.
  */
 
-#include "backend-private.h"
+#include <config.h>
+#include <cups/cups.h>
+#include <cups/backend.h>
 #include <cups/array.h>
 #include <ctype.h>
+#include <stdio.h>
+#include <signal.h>
+#include <string.h>
+#include <errno.h>
 
 /*
  * Local globals...

backend/cups-brf.c

@@ -24,10 +24,11 @@
  * THE SOFTWARE.
  */
 
-#include "backend-private.h"
+#include <cups/backend.h>
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>

backend/implicitclass.c

@@ -20,12 +20,14 @@
  * Include necessary headers.
  */
 
-#include "backend-private.h"
-#include <cups/array.h>
-#include <ctype.h>
+#include <config.h>
+#include <cups/cups.h>
+#include <cups/backend.h>
 #include <cups/array.h>
 #include <ctype.h>
-#include <cups/cups.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <cupsfilters/pdftoippprinter.h>

backend/parallel.c

@@ -22,7 +22,7 @@
  * Include necessary headers.
  */
 
-#include "backend-private.h"
+#include <cupsfilters/ieee1284.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <termios.h>

backend/serial.c

@@ -20,12 +20,17 @@
  * Include necessary headers.
  */
 
-#include "backend-private.h"
+#include <config.h>
+#include <cups/cups.h>
+#include <cups/backend.h>
+#include <cups/sidechannel.h>
+#include <stdlib.h>
 #include <stdio.h>
-
 #include <unistd.h>
 #include <fcntl.h>
 #include <termios.h>
+#include <errno.h>
+#include <signal.h>
 #include <sys/select.h>
 #ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>

backend/test1284.c

@@ -28,7 +28,7 @@
 #  include <fcntl.h>
 #endif /* WIN32 */
 
-#include "backend-private.h"
+#include <cupsfilters/ieee1284.h>
 
 
 /*

backend/ieee1284.c cupsfilters/ieee1284.c

@@ -1,5 +1,5 @@
 /*
- *   IEEE-1284 support functions for CUPS.
+ *   IEEE-1284 Device ID support functions for OpenPrinting CUPS Filters.
  *
  *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
@@ -23,7 +23,7 @@
  * Include necessary headers.
  */
 
-#include "backend-private.h"
+#include "ieee1284.h"
 #include <cups/cups.h>
 #include <string.h>
 #include <ctype.h>

backend/backend-private.h cupsfilters/ieee1284.h

@@ -1,5 +1,5 @@
 /*
- *   Backend support definitions for OpenPrinting CUPS Filters.
+ *   IEEE1284 Device ID support definitions for OpenPrinting CUPS Filters.
  *
  *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
@@ -10,8 +10,8 @@
  *   which should have been included with this file.
  */
 
-#ifndef _CUPSFILTERS_BACKEND_PRIVATE_H_
-#  define _CUPSFILTERS_BACKEND_PRIVATE_H_
+#ifndef _CUPSFILTERS_IEEE1284_H_
+#  define _CUPSFILTERS_IEEE1284_H_
 
 
 /*
@@ -62,7 +62,6 @@ extern "C" {
  * Prototypes...
  */
 
-extern int		backendDrainOutput(int print_fd, int device_fd);
 extern int		backendGetDeviceID(int fd, char *device_id,
 			                   int device_id_size,
 			                   char *make_model,
@@ -77,5 +76,4 @@ extern int		backendGetMakeModel(const char *device_id,
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
-#endif /* !_CUPSFILTERS_BACKEND_PRIVATE_H_ */
-
+#endif /* !_CUPSFILTERS_IEEE1284_H_ */