Remove some remaining reference to the glue

6 files changed, 12 insertions, 21 deletions

diff --git a/generate_code.py b/generate_code.py
index fa8b9da..8ab5dfb 100644
--- a/generate_code.py
+++ b/generate_code.py
@@ -14,25 +14,20 @@ if __name__ == "__main__":
     parser.add_argument("--gapi-fixup")
     parser.add_argument("--metadata")
     parser.add_argument("--gapi-codegen")
-    parser.add_argument("--glue-file", default="")
-    parser.add_argument("--glue-includes", default="")
+    parser.add_argument("--abi-includes", default="")
     parser.add_argument("--abi-cs-usings", default="")
-    parser.add_argument("--glue-libname", default="")
     parser.add_argument("--assembly-name")
     parser.add_argument("--extra-includes", action='append', default=[])
     parser.add_argument("--out")
     parser.add_argument("--files")
     parser.add_argument("--symbols")
     parser.add_argument("--schema")
-    parser.add_argument("--fakeglue", action='store_true')
+    parser.add_argument("--fake", action='store_true')
 
     opts = parser.parse_args()
-    if opts.fakeglue:
+    if opts.fake:
         exit(0)
 
-    if not opts.glue_libname:
-        opts.glue_libname = opts.assembly_name + 'sharpglue-3'
-
     api_xml = os.path.join(opts.out, os.path.basename(
         opts.api_raw).replace('.raw', '.xml'))
 
@@ -53,10 +48,8 @@ if __name__ == "__main__":
     cmd = [
         opts.gapi_codegen, '--generate', api_xml,
         '--outdir=' + opts.out,
-        '--glue-filename=' + opts.glue_file,
-        '--gluelib-name=' + opts.glue_libname,
-        '--glue-includes=' + opts.glue_includes,
         '--assembly-name=' + opts.assembly_name,
+        '--glue-includes=' + opts.abi_includes,
         '--abi-c-filename=' + os.path.join(opts.out, opts.assembly_name + "-abi.c"),
         '--abi-cs-filename=' + os.path.join(opts.out, opts.assembly_name + "-abi.cs"),
     ]
diff --git a/ges/generated/meson.build b/ges/generated/meson.build
index 0e33643..4a154c5 100644
--- a/ges/generated/meson.build
+++ b/ges/generated/meson.build
@@ -126,7 +126,7 @@ source_gen = custom_target(pkg + '_codegen',
         '--out', meson.current_build_dir(),
         '--files', ';'.join(generated_sources),
         '--assembly-name', pkg,
-        '--glue-includes', 'ges/ges.h',
+        '--abi-includes', 'ges/ges.h',
         '--abi-cs-usings', 'Gst,Gst.Video,Gst.Sdp,Gst.Tags,Gst.Rtsp,Gst.PbUtils,Gst.Net,Gst.FFT,Gst.Controller,Gst.Base,Gst.Audio,Gst.App,GES',
     ],
     depend_files: [raw_api_fname],
