From 4aaca5cc340d224a1c5ff7d7c2b000be94fe4d98 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sun, 26 May 2002 21:21:37 +0000 Subject: [PATCH] Small fixes, use some wierd hack to make the plugin a .so Original commit message from CVS: Small fixes, use some wierd hack to make the plugin a .so --- examples/plugins/Makefile.am | 7 +++++-- examples/plugins/example.c | 3 ++- examples/plugins/example.h | 2 +- tests/old/examples/plugins/Makefile.am | 7 +++++-- tests/old/examples/plugins/example.c | 3 ++- tests/old/examples/plugins/example.h | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/examples/plugins/Makefile.am b/examples/plugins/Makefile.am index 17a6bd6466..71070f80b0 100644 --- a/examples/plugins/Makefile.am +++ b/examples/plugins/Makefile.am @@ -1,7 +1,10 @@ -noinst_LTLIBRARIES = libexample.la +plugindir=/dev/null + +plugin_LTLIBRARIES = libexample.la libexample_la_SOURCES = example.c libexample_la_CFLAGS = $(GST_CFLAGS) libexample_la_LIBADD = +libexample_la_LDFLAGS = $(GST_LDFLAGS) -noinst_HEADERS = example.h +noinst_HEADERS = example.h diff --git a/examples/plugins/example.c b/examples/plugins/example.c index 29861a27f9..a572c46af3 100644 --- a/examples/plugins/example.c +++ b/examples/plugins/example.c @@ -120,7 +120,8 @@ gst_example_get_type(void) if (!example_type) { static const GTypeInfo example_info = { - sizeof(GstExampleClass), NULL, + sizeof(GstExampleClass), + NULL, NULL, (GClassInitFunc)gst_example_class_init, NULL, diff --git a/examples/plugins/example.h b/examples/plugins/example.h index 9d7304585d..b397e1e027 100644 --- a/examples/plugins/example.h +++ b/examples/plugins/example.h @@ -72,7 +72,7 @@ struct _GstExampleClass { (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_EXAMPLE,GstExample)) /* The third is a checking cast of the class instead of the object. */ #define GST_EXAMPLE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_EXAMPLE,GstExample)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_EXAMPLE,GstExampleClass)) /* The last two simply check to see if the passed pointer is an object or * class of the correct type. */ #define GST_IS_EXAMPLE(obj) \ diff --git a/tests/old/examples/plugins/Makefile.am b/tests/old/examples/plugins/Makefile.am index 17a6bd6466..71070f80b0 100644 --- a/tests/old/examples/plugins/Makefile.am +++ b/tests/old/examples/plugins/Makefile.am @@ -1,7 +1,10 @@ -noinst_LTLIBRARIES = libexample.la +plugindir=/dev/null + +plugin_LTLIBRARIES = libexample.la libexample_la_SOURCES = example.c libexample_la_CFLAGS = $(GST_CFLAGS) libexample_la_LIBADD = +libexample_la_LDFLAGS = $(GST_LDFLAGS) -noinst_HEADERS = example.h +noinst_HEADERS = example.h diff --git a/tests/old/examples/plugins/example.c b/tests/old/examples/plugins/example.c index 29861a27f9..a572c46af3 100644 --- a/tests/old/examples/plugins/example.c +++ b/tests/old/examples/plugins/example.c @@ -120,7 +120,8 @@ gst_example_get_type(void) if (!example_type) { static const GTypeInfo example_info = { - sizeof(GstExampleClass), NULL, + sizeof(GstExampleClass), + NULL, NULL, (GClassInitFunc)gst_example_class_init, NULL, diff --git a/tests/old/examples/plugins/example.h b/tests/old/examples/plugins/example.h index 9d7304585d..b397e1e027 100644 --- a/tests/old/examples/plugins/example.h +++ b/tests/old/examples/plugins/example.h @@ -72,7 +72,7 @@ struct _GstExampleClass { (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_EXAMPLE,GstExample)) /* The third is a checking cast of the class instead of the object. */ #define GST_EXAMPLE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_EXAMPLE,GstExample)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_EXAMPLE,GstExampleClass)) /* The last two simply check to see if the passed pointer is an object or * class of the correct type. */ #define GST_IS_EXAMPLE(obj) \ -- 2.34.1