libgsf r975 - in trunk: . gsf

[mortenw svn gnome org]

Author: mortenw
Date: Sun Mar 16 22:00:36 2008
New Revision: 975
URL: http://svn.gnome.org/viewvc/libgsf?rev=975&view=rev

Log:
2008-03-16  Morten Welinder  <terra gnome org>

	* gsf/Makefile.am: Don't install gio support in its own library.



Modified:
   trunk/NEWS
   trunk/gsf/Makefile.am

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Mar 16 22:00:36 2008
@@ -1,5 +1,7 @@
 libgsf 1.14.9
 
+Dom:
+	* Revitalize gio support.
 
 --------------------------------------------------------------------------
 libgsf 1.14.8

Modified: trunk/gsf/Makefile.am
==============================================================================
--- trunk/gsf/Makefile.am	(original)
+++ trunk/gsf/Makefile.am	Sun Mar 16 22:00:36 2008
@@ -3,26 +3,24 @@
 
 lib_LTLIBRARIES = libgsf-1.la
 
-libgsf_1_la_LIBADD  = $(LIBGSF_LIBS) $(Z_LIBS) $(BZ2_LIBS)
+if WITH_GIO
+gioc=gsf-input-gio.c gsf-output-gio.c
+gioh=gsf-input-gio.h gsf-output-gio.h
+giola=$(LIBGSF_GIO_LIBS)
+else
+gioc=
+gioh=
+giola=
+endif
+
+
+libgsf_1_la_LIBADD  = $(LIBGSF_LIBS) $(Z_LIBS) $(BZ2_LIBS) $(giola)
 libgsf_1_la_LDFLAGS = -version-info $(VERSION_INFO)
 if WITH_WIN32
   libgsf_1_la_DEPENDENCIES = lib.def
   libgsf_1_la_LDFLAGS += -no-undefined -export-symbols lib.def
 endif
 
-if WITH_GIO
-
-lib_LTLIBRARIES += libgsf-gio-1.la
-
-libgsf_gio_1_la_LIBADD  = $(LIBGSF_LIBS) $(LIBGSF_GIO_LIBS) $(top_builddir)/gsf/libgsf-1.la
-libgsf_gio_1_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
-libgsf_gio_1_la_SOURCES =	\
-	gsf-input-gio.c		\
-	gsf-input-gio.h		\
-	gsf-output-gio.c 	\
-	gsf-output-gio.h
-endif
-
 libgsf_1_la_SOURCES =		\
 	gsf-utils.c		\
 	gsf-libxml.c		\
@@ -72,8 +70,7 @@
 	gsf-blob.c		\
 	gsf-clip-data.c		\
 	\
-	gsf-input-gio.h	\
-	gsf-output-gio.h	\
+	$(gioc)			\
 	version.c
 #	gsf-output-transaction.c	\
 #	gsf-command-context.c	\
@@ -130,6 +127,8 @@
 	gsf-meta-names.h	\
 	gsf-blob.h		\
 	gsf-clip-data.h
+	\
+	$(gioh)
 #	gsf-command-context.h	\
 #	gsf-io-context.h