Commit 39e45a84 authored by Olivier Crête's avatar Olivier Crête 👻

Makefile.am: Export *_get_type() symbols like meson does

parent 7587da3f
...@@ -30,6 +30,15 @@ CLEANFILES += $(BUILT_SOURCES) ...@@ -30,6 +30,15 @@ CLEANFILES += $(BUILT_SOURCES)
noinst_LTLIBRARIES = libagent.la noinst_LTLIBRARIES = libagent.la
pkginclude_HEADERS = \
agent.h \
candidate.h \
debug.h \
address.h \
interfaces.h \
pseudotcp.h \
$(NULL)
libagent_la_SOURCES = \ libagent_la_SOURCES = \
address.h \ address.h \
address.c \ address.c \
...@@ -60,22 +69,22 @@ libagent_la_SOURCES = \ ...@@ -60,22 +69,22 @@ libagent_la_SOURCES = \
outputstream.c \ outputstream.c \
$(BUILT_SOURCES) $(BUILT_SOURCES)
agent-enum-types.h: agent.h Makefile agent-enum-types.h: $(pkginclude_HEADERS) Makefile
$(AM_V_GEN)$(GLIB_MKENUMS) \ $(AM_V_GEN)$(GLIB_MKENUMS) \
--fhead "#ifndef __AGENT_ENUM_TYPES_H__\n#define __AGENT_ENUM_TYPES_H__ 1\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fhead "#ifndef __AGENT_ENUM_TYPES_H__\n#define __AGENT_ENUM_TYPES_H__ 1\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
--fprod "/* enumerations from \"@filename@\" */\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \
--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define NICE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define NICE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
--ftail "G_END_DECLS\n\n#endif /* !AGENT_ENUM_TYPES_H */" \ --ftail "G_END_DECLS\n\n#endif /* !AGENT_ENUM_TYPES_H */" \
$(addprefix $(srcdir)/,agent.h) > $@ $(addprefix $(srcdir)/,$(pkginclude_HEADERS)) > $@
agent-enum-types.c: agent.h Makefile agent-enum-types.h agent-enum-types.c: $(pkginclude_HEADERS) Makefile agent-enum-types.h
$(AM_V_GEN)$(GLIB_MKENUMS) \ $(AM_V_GEN)$(GLIB_MKENUMS) \
--fhead "#include <config.h>\n#include <glib-object.h>\n#include \"agent.h\"\n#include \"agent-enum-types.h\"" \ --fhead "#include <config.h>\n#include <glib-object.h>\n#include \"agent.h\"\n#include \"pseudotcp.h\"\n#include \"agent-enum-types.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \ --fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType type = 0;\n if (!type) {\n static const G@Type@Value values[] = {" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType type = 0;\n if (!type) {\n static const G@Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n type = g_@type@_register_static (\"@EnumName@\", values);\n }\n return type;\n}\n\n" \ --vtail " { 0, NULL, NULL }\n };\n type = g_@type@_register_static (\"@EnumName@\", values);\n }\n return type;\n}\n\n" \
$(addprefix $(srcdir)/,agent.h) > $@ $(addprefix $(srcdir)/,$(pkginclude_HEADERS)) > $@
libagent_la_LIBADD = \ libagent_la_LIBADD = \
$(top_builddir)/random/libnice-random.la \ $(top_builddir)/random/libnice-random.la \
...@@ -89,15 +98,6 @@ libagent_la_DEPENDENCIES = \ ...@@ -89,15 +98,6 @@ libagent_la_DEPENDENCIES = \
$(top_builddir)/socket/libsocket.la \ $(top_builddir)/socket/libsocket.la \
$(top_builddir)/stun/libstun.la $(top_builddir)/stun/libstun.la
pkginclude_HEADERS = \
agent.h \
candidate.h \
debug.h \
address.h \
interfaces.h \
pseudotcp.h \
$(NULL)
if WINDOWS if WINDOWS
libagent_la_LIBADD += -liphlpapi -lws2_32 libagent_la_LIBADD += -liphlpapi -lws2_32
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment