[gupnp-dlna/wip/new-api: 20/48] Move information classes one directory lower.

[Jens Georg <jensgeorg src gnome org>]

commit 479cb52d37bffe09ddad68ce105cf1e669d5fc5c
Author: Krzesimir Nowak <krnowak openismus com>
Date:   Wed Jan 2 13:26:31 2013 +0100

    Move information classes one directory lower.
    
    They are going to be used in GUPnPDLNAProfileGuesser new API for
    guessing profile from info.
    
    Also, I will probably remove the gupnp-dlna and gupnp-dlna-metadata
    split soon - it all sits in a single library anyway.

 gupnp-dlna-metadata-2.0.pc.in                      |    3 +-
 libgupnp-dlna/Makefile.am                          |   33 ++++++++++++++------
 .../{metadata => }/gupnp-dlna-audio-information.c  |    0
 .../{metadata => }/gupnp-dlna-audio-information.h  |    0
 .../gupnp-dlna-container-information.c             |    0
 .../gupnp-dlna-container-information.h             |    0
 .../{metadata => }/gupnp-dlna-image-information.c  |    0
 .../{metadata => }/gupnp-dlna-image-information.h  |    0
 .../{metadata => }/gupnp-dlna-information.c        |    0
 .../{metadata => }/gupnp-dlna-information.h        |    0
 libgupnp-dlna/{metadata => }/gupnp-dlna-values.h   |    0
 .../{metadata => }/gupnp-dlna-video-information.c  |    0
 .../{metadata => }/gupnp-dlna-video-information.h  |    0
 libgupnp-dlna/metadata/metadata.am                 |   16 ---------
 14 files changed, 24 insertions(+), 28 deletions(-)
---
diff --git a/gupnp-dlna-metadata-2.0.pc.in b/gupnp-dlna-metadata-2.0.pc.in
index c40f95d..cd6fb4f 100644
--- a/gupnp-dlna-metadata-2.0.pc.in
+++ b/gupnp-dlna-metadata-2.0.pc.in
@@ -7,6 +7,5 @@ plugindir= METADATA_DIRECTORY@
 Name: gupnp-dlna-metadata-2.0
 Description: Metadata extractor plugin development files for GUPnP-DLNA
 Version: @VERSION@
-Libs: -L${libdir} -lgupnp-dlna-2.0
 Cflags: -I${includedir}/gupnp-dlna-2.0/metadata
-Requires: glib-2.0 gobject-2.0
+Requires: glib-2.0 gobject-2.0 gupnp-dlna-2.0
diff --git a/libgupnp-dlna/Makefile.am b/libgupnp-dlna/Makefile.am
index 351d4ab..fb2e382 100644
--- a/libgupnp-dlna/Makefile.am
+++ b/libgupnp-dlna/Makefile.am
@@ -108,7 +108,11 @@ libmetadata_la_CFLAGS = \
 libgupnp_dlna_2_0_la_LDFLAGS = \
 	$(gupnp_ldflags)
 libgupnp_dlna_2_0_la_SOURCES = \
-	$(metadata_general_sources) \
+	gupnp-dlna-audio-information.c \
+	gupnp-dlna-container-information.c \
+	gupnp-dlna-image-information.c \
+	gupnp-dlna-information.c \
+	gupnp-dlna-video-information.c \
 	gupnp-dlna-field-value.c \
 	gupnp-dlna-profile-backend.c \
 	gupnp-dlna-profile.c \
@@ -132,18 +136,18 @@ libgupnp_dlna_inc_HEADERS = \
 	gupnp-dlna-profile.h \
 	gupnp-dlna-restriction.h \
 	gupnp-dlna-value-list.h \
-	gupnp-dlna-g-values.h
+	gupnp-dlna-g-values.h \
+	gupnp-dlna-audio-information.h \
+	gupnp-dlna-container-information.h \
+	gupnp-dlna-image-information.h \
+	gupnp-dlna-video-information.h \
+	gupnp-dlna-information.h \
+	gupnp-dlna-values.h
 
 libgupnp_dlna_metadata_incdir = \
 	$(libgupnp_dlna_incdir)/metadata
 libgupnp_dlna_metadata_inc_HEADERS = \
-	metadata/gupnp-dlna-audio-information.h \
-	metadata/gupnp-dlna-container-information.h \
-	metadata/gupnp-dlna-image-information.h \
-	metadata/gupnp-dlna-video-information.h \
-	metadata/gupnp-dlna-information.h \
-	metadata/gupnp-dlna-metadata-extractor.h \
-	metadata/gupnp-dlna-values.h
+	metadata/gupnp-dlna-metadata-extractor.h
 
 dist_noinst_HEADERS += \
 	gupnp-dlna-field-value.h \
