add poppler to the list of plugins

* plug-ins/common/plugin-defs.pl: add poppler to the list of plugins

 	* plug-ins/common/mkgen.pl: add poppler's CFLAGS, and make the
	comment about how plug-ins/common/Makefile.am is autogenerated
	more prominent

plug-ins/common/.cvsignore

@@ -91,6 +91,7 @@ plasma
 png
 pnm
 polar
+poppler
 postscript
 psd
 psd_save

plug-ins/common/Makefile.am

@@ -1,4 +1,12 @@
+
+
+## ---------------------------------------------------------
 ## This file is autogenerated by mkgen.pl and plugin-defs.pl
+## ---------------------------------------------------------
+
+## Modify those two files instead of this one; for most
+## plug-ins you should only need to modify plugin-defs.pl.
+
 
 libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
 libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
@@ -21,12 +29,12 @@ EXTRA_DIST = \
 	plugin-defs.pl
 
 INCLUDES = \
-	-I$(top_srcdir)	  \
-	$(GTK_CFLAGS)	  \
-	$(EXIF_CFLAGS)	  \
-	$(SVG_CFLAGS)	  \
-	$(WMF_CFLAGS)	  \
+	-I$(top_srcdir)	\
+	$(GTK_CFLAGS)	\
+	$(EXIF_CFLAGS)	\
 	$(POPPLER_CFLAGS) \
+	$(SVG_CFLAGS)	\
+	$(WMF_CFLAGS)	\
 	-I$(includedir)
 
 libexec_PROGRAMS = \
@@ -1506,7 +1514,7 @@ poppler_LDADD = \
 	$(libgimpcolor)		\
 	$(libgimpmath)		\
 	$(libgimpbase)		\
-	$(LIBPOPPLER)           \
+	$(LIBPOPPLER)		\
 	$(GTK_LIBS)		\
 	$(RT_LIBS)		\
 	$(INTLLIBS)
@@ -1522,7 +1530,6 @@ postscript_LDADD = \
 	$(libgimpcolor)		\
 	$(libgimpmath)		\
 	$(libgimpbase)		\
-	$(POPPLER_LIBS)         \
 	$(GTK_LIBS)		\
 	$(RT_LIBS)		\
 	$(INTLLIBS)

plug-ins/common/mkgen.pl

@@ -38,7 +38,15 @@ if ($extra) {
 foreach ($bins, $opts) { s/ \\\n$//s }
 
 print MK <<EOT;
+
+
+## ---------------------------------------------------------
 ## This file is autogenerated by mkgen.pl and plugin-defs.pl
+## ---------------------------------------------------------
+
+## Modify those two files instead of this one; for most
+## plug-ins you should only need to modify plugin-defs.pl.
+
 
 libgimpui = \$(top_builddir)/libgimp/libgimpui-\$(GIMP_API_VERSION).la
 libgimpwidgets = \$(top_builddir)/libgimpwidgets/libgimpwidgets-\$(GIMP_API_VERSION).la
@@ -64,6 +72,7 @@ INCLUDES = \\
 	-I\$(top_srcdir)	\\
 	\$(GTK_CFLAGS)	\\
 	\$(EXIF_CFLAGS)	\\
+	\$(POPPLER_CFLAGS) \\
 	\$(SVG_CFLAGS)	\\
 	\$(WMF_CFLAGS)	\\
 	-I\$(includedir)

plug-ins/common/plugin-defs.pl

@@ -88,6 +88,7 @@
     'png' => { libdep => 'gtk', ui => 1, optional => 1 },
     'pnm' => { libdep => 'gtk', ui => 1 },
     'polar' => { libdep => 'gtk', ui => 1 },
+    'poppler' => { libdep => 'gtk', ui => 1, optional => 1 },
     'postscript' => { libdep => 'gtk', ui => 1 },
     'psd' => { libdep => 'glib' },
     'psd_save' => { libdep => 'gtk', ui => 1 },