Merge pull request #257 from RidgeRun/feature/change-libgstd-header-name

Change libgstd header name to gstd
RidgeRun · Sep 30, 2021 · c730aed · c730aed
2 parents 09d3d88 + 55d7326
commit c730aed
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/gstd/gstd.c b/gstd/gstd.c
@@ -23,11 +23,10 @@
 
 #include <stdlib.h>
 
+#include "gstd.h"
 #include "gstd_daemon.h"
 #include "gstd_log.h"
 
-#include "libgstd.h"
-
 #define HEADER \
       "\nGstD version " PACKAGE_VERSION "\n" \
       "Copyright (C) 2015-2021 RidgeRun (https://www.ridgerun.com)\n\n"

diff --git a/libgstd/Makefile.am b/libgstd/Makefile.am
@@ -2,8 +2,8 @@ lib_LTLIBRARIES = libgstd-@[email protected]
 
 gstdincludedir = $(includedir)/gstd
 gstdinclude_HEADERS =                               \
-             gstd_return_codes.h                    \
-             libgstd.h
+             gstd.h                                 \
+             gstd_return_codes.h
 
 libgstd_@GSTD_API_VERSION@_la_SOURCES =             \
              gstd_bus_msg.c                         \

diff --git a/libgstd/libgstd.h → libgstd/gstd.h b/libgstd/libgstd.h → libgstd/gstd.h
diff --git a/libgstd/gstd_object.h b/libgstd/gstd_object.h
@@ -21,14 +21,13 @@
 
 #include <gstd_return_codes.h>
 
+#include "gstd.h"
 #include "gstd_icreator.h"
 #include "gstd_ideleter.h"
 #include "gstd_iformatter.h"
 #include "gstd_ireader.h"
 #include "gstd_iupdater.h"
 
-#include "libgstd.h"
-
 typedef struct _GstdIFormatter GstdIFormatter;
 
 G_BEGIN_DECLS

diff --git a/libgstd/libgstd.c b/libgstd/libgstd.c
@@ -32,7 +32,7 @@
 
 #define _GNU_SOURCE
 
-#include "libgstd.h"
+#include "gstd.h"
 
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/libgstd/meson.build b/libgstd/meson.build
@@ -1,6 +1,6 @@
 gstd_headers = [
+  'gstd.h',
   'gstd_return_codes.h',
-  'libgstd.h',
 ]
 
 # Common files needed for GstD and libGstD