@@ -170,7 +174,16 @@ girs = GUPnPDLNA-2.0.gir
 
 introspection_sources = \
 	$(libgupnp_dlna_inc_HEADERS) \
-	$(libgupnp_dlna_inc_HEADERS:.h=.c)
+	gupnp-dlna-profile-guesser.c \
+	gupnp-dlna-profile.c \
+	gupnp-dlna-restriction.c \
+	gupnp-dlna-value-list.c \
+	gupnp-dlna-g-values.c \
+	gupnp-dlna-audio-information.c \
+	gupnp-dlna-container-information.c \
+	gupnp-dlna-image-information.c \
+	gupnp-dlna-video-information.c \
+	gupnp-dlna-information.c
 
 GUPnPDLNA-2.0.gir: libgupnp-dlna-2.0.la
 GUPnPDLNA_2_0_gir_FILES = $(introspection_sources)
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-audio-information.c b/libgupnp-dlna/gupnp-dlna-audio-information.c
similarity index 100%
rename from libgupnp-dlna/metadata/gupnp-dlna-audio-information.c
rename to libgupnp-dlna/gupnp-dlna-audio-information.c
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-audio-information.h b/libgupnp-dlna/gupnp-dlna-audio-information.h
similarity index 100%
rename from libgupnp-dlna/metadata/gupnp-dlna-audio-information.h
rename to libgupnp-dlna/gupnp-dlna-audio-information.h
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-container-information.c b/libgupnp-dlna/gupnp-dlna-container-information.c
similarity index 100%
rename from libgupnp-dlna/metadata/gupnp-dlna-container-information.c
rename to libgupnp-dlna/gupnp-dlna-container-information.c
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-container-information.h b/libgupnp-dlna/gupnp-dlna-container-information.h
similarity index 100%
rename from libgupnp-dlna/metadata/gupnp-dlna-container-information.h
rename to libgupnp-dlna/gupnp-dlna-container-information.h
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-image-information.c b/libgupnp-dlna/gupnp-dlna-image-information.c
similarity index 100%
rename from libgupnp-dlna/metadata/gupnp-dlna-image-information.c
rename to libgupnp-dlna/gupnp-dlna-image-information.c
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-image-information.h b/libgupnp-dlna/gupnp-dlna-image-information.h
similarity index 100%
rename from libgupnp-dlna/metadata/gupnp-dlna-image-information.h
rename to libgupnp-dlna/gupnp-dlna-image-information.h
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-information.c b/libgupnp-dlna/gupnp-dlna-information.c
similarity index 100%
rename from libgupnp-dlna/metadata/gupnp-dlna-information.c
rename to libgupnp-dlna/gupnp-dlna-information.c
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-information.h b/libgupnp-dlna/gupnp-dlna-information.h
similarity index 100%
rename from libgupnp-dlna/metadata/gupnp-dlna-information.h
rename to libgupnp-dlna/gupnp-dlna-information.h
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-values.h b/libgupnp-dlna/gupnp-dlna-values.h
similarity index 100%
rename from libgupnp-dlna/metadata/gupnp-dlna-values.h
rename to libgupnp-dlna/gupnp-dlna-values.h
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-video-information.c b/libgupnp-dlna/gupnp-dlna-video-information.c
similarity index 100%
rename from libgupnp-dlna/metadata/gupnp-dlna-video-information.c
rename to libgupnp-dlna/gupnp-dlna-video-information.c
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-video-information.h b/libgupnp-dlna/gupnp-dlna-video-information.h
similarity index 100%
rename from libgupnp-dlna/metadata/gupnp-dlna-video-information.h
rename to libgupnp-dlna/gupnp-dlna-video-information.h
diff --git a/libgupnp-dlna/metadata/metadata.am b/libgupnp-dlna/metadata/metadata.am
index 2a19138..c0abb3b 100644
--- a/libgupnp-dlna/metadata/metadata.am
+++ b/libgupnp-dlna/metadata/metadata.am
@@ -1,18 +1,2 @@
 metadata_metadata_sources = \
 	metadata/gupnp-dlna-metadata-extractor.c
-
-metadata_general_sources = \
-	metadata/gupnp-dlna-audio-information.c \
-	metadata/gupnp-dlna-container-information.c \
-	metadata/gupnp-dlna-image-information.c \
-	metadata/gupnp-dlna-information.c \
-	metadata/gupnp-dlna-video-information.c
-
-metadata_semi_public_headers = \
-	metadata/gupnp-dlna-audio-information.h \
-	metadata/gupnp-dlna-container-information.h \
-	metadata/gupnp-dlna-image-information.h \
-	metadata/gupnp-dlna-information.h \
-	metadata/gupnp-dlna-metadata-extractor.h \
-	metadata/gupnp-dlna-values.h \
-	metadata/gupnp-dlna-video-information.h