[identica-glib] Make libs and Cflags parametrics as well

[Davide Italiano <davit src gnome org>]

commit 1fa0fc5e2acfee17cd7fc62fda2115a2132347a7
Author: Davide Italiano <davide italiano gmail com>
Date:   Sun Jun 12 20:33:27 2011 +0200

    Make libs and Cflags parametrics as well

 configure.ac                    |   14 ++++++++------
 identica-glib/tests/Makefile.am |   16 ++++++++--------
 2 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 99173f1..2cb1123 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,12 +31,14 @@ AC_ISC_POSIX
 AC_HEADER_STDC
 AC_C_CONST
 
-PKG_CHECK_MODULES(JSON_GLIB, json-glib-1.0 >= json_glib_req_version)
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= glib_req_version)
-PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= soup_req_version)
-PKG_CHECK_MODULES(REST, rest-0.7 rest-extras-0.7 >= rest_req_version)
-
-AC_SUBST(LIBSOUP_LIBS)
+PKG_CHECK_MODULES(IDENTICA, json-glib-1.0 >= json_glib_req_version 	 dnl
+			    glib-2.0 >= glib_req_version 	   	 dnl
+			    libsoup-2.4 >= soup_req_version 	   	 dnl
+			    rest-0.7 rest-extras-0.7 >= rest_req_version dnl
+			    )	
+
+AC_SUBST(IDENTICA_CFLAGS)
+AC_SUBST(IDENTICA_LIBS)
 
 AC_CONFIG_FILES([Makefile
 		identica-glib/Makefile
diff --git a/identica-glib/tests/Makefile.am b/identica-glib/tests/Makefile.am
index 2c61c97..4fc51ce 100644
--- a/identica-glib/tests/Makefile.am
+++ b/identica-glib/tests/Makefile.am
@@ -2,18 +2,18 @@ bin_PROGRAMS = update timeline user generic
 src_dir = identica-glib 
 
 update_SOURCES = ../auth.c ../auth.h ../init.c ../init.h ../parse.c ../parse.h ../status.c ../status.h ../timeline.c ../timeline.h ../user.c ../user.h update_test.c
-update_CFLAGS = -pthread -I/usr/include/rest-0.7 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/json-glib-1.0 -I/usr/include/glib-1.2 -I/usr/lib/glib/include  
-update_LDFLAGS = -lrest-0.7 -lsoup-2.4 -lxml2 -lgio-2.0 -lgmodule-2.0 -ljson-glib-1.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lglib -pthread 
+update_CFLAGS = $(IDENTICA_CFLAGS)  
+update_LDFLAGS = $(IDENTICA_LIBS) 
 
 timeline_SOURCES = ../auth.c ../auth.h ../init.c ../init.h ../parse.c ../parse.h ../status.c ../status.h ../timeline.c ../timeline.h ../user.c ../user.h timeline_test.c
-timeline_CFLAGS = -pthread -I/usr/include/rest-0.7 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/json-glib-1.0 -I/usr/include/glib-1.2 -I/usr/lib/glib/include  
-timeline_LDFLAGS = -lrest-0.7 -lsoup-2.4 -lxml2 -lgio-2.0 -lgmodule-2.0 -ljson-glib-1.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lglib -pthread 
+timeline_CFLAGS = $(IDENTICA_CFLAGS)  
+timeline_LDFLAGS = $(IDENTICA_LIBS) 
 
 user_SOURCES = ../auth.c ../auth.h ../init.c ../init.h ../parse.c ../parse.h ../status.c ../status.h ../timeline.c ../timeline.h ../user.c ../user.h user_test.c
-user_CFLAGS = -pthread -I/usr/include/rest-0.7 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/json-glib-1.0 -I/usr/include/glib-1.2 -I/usr/lib/glib/include  
-user_LDFLAGS = -lrest-0.7 -lsoup-2.4 -lxml2 -lgio-2.0 -lgmodule-2.0 -ljson-glib-1.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lglib -pthread 
+user_CFLAGS = $(IDENTICA_CFLAGS)  
+user_LDFLAGS = $(IDENTICA_LIBS) 
 
 generic_SOURCES = ../auth.c ../auth.h ../init.c ../init.h ../parse.c ../parse.h ../status.c ../status.h ../timeline.c ../timeline.h ../user.c ../user.h generic_test.c
-generic_CFLAGS = -pthread -I/usr/include/rest-0.7 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -I/usr/include/json-glib-1.0 -I/usr/include/glib-1.2 -I/usr/lib/glib/include  
-generic_LDFLAGS = -lrest-0.7 -lsoup-2.4 -lxml2 -lgio-2.0 -lgmodule-2.0 -ljson-glib-1.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lglib -pthread 
+generic_CFLAGS = $(IDENTICA_CFLAGS)  
+generic_LDFLAGS = $(IDENTICA_LIBS)