Add pkgconfig files and a -1.0 to the library names

10 files changed, 62 insertions, 24 deletions

diff --git a/configure.ac b/configure.ac
index 48f14dd..a13eca1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,9 @@ Makefile
 data/Makefile
 src/Makefile
 src/goa/Makefile
+src/goa/goa-1.0.pc
 src/goabackend/Makefile
+src/goabackend/goa-backend-1.0.pc
 src/daemon/Makefile
 src/panel/Makefile
 src/examples/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c867b7e..fb74279 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -36,8 +36,8 @@ INCLUDES = \
 GTKDOC_LIBS = 							\
 	$(GLIB_LIBS)						\
 	$(GIO_LIBS)						\
-	$(top_builddir)/src/goa/libgoa.la			\
-	$(top_builddir)/src/goabackend/libgoa-backend.la	\
+	$(top_builddir)/src/goa/libgoa-1.0.la			\
+	$(top_builddir)/src/goabackend/libgoa-backend-1.0.la	\
 	$(NULL)
 
 # Extra options to supply to gtkdoc-mkdb
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 32bf722..42e0dcd 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -34,8 +34,8 @@ goa_daemon_CFLAGS =						\
 
 goa_daemon_LDADD = 						\
 	$(GLIB_LIBS) 						\
-	$(top_builddir)/src/goa/libgoa.la			\
-	$(top_builddir)/src/goabackend/libgoa-backend.la	\
+	$(top_builddir)/src/goa/libgoa-1.0.la			\
+	$(top_builddir)/src/goabackend/libgoa-backend-1.0.la	\
 	$(GTK_LIBS)						\
 	$(LIBNOTIFY_LIBS)					\
 	$(REST_LIBS)						\
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 1d2c2d9..7b423f4 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -27,7 +27,7 @@ mail_monitor_CFLAGS =						\
 
 mail_monitor_LDADD = 						\
 	$(GLIB_LIBS) 						\
-	$(top_builddir)/src/goa/libgoa.la			\
+	$(top_builddir)/src/goa/libgoa-1.0.la			\
 	$(NULL)
 
 clean-local :
diff --git a/src/goa/Makefile.am b/src/goa/Makefile.am
index 2458cae..0e3cf87 100644
--- a/src/goa/Makefile.am
+++ b/src/goa/Makefile.am
@@ -37,7 +37,7 @@ goaenumtypes.h: goaenums.h goaenumtypes.h.template
 	 cd $(srcdir) && glib-mkenums --template goaenumtypes.h.template goaenums.h ) > 	\
 	   goaenumtypes.h.tmp && mv goaenumtypes.h.tmp goaenumtypes.h
 
-goaenumtypes.c: goaenums.h goaenumtypes.c.template
+goaenumtypes.c: goaenums.h goaenumtypes.h goaenumtypes.c.template
 	( top_builddir=`cd $(top_builddir) && pwd`; 						\
 	 cd $(srcdir) && glib-mkenums --template goaenumtypes.c.template goaenums.h ) > 	\
 	   goaenumtypes.c.tmp && mv goaenumtypes.c.tmp goaenumtypes.c
@@ -48,20 +48,21 @@ enum_built_sources =							\
 
 # ----------------------------------------------------------------------------------------------------
 
-lib_LTLIBRARIES = libgoa.la
+lib_LTLIBRARIES = libgoa-1.0.la
 
-libgoa_ladir = $(includedir)/goa/goa
+libgoa_1_0_ladir = $(includedir)/goa-1.0/goa
 
-libgoa_la_HEADERS =						\
+libgoa_1_0_la_HEADERS =						\
 	goa.h							\
 	goaclient.h						\
 	goaerror.h						\
 	goatypes.h						\
 	goaenums.h						\
 	goaenumtypes.h						\
+	goa-generated.h						\
 	$(NULL)
 
-libgoa_la_SOURCES =						\
+libgoa_1_0_la_SOURCES =						\
 	goa.h							\
 	goaclient.h			goaclient.c		\
 	goaerror.h			goaerror.c		\
@@ -71,15 +72,22 @@ libgoa_la_SOURCES =						\
 	goaenumtypes.h			goaenumtypes.c		\
 	$(NULL)
 
-libgoa_la_CFLAGS =						\
+libgoa_1_0_la_CFLAGS =						\
 	-DGOA_COMPILATION					\
 	$(GLIB_CFLAGS) 						\
 	$(NULL)
 
-libgoa_la_LIBADD = 						\
+libgoa_1_0_la_LIBADD = 						\
 	$(GLIB_LIBS) 						\
 	$(NULL)
 
+# ----------------------------------------------------------------------------------------------------
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = goa-1.0.pc
+
+# ----------------------------------------------------------------------------------------------------
+
 if HAVE_INTROSPECTION
 girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = Goa-1.0.gir
@@ -87,13 +95,13 @@ gir_DATA = Goa-1.0.gir
 typelibsdir = $(INTROSPECTION_TYPELIBDIR)
 typelibs_DATA = Goa-1.0.typelib
 
-Goa-1.0.gir: libgoa.la $(INTROSPECTION_SCANNER) Makefile.am
+Goa-1.0.gir: libgoa-1.0.la $(INTROSPECTION_SCANNER) Makefile.am
 	$(INTROSPECTION_SCANNER) -v 				\
 		--warn-all					\
 		--namespace Goa 				\
 		--nsversion=1.0 				\
 		--include=Gio-2.0 				\
-		--library=goa		 			\
+		--library=goa-1.0	 			\
 		--output $@ 					\
 		--pkg=glib-2.0 					\
 		--pkg=gobject-2.0 				\
