[gthumb] Partial revert of recent build file changes - see bug 583463

[Michael J. Chudobiak <mjc src gnome org>]

commit f801bf424f425b6a459b63e8cac2869d036ac112
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Thu May 21 13:33:44 2009 -0400

    Partial revert of recent build file changes - see bug 583463
---
 configure.in                    |   16 +-------
 libgthumb/Makefile.am           |   10 ++++
 libgthumb/jpegutils/Makefile.am |    8 +++-
 src/Makefile.am                 |   87 +++++++++++++++++++++++++++++----------
 4 files changed, 83 insertions(+), 38 deletions(-)

diff --git a/configure.in b/configure.in
index 2df763d..df95118 100644
--- a/configure.in
+++ b/configure.in
@@ -259,22 +259,8 @@ fi
 dnl ******************************
 
 AC_ARG_ENABLE(deprecations,AC_HELP_STRING([--enable-deprecations],[warn about deprecated usages]))
-if test "x$enable_deprecations" = "xyes"; then
-        DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED \
-        -DGDK_DISABLE_DEPRECATED \
-        -DGDK_PIXBUF_DISABLE_DEPRECATED \
-        -DGTK_DISABLE_DEPRECATED \
-        -DGNOME_VFS_DISABLE_DEPRECATED \
-        -DGNOME_DISABLE_DEPRECATED"
-        AC_SUBST(DISABLE_DEPRECATED)
-fi
-
-dnl ******************************
 
-WARNINGS="-Wall -Wimplicit -Wunused-label \
--Wpointer-arith -Wcast-align -Wtype-limits \
--Wclobbered -Wempty-body -Wignored-qualifiers"
-AC_SUBST(WARNINGS)
+AM_CONDITIONAL(ENABLE_DEPRECATIONS, test "x$enable_deprecations" = xyes)
 
 dnl ******************************
 
diff --git a/libgthumb/Makefile.am b/libgthumb/Makefile.am
index 5bf9e96..4919cc2 100644
--- a/libgthumb/Makefile.am
+++ b/libgthumb/Makefile.am
@@ -1,6 +1,16 @@
 SUBDIRS = icons cursors jpegutils
 DIST_SUBDIRS = icons cursors jpegutils
 
+if ENABLE_DEPRECATIONS
+DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
+else
+DISABLE_DEPRECATED =
+endif
+
+WARNINGS = -Wall -Wimplicit -Wunused-label \
+	   -Wpointer-arith -Wcast-align -Wtype-limits \
+	   -Wclobbered -Wempty-body -Wignored-qualifiers
+
 gladedir = $(datadir)/gthumb/glade
 
 INCLUDES =							\
diff --git a/libgthumb/jpegutils/Makefile.am b/libgthumb/jpegutils/Makefile.am
index 2574f9f..5cfe3c3 100644
--- a/libgthumb/jpegutils/Makefile.am
+++ b/libgthumb/jpegutils/Makefile.am
@@ -1,9 +1,15 @@
+if ENABLE_DEPRECATIONS
+DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
+else
+DISABLE_DEPRECATED =
+endif
+
 INCLUDES = 				\
 	-I$(top_srcdir)/libgthumb	\
 	$(DISABLE_DEPRECATED)		\
-	$(WARNINGS)			\
 	$(GTHUMB_CFLAGS)
 
+
 noinst_LTLIBRARIES = libgthumb-jpegutils.la
 
 libgthumb_jpegutils_la_SOURCES =	\
diff --git a/src/Makefile.am b/src/Makefile.am
index 2e6d44a..8f32f22 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,13 +3,24 @@ DIST_SUBDIRS = icons
 
 gladedir = $(datadir)/gthumb/glade
 
+if ENABLE_DEPRECATIONS
+DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
+else
+DISABLE_DEPRECATED =
+endif
+
+WARNINGS = -Wall -Wimplicit -Wunused-label \
+	   -Wpointer-arith -Wcast-align -Wtype-limits \
+	   -Wclobbered -Wempty-body -Wignored-qualifiers
+
 INCLUDES =					\
 	-I$(top_srcdir)/libgthumb		\
+	-I../libgthumb				\
 	$(GTHUMB_CFLAGS)			\
+	$(DISABLE_DEPRECATED)			\
 	$(GPHOTO_CFLAGS)			\
 	$(IGE_MAC_INTEGRATION_CFLAGS)		\
 	$(GTKUNIQUE_CFLAGS)			\
