From 7b228be5e7dad536640abb91ec6db605c956e1f5 Mon Sep 17 00:00:00 2001 From: Rolf Bensch Date: Thu, 2 Jan 2020 12:36:49 +0100 Subject: [PATCH] pixma: move source files to subfolder --- backend/Makefile.am | 18 ++++++++++++++++-- backend/{ => pixma}/pixma.c | 0 backend/{ => pixma}/pixma.h | 0 backend/{ => pixma}/pixma_bjnp.c | 0 backend/{ => pixma}/pixma_bjnp.h | 0 backend/{ => pixma}/pixma_bjnp_private.h | 0 backend/{ => pixma}/pixma_common.c | 0 backend/{ => pixma}/pixma_common.h | 0 backend/{ => pixma}/pixma_imageclass.c | 0 backend/{ => pixma}/pixma_io.h | 0 backend/{ => pixma}/pixma_io_sanei.c | 0 backend/{ => pixma}/pixma_mp150.c | 0 backend/{ => pixma}/pixma_mp730.c | 0 backend/{ => pixma}/pixma_mp750.c | 0 backend/{ => pixma}/pixma_mp800.c | 0 backend/{ => pixma}/pixma_rename.h | 0 backend/{ => pixma}/pixma_sane_options.c | 0 backend/{ => pixma}/pixma_sane_options.h | 0 .../{ => pixma}/scripts/pixma_gen_options.py | 0 po/POTFILES.in | 4 ++-- 20 files changed, 18 insertions(+), 4 deletions(-) rename backend/{ => pixma}/pixma.c (100%) rename backend/{ => pixma}/pixma.h (100%) rename backend/{ => pixma}/pixma_bjnp.c (100%) rename backend/{ => pixma}/pixma_bjnp.h (100%) rename backend/{ => pixma}/pixma_bjnp_private.h (100%) rename backend/{ => pixma}/pixma_common.c (100%) rename backend/{ => pixma}/pixma_common.h (100%) rename backend/{ => pixma}/pixma_imageclass.c (100%) rename backend/{ => pixma}/pixma_io.h (100%) rename backend/{ => pixma}/pixma_io_sanei.c (100%) rename backend/{ => pixma}/pixma_mp150.c (100%) rename backend/{ => pixma}/pixma_mp730.c (100%) rename backend/{ => pixma}/pixma_mp750.c (100%) rename backend/{ => pixma}/pixma_mp800.c (100%) rename backend/{ => pixma}/pixma_rename.h (100%) rename backend/{ => pixma}/pixma_sane_options.c (100%) rename backend/{ => pixma}/pixma_sane_options.h (100%) rename backend/{ => pixma}/scripts/pixma_gen_options.py (100%) diff --git a/backend/Makefile.am b/backend/Makefile.am index d358f9bf2..f3be149a1 100644 --- a/backend/Makefile.am +++ b/backend/Makefile.am @@ -889,7 +889,21 @@ libsane_pint_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pint libsane_pint_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS) libsane_pint_la_LIBADD = $(COMMON_LIBS) libpint.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo -libpixma_la_SOURCES = pixma.c pixma.h pixma_io_sanei.c pixma_io.h pixma_common.c pixma_common.h pixma_mp150.c pixma_mp730.c pixma_mp750.c pixma_mp800.c pixma_imageclass.c pixma_bjnp.c pixma_bjnp.h pixma_bjnp_private.h pixma_rename.h +libpixma_la_SOURCES = pixma/pixma.c \ + pixma/pixma.h \ + pixma/pixma_io_sanei.c \ + pixma/pixma_io.h \ + pixma/pixma_common.c \ + pixma/pixma_common.h \ + pixma/pixma_mp150.c \ + pixma/pixma_mp730.c \ + pixma/pixma_mp750.c \ + pixma/pixma_mp800.c \ + pixma/pixma_imageclass.c \ + pixma/pixma_bjnp.c \ + pixma/pixma_bjnp.h \ + pixma/pixma_bjnp_private.h \ + pixma/pixma_rename.h libpixma_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=pixma nodist_libsane_pixma_la_SOURCES = pixma-s.c @@ -898,7 +912,7 @@ libsane_pixma_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS) libsane_pixma_la_LIBADD = $(COMMON_LIBS) libpixma.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo $(SANEI_SANEI_JPEG_LO) $(JPEG_LIBS) $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS) EXTRA_DIST += pixma.conf.in # TODO: Why are these distributed but not compiled? -EXTRA_DIST += pixma_sane_options.c pixma_sane_options.h +EXTRA_DIST += pixma/pixma_sane_options.c pixma/pixma_sane_options.h libplustek_la_SOURCES = plustek.c plustek.h libplustek_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=plustek diff --git a/backend/pixma.c b/backend/pixma/pixma.c similarity index 100% rename from backend/pixma.c rename to backend/pixma/pixma.c diff --git a/backend/pixma.h b/backend/pixma/pixma.h similarity index 100% rename from backend/pixma.h rename to backend/pixma/pixma.h diff --git a/backend/pixma_bjnp.c b/backend/pixma/pixma_bjnp.c similarity index 100% rename from backend/pixma_bjnp.c rename to backend/pixma/pixma_bjnp.c diff --git a/backend/pixma_bjnp.h b/backend/pixma/pixma_bjnp.h similarity index 100% rename from backend/pixma_bjnp.h rename to backend/pixma/pixma_bjnp.h diff --git a/backend/pixma_bjnp_private.h b/backend/pixma/pixma_bjnp_private.h similarity index 100% rename from backend/pixma_bjnp_private.h rename to backend/pixma/pixma_bjnp_private.h diff --git a/backend/pixma_common.c b/backend/pixma/pixma_common.c similarity index 100% rename from backend/pixma_common.c rename to backend/pixma/pixma_common.c diff --git a/backend/pixma_common.h b/backend/pixma/pixma_common.h similarity index 100% rename from backend/pixma_common.h rename to backend/pixma/pixma_common.h diff --git a/backend/pixma_imageclass.c b/backend/pixma/pixma_imageclass.c similarity index 100% rename from backend/pixma_imageclass.c rename to backend/pixma/pixma_imageclass.c diff --git a/backend/pixma_io.h b/backend/pixma/pixma_io.h similarity index 100% rename from backend/pixma_io.h rename to backend/pixma/pixma_io.h diff --git a/backend/pixma_io_sanei.c b/backend/pixma/pixma_io_sanei.c similarity index 100% rename from backend/pixma_io_sanei.c rename to backend/pixma/pixma_io_sanei.c diff --git a/backend/pixma_mp150.c b/backend/pixma/pixma_mp150.c similarity index 100% rename from backend/pixma_mp150.c rename to backend/pixma/pixma_mp150.c diff --git a/backend/pixma_mp730.c b/backend/pixma/pixma_mp730.c similarity index 100% rename from backend/pixma_mp730.c rename to backend/pixma/pixma_mp730.c diff --git a/backend/pixma_mp750.c b/backend/pixma/pixma_mp750.c similarity index 100% rename from backend/pixma_mp750.c rename to backend/pixma/pixma_mp750.c diff --git a/backend/pixma_mp800.c b/backend/pixma/pixma_mp800.c similarity index 100% rename from backend/pixma_mp800.c rename to backend/pixma/pixma_mp800.c diff --git a/backend/pixma_rename.h b/backend/pixma/pixma_rename.h similarity index 100% rename from backend/pixma_rename.h rename to backend/pixma/pixma_rename.h diff --git a/backend/pixma_sane_options.c b/backend/pixma/pixma_sane_options.c similarity index 100% rename from backend/pixma_sane_options.c rename to backend/pixma/pixma_sane_options.c diff --git a/backend/pixma_sane_options.h b/backend/pixma/pixma_sane_options.h similarity index 100% rename from backend/pixma_sane_options.h rename to backend/pixma/pixma_sane_options.h diff --git a/backend/scripts/pixma_gen_options.py b/backend/pixma/scripts/pixma_gen_options.py similarity index 100% rename from backend/scripts/pixma_gen_options.py rename to backend/pixma/scripts/pixma_gen_options.py diff --git a/po/POTFILES.in b/po/POTFILES.in index 1c7c16781..261a693b6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -73,8 +73,8 @@ backend/mustek_usb2.c backend/niash.c -backend/pixma.c -backend/pixma_sane_options.c +backend/pixma/pixma.c +backend/pixma/pixma_sane_options.c backend/plustek.c backend/plustek_pp.c