file-compressor: Move to own directory under plug-ins/

configure.ac

@@ -1145,6 +1145,8 @@ if test "x$have_zlib" = xyes; then
 fi
 
 AC_SUBST(FILE_PSP)
+
+AM_CONDITIONAL(HAVE_Z, test "x$have_zlib" = xyes)
 AC_SUBST(Z_LIBS)
 
 
@@ -1161,6 +1163,7 @@ if test -z "$BZIP2_LIBS"; then
     [have_libbzip2="no (libbzip2 library not found)"])
 fi
 
+AM_CONDITIONAL(HAVE_BZIP2, test "x$have_libbzip2" = xyes)
 AC_SUBST(BZIP2_LIBS)
 
 
@@ -2150,6 +2153,7 @@ plug-ins/Makefile
 plug-ins/color-rotate/Makefile
 plug-ins/color-rotate/images/Makefile
 plug-ins/file-bmp/Makefile
+plug-ins/file-compressor/Makefile
 plug-ins/file-faxg3/Makefile
 plug-ins/file-fits/Makefile
 plug-ins/file-fli/Makefile

plug-ins/Makefile.am

@@ -25,6 +25,12 @@ if HAVE_MAC_TWAIN
 twain = twain
 endif
 
+if HAVE_Z
+if HAVE_BZIP2
+file_compressor = file-compressor
+endif
+endif
+
 if HAVE_PNG
 file_ico = file-ico
 endif
@@ -53,6 +59,7 @@ SUBDIRS = \
 	$(pygimp)		\
 	color-rotate		\
 	file-bmp		\
+	$(file_compressor)	\
 	file-faxg3		\
 	file-fits		\
 	file-fli		\

plug-ins/common/Makefile.am

@@ -92,7 +92,6 @@ libexec_PROGRAMS = \
 	engrave \
 	$(FILE_AA) \
 	file-cel \
-	file-compressor \
 	file-csource \
 	file-desktop-link \
 	file-dicom \
@@ -1039,21 +1038,6 @@ file_cel_LDADD = \
 	$(INTLLIBS)		\
 	$(file_cel_RC)
 
-file_compressor_SOURCES = \
-	file-compressor.c
-
-file_compressor_LDADD = \
-	$(libgimp)		\
-	$(libgimpmath)		\
-	$(libgimpconfig)	\
-	$(libgimpcolor)		\
-	$(libgimpbase)		\
-	$(CAIRO_LIBS)		\
-	$(GDK_PIXBUF_LIBS)	\
-	$(RT_LIBS)		\
-	$(INTLLIBS)		\
-	$(file_compressor_RC)
-
 file_csource_SOURCES = \
 	file-csource.c
 

plug-ins/common/plugin-defs.pl

@@ -48,7 +48,6 @@
     'engrave' => { ui => 1 },
     'file-aa' => { ui => 1, optional => 1, libs => 'AA_LIBS' },
     'file-cel' => { ui => 1 },
-    'file-compressor' => {},
     'file-csource' => { ui => 1 },
     'file-desktop-link' => {},
     'file-dicom' => { ui => 1, cflags => '-fno-strict-aliasing' },

plug-ins/file-compressor/.gitignore

@@ -0,0 +1,7 @@
+/Makefile.in
+/Makefile
+/.deps
+/_libs
+/.libs
+/file-compressor
+/file-compressor.exe

plug-ins/file-compressor/Makefile.am

@@ -0,0 +1,37 @@
+## Process this file with automake to produce Makefile.in
+
+libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
+libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
+
+if OS_WIN32
+mwindows = -mwindows
+endif
+
+AM_LDFLAGS = $(mwindows)
+
+libexecdir = $(gimpplugindir)/plug-ins
+
+libexec_PROGRAMS = file-compressor
+
+file_compressor_SOURCES = \
+	file-compressor.c
+
+INCLUDES = \
+	-I$(top_srcdir)	\
+	$(GTK_CFLAGS)	\
+	-I$(includedir)
+
+LDADD = \
+	$(libgimpconfig)	\
+	$(libgimp)		\
+	$(libgimpcolor)		\
+	$(libgimpmath)		\
+	$(libgimpbase)		\
+	$(GTK_LIBS)		\
+	$(RT_LIBS)		\
+	$(INTLLIBS)		\
+	$(Z_LIBS)		\
+	$(BZIP2_LIBS)