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.

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
index 3fd7ca6..3fd7ca6 100644
--- a/libgupnp-dlna/metadata/gupnp-dlna-audio-information.c
+++ b/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
index 487723a..487723a 100644
--- a/libgupnp-dlna/metadata/gupnp-dlna-audio-information.h
+++ b/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
index b96c2fb..b96c2fb 100644
--- a/libgupnp-dlna/metadata/gupnp-dlna-container-information.c
+++ b/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
index d130fc2..d130fc2 100644
--- a/libgupnp-dlna/metadata/gupnp-dlna-container-information.h
+++ b/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
index 9551cc3..9551cc3 100644
--- a/libgupnp-dlna/metadata/gupnp-dlna-image-information.c
+++ b/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
index 79e47d9..79e47d9 100644
--- a/libgupnp-dlna/metadata/gupnp-dlna-image-information.h
+++ b/libgupnp-dlna/gupnp-dlna-image-information.h
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-information.c b/libgupnp-dlna/gupnp-dlna-information.c
index 7d1ea8d..7d1ea8d 100644
--- a/libgupnp-dlna/metadata/gupnp-dlna-information.c
+++ b/libgupnp-dlna/gupnp-dlna-information.c
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-information.h b/libgupnp-dlna/gupnp-dlna-information.h
index a5155e9..a5155e9 100644
--- a/libgupnp-dlna/metadata/gupnp-dlna-information.h
+++ b/libgupnp-dlna/gupnp-dlna-information.h
diff --git a/libgupnp-dlna/metadata/gupnp-dlna-values.h b/libgupnp-dlna/gupnp-dlna-values.h
index c80dfe0..c80dfe0 100644
--- a/libgupnp-dlna/metadata/gupnp-dlna-values.h
+++ b/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
index eff3a92..eff3a92 100644
--- a/libgupnp-dlna/metadata/gupnp-dlna-video-information.c
+++ b/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
index 4d25c90..4d25c90 100644
--- a/libgupnp-dlna/metadata/gupnp-dlna-video-information.h
+++ b/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