@@ -102,7 +110,7 @@ Goa-1.0.gir: libgoa.la $(INTROSPECTION_SCANNER) Makefile.am
 		--c-include='goa/goa.h'				\
                 -I$(top_srcdir)/src	 			\
 	        -DGOA_COMPILATION                   		\
-		$(libgoa_la_SOURCES)				\
+		$(libgoa_1_0_la_SOURCES)			\
 		$(NULL)
 
 Goa-1.0.typelib: Goa-1.0.gir $(INTROSPECTION_COMPILER)
diff --git a/src/goa/goa-1.0.pc.in b/src/goa/goa-1.0.pc.in
new file mode 100644
index 0000000..92b1f62
--- /dev/null
+++ b/src/goa/goa-1.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Goa
+Description: GNOME Online Accounts Library
+Version: @VERSION@
+Requires: gio-2.0
+Libs: -L${libdir} -lgoa-1.0
+Cflags: -I${includedir}/goa-1.0
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index 04b2c6c..2f9e5e9 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -34,11 +34,11 @@ enum_built_sources =							\
 
 # ----------------------------------------------------------------------------------------------------
 
-lib_LTLIBRARIES = libgoa-backend.la
+lib_LTLIBRARIES = libgoa-backend-1.0.la
 
-libgoa_backend_ladir = $(includedir)/goa/goabackend
+libgoa_backend_1_0_ladir = $(includedir)/goa-1.0/goabackend
 
-libgoa_backend_la_HEADERS =						\
+libgoa_backend_1_0_la_HEADERS =						\
 	goabackend.h							\
 	goabackendtypes.h						\
 	goabackendenums.h						\
@@ -53,9 +53,10 @@ libgoa_backend_la_HEADERS =						\
 	goaimapauth.h							\
 	goaimapauthoauth.h						\
 	goaimapclient.h							\
+	goaimapmail.h							\
 	$(NULL)
 
-libgoa_backend_la_SOURCES =						\
+libgoa_backend_1_0_la_SOURCES =						\
 	goabackend.h							\
 	goabackendtypes.h						\
 	goabackendenums.h						\
@@ -73,7 +74,7 @@ libgoa_backend_la_SOURCES =						\
 	goaimapmail.h			goaimapmail.c			\
 	$(NULL)
 
-libgoa_backend_la_CFLAGS =					\
+libgoa_backend_1_0_la_CFLAGS =					\
 	-DGOA_BACKEND_COMPILATION				\
 	-DGOA_API_IS_SUBJECT_TO_CHANGE				\
 	$(WEBKIT_GTK_CFLAGS)					\
@@ -84,7 +85,7 @@ libgoa_backend_la_CFLAGS =					\
 	$(REST_CFLAGS)						\
 	$(NULL)
 
-libgoa_backend_la_LIBADD = 					\
+libgoa_backend_1_0_la_LIBADD = 					\
 	$(WEBKIT_GTK_LIBS)					\
 	$(JSON_GLIB_LIBS)					\
 	$(GLIB_LIBS) 						\
@@ -95,5 +96,10 @@ libgoa_backend_la_LIBADD = 					\
 
 # ----------------------------------------------------------------------------------------------------
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = goa-backend-1.0.pc
+
+# ----------------------------------------------------------------------------------------------------
+
 clean-local :
 	rm -f *~ $(enum_built_sources)
diff --git a/src/goabackend/goa-backend-1.0.pc.in b/src/goabackend/goa-backend-1.0.pc.in
new file mode 100644
index 0000000..7a0e8ff
--- /dev/null
+++ b/src/goabackend/goa-backend-1.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Goa Backends
+Description: Backends for GNOME Online Accounts Library
+Version: @VERSION@
+Requires: goa-1.0,gtk+-3.0
+Libs: -L${libdir} -lgoa-backend-1.0
+Cflags: -I${includedir}/goa-1.0
diff --git a/src/goabackend/goabackend.h b/src/goabackend/goabackend.h
index 670d513..536f8b3 100644
--- a/src/goabackend/goabackend.h
+++ b/src/goabackend/goabackend.h
@@ -24,7 +24,7 @@
 #define __GOA_BACKEND_H__
 
 #if !defined(GOA_BACKEND_API_IS_SUBJECT_TO_CHANGE) && !defined(GOA_BACKEND_COMPILATION)
-#error  libgoa-backend is unstable API. You must define GOA_API_IS_SUBJECT_TO_CHANGE before including goabackend/goabackend.h
+#error  libgoa-backend is unstable API. You must define GOA_BACKEND_API_IS_SUBJECT_TO_CHANGE before including goabackend/goabackend.h
 #endif
 
 #define __GOA_BACKEND_INSIDE_GOA_BACKEND_H__
diff --git a/src/panel/Makefile.am b/src/panel/Makefile.am
index e51878a..e167f0b 100644
--- a/src/panel/Makefile.am
+++ b/src/panel/Makefile.am
@@ -39,8 +39,8 @@ libgoa_panel_la_LIBADD = 					\
 	$(GLIB_LIBS) 						\
 	$(GTK_LIBS)						\
 	$(GNOME_CONTROL_CENTER_LIBS)				\
-	$(top_builddir)/src/goa/libgoa.la			\
-	$(top_builddir)/src/goabackend/libgoa-backend.la	\
+	$(top_builddir)/src/goa/libgoa-1.0.la			\
+	$(top_builddir)/src/goabackend/libgoa-backend-1.0.la	\
 	$(NULL)
 
 clean-local :