-	$(DISABLE_DEPRECATED)			\
 	$(WARNINGS)       			\
 	-DGTHUMB_PREFIX=\"$(prefix)\"		\
 	-DGTHUMB_SYSCONFDIR=\"$(sysconfdir)\"	\
@@ -138,26 +149,7 @@ gthumb_SOURCES = 				\
 	totem-scrsaver.c			\
 	totem-scrsaver.h			\
 	rotation-utils.c			\
-	rotation-utils.h 			\
-	dlg-duplicates.c 			\
-	dlg-duplicates.h 			\
-	dlg-jpegtran.c 				\
-	dlg-jpegtran.h 				\
-	catalog-png-exporter.c			\
-	catalog-png-exporter.h			\
-	dlg-png-exporter.c			\
-	dlg-png-exporter.h 			\
-	dlg-search.c 				\
-	dlg-search.h 				\
-	albumtheme.c				\
-	albumtheme-private.c			\
-	albumtheme-private.h			\
-	catalog-web-exporter.c			\
-	catalog-web-exporter.h			\
-	dlg-web-exporter.c			\
-	dlg-web-exporter.h      		\
-	dlg-photo-importer.c    		\
-	dlg-photo-importer.h
+	rotation-utils.h
 
 if PLATFORM_WIN32
 gthumb_LDFLAGS = -Wl,--export-all-symbols,--out-implib,.libs/gthumb.exe.a
@@ -172,8 +164,59 @@ gthumb_LDADD = 					\
 	$(RENDER_LIBS)				\
 	$(GPHOTO_LIBS)				\
 	$(IGE_MAC_INTEGRATION_LIBS)		\
-	$(XTEST_LIBS)
+	$(XF86GAMMA_LIBS)			\
+	$(XTEST_LIBS)				\
+	$(GTKUNIQUE_LIBS)
+
+moduledir = $(libdir)/gthumb/modules
+module_LTLIBRARIES = 		\
+	libduplicates.la	\
+	libjpegtran.la		\
+	libpngexporter.la	\
+	libsearch.la		\
+	libwebexporter.la	\
+	libphotoimporter.la
+
+libduplicates_la_SOURCES = dlg-duplicates.c dlg-duplicates.h
+libduplicates_la_LDFLAGS = $(MODULE_LIBTOOL_FLAGS)
+libduplicates_la_LIBADD = $(top_builddir)/libgthumb/libgthumb.la $(JPEG_LIBS) $(PNG_LIBS) $(TIFF_LIBS) $(GTHUMB_LIBS)
+libduplicates_la_DEPENDENCIES = gthumb$(EXEEXT)
+
+libjpegtran_la_SOURCES = dlg-jpegtran.c dlg-jpegtran.h
+libjpegtran_la_LDFLAGS = $(MODULE_LIBTOOL_FLAGS)
+libjpegtran_la_LIBADD  = $(top_builddir)/libgthumb/jpegutils/libgthumb-jpegutils.la $(top_builddir)/libgthumb/libgthumb.la $(JPEG_LIBS) $(GTHUMB_LIBS)
+libjpegtran_la_DEPENDENCIES = gthumb$(EXEEXT)
+
+libpngexporter_la_SOURCES = 	\
+	catalog-png-exporter.c	\
+	catalog-png-exporter.h	\
+	dlg-png-exporter.c	\
+	dlg-png-exporter.h
+libpngexporter_la_LDFLAGS = $(MODULE_LIBTOOL_FLAGS)
+libpngexporter_la_LIBADD = $(top_builddir)/libgthumb/libgthumb.la $(GTHUMB_LIBS) $(PNG_LIBS)
+libpngexporter_la_DEPENDENCIES = gthumb$(EXEEXT)
+
+libsearch_la_SOURCES = dlg-search.c dlg-search.h
+libsearch_la_LDFLAGS = $(MODULE_LIBTOOL_FLAGS)
+libsearch_la_LIBADD = $(top_builddir)/libgthumb/libgthumb.la $(JPEG_LIBS) $(TIFF_LIBS) $(PNG_LIBS) $(GTHUMB_LIBS)
+libsearch_la_DEPENDENCIES = gthumb$(EXEEXT)
+
+libwebexporter_la_SOURCES = 	\
+	albumtheme.c		\
+	albumtheme-private.c	\
+	albumtheme-private.h	\
+	catalog-web-exporter.c	\
+	catalog-web-exporter.h	\
+	dlg-web-exporter.c	\
+	dlg-web-exporter.h
+libwebexporter_la_LDFLAGS = $(MODULE_LIBTOOL_FLAGS)
+libwebexporter_la_LIBADD = $(top_builddir)/libgthumb/libgthumb.la $(GTHUMB_LIBS)
+libwebexporter_la_DEPENDENCIES = gthumb$(EXEEXT)
 
+libphotoimporter_la_SOURCES = dlg-photo-importer.c dlg-photo-importer.h
+libphotoimporter_la_LDFLAGS = $(MODULE_LIBTOOL_FLAGS)
+libphotoimporter_la_LIBADD  = $(top_builddir)/libgthumb/jpegutils/libgthumb-jpegutils.la $(top_builddir)/libgthumb/libgthumb.la $(GTHUMB_LIBS) $(JPEG_LIBS) $(GPHOTO_LIBS)
+libphotoimporter_la_DEPENDENCIES = gthumb$(EXEEXT)
 
 AUTHORS.tab : $(top_srcdir)/AUTHORS
 	sed -e 's/^/"/' -e 's/$$/",/' < $(top_srcdir)/AUTHORS > $  tmp