[glib-networking] pkcs11: clean up a few merge errors and bits of cruft

[Dan Winship <danw src gnome org>]

commit 1625751cdc60a4e6d220549296ea225099cece1a
Author: Dan Winship <danw gnome org>
Date:   Wed Nov 16 09:39:31 2011 -0500

    pkcs11: clean up a few merge errors and bits of cruft

 .gitignore             |    6 ------
 tls/gnutls/Makefile.am |   19 ++++++++-----------
 tls/pkcs11/Makefile.am |   11 +++--------
 tls/tests/Makefile.am  |    3 ---
 4 files changed, 11 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5b1c655..675ec0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,14 +37,8 @@ proxy/tests/gnome
 
 /tls/tests/certificate
 /tls/tests/connection
-/tls/tests/tls
 /tls/tests/pkcs11
 /tls/tests/pkcs11-array
 /tls/tests/pkcs11-pin
 /tls/tests/pkcs11-slot
 /tls/tests/pkcs11-util
-/tls/tests/tls-gnutls
-/tls/tests/tls-gnutls-pkcs11
-
-/tls/pkcs11/gpkcs11marshal.c
-/tls/pkcs11/gpkcs11marshal.h
diff --git a/tls/gnutls/Makefile.am b/tls/gnutls/Makefile.am
index 8a8f9e5..1d86c84 100644
--- a/tls/gnutls/Makefile.am
+++ b/tls/gnutls/Makefile.am
@@ -4,18 +4,19 @@ giomodule_LTLIBRARIES = libgiognutls.la
 
 if HAVE_PKCS11
 P11_SRCS = \
-	gtlsbackend-gnutls-pkcs11.c \
-	gtlsbackend-gnutls-pkcs11.h \
-	gtlscertificate-gnutls-pkcs11.c \
-	gtlscertificate-gnutls-pkcs11.h \
+	gtlsbackend-gnutls-pkcs11.c	\
+	gtlsbackend-gnutls-pkcs11.h	\
+	gtlscertificate-gnutls-pkcs11.c	\
+	gtlscertificate-gnutls-pkcs11.h	\
 	gtlsdatabase-gnutls-pkcs11.c	\
 	gtlsdatabase-gnutls-pkcs11.h	\
 	$(NULL)
-P11_LIBADD = \
+P11_LIBADD =				\
 	$(top_builddir)/tls/pkcs11/libgiopkcs11.la \
-	$(PKCS11_LIBS) \
+	$(PKCS11_LIBS)			\
 	$(NULL)
-P11_CFLAGS = \
+P11_CFLAGS =				\
+	-I$(top_srcdir)/tls/		\
 	$(PKCS11_CFLAGS)
 else
 P11_SRCS =
@@ -47,13 +48,9 @@ libgiognutls_la_SOURCES = 		\
 	$(NULL)
 
 INCLUDES +=				\
-	-DG_LOG_DOMAIN=\"GLib-Net\"	\
-	$(GLIB_CFLAGS)			\
 	$(P11_CFLAGS)			\
 	$(LIBGNUTLS_CFLAGS)		\
 	$(LIBGCRYPT_CFLAGS)		\
-	-DG_DISABLE_DEPRECATED		\
-	-I$(top_srcdir)/tls/		\
 	$(NULL)
 
 libgiognutls_la_LDFLAGS = $(module_flags)
diff --git a/tls/pkcs11/Makefile.am b/tls/pkcs11/Makefile.am
index 5e6aa7c..94f3f13 100644
--- a/tls/pkcs11/Makefile.am
+++ b/tls/pkcs11/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 noinst_LTLIBRARIES = \
 	libgiopkcs11.la
 
-libgiopkcs11_la_SOURCES = 		\
+libgiopkcs11_la_SOURCES =			\
 	gpkcs11array.c				\
 	gpkcs11array.h				\
 	gpkcs11pin.c				\
@@ -12,14 +12,9 @@ libgiopkcs11_la_SOURCES = 		\
 	gpkcs11slot.h				\
 	gpkcs11util.c				\
 	gpkcs11util.h				\
-	pkcs11-trust-assertions.h 	\
+	pkcs11-trust-assertions.h		\
 	$(NULL)
 
-libgiopkcs11_la_CFLAGS = \
-	-DG_LOG_DOMAIN=\"GLib-Net\"	\
-	$(GLIB_CFLAGS)			\
+INCLUDES +=					\
 	$(PKCS11_CFLAGS)			\
 	-DG_DISABLE_DEPRECATED
-
-CLEANFILES = 			\
-	$(BUILT_SOURCES)
diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
index f2beb03..4cb84aa 100644
--- a/tls/tests/Makefile.am
+++ b/tls/tests/Makefile.am
@@ -10,9 +10,6 @@ noinst_PROGRAMS = $(TEST_PROGS)
 LDADD  = \
 	$(GLIB_LIBS)
 
-TEST_ENVIRONMENT =   \
-	GIO_EXTRA_MODULES=$(top_builddir)/tls/gnutls/.libs
-
 TEST_PROGS +=         \
 	certificate   \
 	connection    \