@@ -135,13 +135,13 @@ source_gen = custom_target(pkg + '_codegen',
 c_abi = custom_target(pkg + '_c_abi',
         input: raw_api_fname,
         output: pkg + '-abi.c',
-        command: [generate_api, '--fakeglue'],
+        command: [generate_api, '--fake'],
         depends: [source_gen])
 
 cs_abi = custom_target(pkg + '_cs_abi',
         input: raw_api_fname,
         output: pkg + '-abi.cs',
-        command: [generate_api, '--fakeglue'],
+        command: [generate_api, '--fake'],
         depends: [source_gen])
 
 
diff --git a/ges/gst-editing-services-sharp.dll.config b/ges/gst-editing-services-sharp.dll.config
index f6f7333..7d355ab 100644
--- a/ges/gst-editing-services-sharp.dll.config
+++ b/ges/gst-editing-services-sharp.dll.config
@@ -1,8 +1,6 @@
 <configuration>
   <!-- Linux -->
-  <dllmap dll="libgessharpglue-1.0.dll" target="libgessharpglue-1.0.0.so" os="linux"/>
   <dllmap dll="libges-1.0-0.dll" target="libges-1.0.so" os="linux"/>
   <!-- Mac OS X -->
-  <dllmap dll="libgessharpglue-1.0.dll" target="libgessharpglue-1.0.0.so" os="osx"/>
   <dllmap dll="libges-1.0-0.dll" target="libges-1.0.dylib" os="osx"/>
 </configuration>
diff --git a/sources/Makefile.am b/sources/Makefile.am
index 30b7bfb..01efddc 100644
--- a/sources/Makefile.am
+++ b/sources/Makefile.am
@@ -71,7 +71,7 @@ generated-stamp: $(API)
 	$(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GLIB_SHARP_CFLAGS) $(GIO_SHARP_CFLAGS) \
 		--outdir=generated \
 		--glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libgstreamersharpglue-1.0.0.dll \
-		--glue-includes=$(glue_list) \
+		--abi-includes=$(glue_list) \
 	 	--assembly-name=$(ASSEMBLY_NAME) && touch generated-stamp
 
 $(KEYFILE): $(top_srcdir)/gstreamer-sharp.snk
diff --git a/sources/generated/meson.build b/sources/generated/meson.build
index 200edd1..c7c48ef 100644
--- a/sources/generated/meson.build
+++ b/sources/generated/meson.build
@@ -725,7 +725,7 @@ gst_source_gen = custom_target('gst_codegen',
         '--out', meson.current_build_dir(),
         '--files', ';'.join(generated_sources),
         '--assembly-name', meson.project_name(),
-        '--glue-includes', glueincludes,
+        '--abi-includes', abi_includes,
         '--abi-cs-usings', 'Gst,Gst.Video,Gst.Sdp,Gst.Tags,Gst.Rtsp,Gst.PbUtils,Gst.Net,Gst.FFT,Gst.Controller,Gst.Base,Gst.Audio,Gst.App',
     ],
     depend_files: [raw_api_fname],
@@ -734,13 +734,13 @@ gst_source_gen = custom_target('gst_codegen',
 c_abi = custom_target('gst_sharp_c_abi',
         input: raw_api_fname,
         output: 'gstreamer-sharp-abi.c',
-        command: [generate_api, '--fakeglue'],
+        command: [generate_api, '--fake'],
         depends: [gst_source_gen])
 
 cs_abi = custom_target('gst_sharp_cs_abi',
         input: raw_api_fname,
         output: 'gstreamer-sharp-abi.cs',
-        command: [generate_api, '--fakeglue'],
+        command: [generate_api, '--fake'],
         depends: [gst_source_gen])
 
 gst_api_includes = join_paths(meson.current_build_dir(), 'gstreamer-sharp-api.xml')
diff --git a/sources/meson.build b/sources/meson.build
index 306537f..0c150fa 100644
--- a/sources/meson.build
+++ b/sources/meson.build
@@ -1,7 +1,7 @@
 raw_api_fname = join_paths(meson.current_source_dir(), meson.project_name() + '-api.raw')
 metadata = files(meson.project_name() + '.metadata')
 
-glueincludes = 'glib.h,gst/gst.h,gst/video/video.h,gst/audio/audio.h,gst/rtsp/rtsp.h,gst/app/app.h,gst/audio/audio.h,gst/base/base.h,gst/controller/controller.h,gst/fft/fft.h,gst/net/net.h,gst/pbutils/gstaudiovisualizer.h,gst/pbutils/pbutils.h,gst/rtp/rtp.h,gst/rtsp/rtsp.h,gst/sdp/sdp.h,gst/tag/tag.h,gst/video/video.h,gst/video/gstvideoaffinetransformationmeta.h,gst/net/gstnetcontrolmessagemeta.h'
+abi_includes = 'glib.h,gst/gst.h,gst/video/video.h,gst/audio/audio.h,gst/rtsp/rtsp.h,gst/app/app.h,gst/audio/audio.h,gst/base/base.h,gst/controller/controller.h,gst/fft/fft.h,gst/net/net.h,gst/pbutils/gstaudiovisualizer.h,gst/pbutils/pbutils.h,gst/rtp/rtp.h,gst/rtsp/rtsp.h,gst/sdp/sdp.h,gst/tag/tag.h,gst/video/video.h,gst/video/gstvideoaffinetransformationmeta.h,gst/net/gstnetcontrolmessagemeta.h'
 
 sources = [
     'custom/Adapter.cs',