[gimp] plug-ins: move file-compressor to plug-ins/common/, it's only one .c file
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] plug-ins: move file-compressor to plug-ins/common/, it's only one .c file
- Date: Wed, 13 Aug 2014 23:36:01 +0000 (UTC)
commit 498ccd33eee5256b0e64e49df1a11bfdf0ac2349
Author: Michael Natterer <mitch gimp org>
Date: Thu Aug 14 01:35:06 2014 +0200
plug-ins: move file-compressor to plug-ins/common/, it's only one .c file
configure.ac | 1 -
plug-ins/Makefile.am | 1 -
plug-ins/common/.gitignore | 2 +
plug-ins/common/Makefile.am | 21 ++++++++++
.../{file-compressor => common}/file-compressor.c | 2 +-
plug-ins/common/gimprc.common | 1 +
plug-ins/common/plugin-defs.pl | 1 +
plug-ins/file-compressor/.gitignore | 7 ---
plug-ins/file-compressor/Makefile.am | 40 --------------------
po-plug-ins/POTFILES.in | 2 +-
10 files changed, 27 insertions(+), 51 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f0606da..b21c2b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2222,7 +2222,6 @@ build/windows/gimp.rc
build/windows/gimp-plug-ins.rc
plug-ins/Makefile
plug-ins/file-bmp/Makefile
-plug-ins/file-compressor/Makefile
plug-ins/file-exr/Makefile
plug-ins/file-faxg3/Makefile
plug-ins/file-fits/Makefile
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index b483e09..bcc3e26 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -33,7 +33,6 @@ SUBDIRS = \
$(script_fu) \
$(pygimp) \
file-bmp \
- file-compressor \
$(file_exr) \
file-faxg3 \
file-fits \
diff --git a/plug-ins/common/.gitignore b/plug-ins/common/.gitignore
index fe32b55..7de8a9b 100644
--- a/plug-ins/common/.gitignore
+++ b/plug-ins/common/.gitignore
@@ -72,6 +72,8 @@
/file-aa.exe
/file-cel
/file-cel.exe
+/file-compressor
+/file-compressor.exe
/file-csource
/file-csource.exe
/file-desktop-link
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index a6f76e2..6ff1821 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -79,6 +79,7 @@ libexec_PROGRAMS = \
engrave \
$(FILE_AA) \
file-cel \
+ file-compressor \
file-csource \
file-desktop-link \
file-dicom \
@@ -785,6 +786,26 @@ file_cel_LDADD = \
$(INTLLIBS) \
$(file_cel_RC)
+file_compressor_CFLAGS = $(LZMA_CFLAGS)
+
+file_compressor_SOURCES = \
+ file-compressor.c
+
+file_compressor_LDADD = \
+ $(libgimp) \
+ $(libgimpmath) \
+ $(libgimpconfig) \
+ $(libgimpcolor) \
+ $(libgimpbase) \
+ $(CAIRO_LIBS) \
+ $(GDK_PIXBUF_LIBS) \
+ $(LZMA_LIBS) \
+ $(BZIP2_LIBS) \
+ $(Z_LIBS) \
+ $(RT_LIBS) \
+ $(INTLLIBS) \
+ $(file_compressor_RC)
+
file_csource_SOURCES = \
file-csource.c
diff --git a/plug-ins/file-compressor/file-compressor.c b/plug-ins/common/file-compressor.c
similarity index 100%
rename from plug-ins/file-compressor/file-compressor.c
rename to plug-ins/common/file-compressor.c
index 2109efc..5e72d29 100644
--- a/plug-ins/file-compressor/file-compressor.c
+++ b/plug-ins/common/file-compressor.c
@@ -156,8 +156,8 @@ static const gchar * find_extension (const Compressor *compressor,
static gboolean gzip_load (const char *infile,
const char *outfile);
static gboolean gzip_save (const char *infile,
-
const char *outfile);
+
static gboolean bzip2_load (const char *infile,
const char *outfile);
static gboolean bzip2_save (const char *infile,
diff --git a/plug-ins/common/gimprc.common b/plug-ins/common/gimprc.common
index 4ea72a0..421fb1e 100644
--- a/plug-ins/common/gimprc.common
+++ b/plug-ins/common/gimprc.common
@@ -33,6 +33,7 @@ emboss_RC = emboss.rc.o
engrave_RC = engrave.rc.o
file_aa_RC = file-aa.rc.o
file_cel_RC = file-cel.rc.o
+file_compressor_RC = file-compressor.rc.o
file_csource_RC = file-csource.rc.o
file_desktop_link_RC = file-desktop-link.rc.o
file_dicom_RC = file-dicom.rc.o
diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl
index 8c39bfc..47cf097 100644
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@ -35,6 +35,7 @@
'file-aa' => { ui => 1, gegl => 1, optional => 1, libs => 'AA_LIBS' },
'file-cel' => { ui => 1, gegl => 1 },
'file-csource' => { ui => 1, gegl => 1 },
+ 'file-compressor' => { libdep => 'Z:BZIP2:LZMA', cflags => 'LZMA_CFLAGS' },
'file-desktop-link' => {},
'file-dicom' => { ui => 1, gegl => 1, cflags => '-fno-strict-aliasing' },
'file-gbr' => { ui => 1, gegl => 1 },
diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in
index 3e2712b..93dc7ff 100644
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@ -39,6 +39,7 @@ plug-ins/common/engrave.c
plug-ins/common/file-aa.c
plug-ins/common/file-cel.c
plug-ins/common/file-csource.c
+plug-ins/common/file-compressor.c
plug-ins/common/file-desktop-link.c
plug-ins/common/file-dicom.c
plug-ins/common/file-gbr.c
@@ -120,7 +121,6 @@ plug-ins/common/wind.c
plug-ins/file-bmp/bmp-read.c
plug-ins/file-bmp/bmp-write.c
plug-ins/file-bmp/bmp.c
-plug-ins/file-compressor/file-compressor.c
plug-ins/file-exr/file-exr.c
plug-ins/file-faxg3/faxg3.c
plug-ins/file-fits/fits.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]