diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2018-12-27 14:55:08 -0600 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2018-12-27 14:55:08 -0600 |
| commit | 39e45a847dc5a4ff300c0a1135c7b5e41fc9ee03 (patch) | |
| tree | 1fb0d67ac161a9d585b534ba5e550c79bd20e648 /agent | |
| parent | 7587da3f024e21ed7896b7c78839a88741473f77 (diff) | |
| download | libnice-39e45a847dc5a4ff300c0a1135c7b5e41fc9ee03.tar.gz | |
Makefile.am: Export *_get_type() symbols like meson does
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/Makefile.am | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/agent/Makefile.am b/agent/Makefile.am index 915f312..465c7c6 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -30,6 +30,15 @@ CLEANFILES += $(BUILT_SOURCES) noinst_LTLIBRARIES = libagent.la +pkginclude_HEADERS = \ + agent.h \ + candidate.h \ + debug.h \ + address.h \ + interfaces.h \ + pseudotcp.h \ + $(NULL) + libagent_la_SOURCES = \ address.h \ address.c \ @@ -60,22 +69,22 @@ libagent_la_SOURCES = \ outputstream.c \ $(BUILT_SOURCES) -agent-enum-types.h: agent.h Makefile +agent-enum-types.h: $(pkginclude_HEADERS) Makefile $(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" \ --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" \ --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) \ - --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@\" */" \ --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@\" }," \ --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 = \ $(top_builddir)/random/libnice-random.la \ @@ -89,15 +98,6 @@ libagent_la_DEPENDENCIES = \ $(top_builddir)/socket/libsocket.la \ $(top_builddir)/stun/libstun.la -pkginclude_HEADERS = \ - agent.h \ - candidate.h \ - debug.h \ - address.h \ - interfaces.h \ - pseudotcp.h \ - $(NULL) - if WINDOWS libagent_la_LIBADD += -liphlpapi -lws2_32 endif |