From e2562d2bfa3760b0866331cba96eb75649aff682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Fri, 15 Dec 2017 14:35:32 +0100
Subject: [PATCH] build: Merge no introspection headers with public headers

There are three headers `nm-secret-agent-old.h`,
`nm-vpn-plugin-old.h`, and `nm-vpn-service-plugin.h`, which are
named as no introspection headers. However, these files also
join to the rest headers to generate introspection data.

This patch merges those no introspection headers with the public
headers.
---
 Makefile.am       | 15 +++++----------
 libnm/meson.build | 14 ++++++++------
 meson.build       |  6 ------
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cbcbb4a418..fa9f2939bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -762,14 +762,13 @@ libnm_lib_h_pub_real = \
 	libnm/nm-ip-config.h \
 	libnm/nm-object.h \
 	libnm/nm-remote-connection.h \
+	libnm/nm-secret-agent-old.h \
 	libnm/nm-types.h \
 	libnm/nm-vpn-connection.h \
 	libnm/nm-vpn-editor.h \
-	libnm/nm-wimax-nsp.h
-libnm_lib_h_pub_nointrospect = \
-	libnm/nm-secret-agent-old.h \
 	libnm/nm-vpn-plugin-old.h \
-	libnm/nm-vpn-service-plugin.h
+	libnm/nm-vpn-service-plugin.h \
+	libnm/nm-wimax-nsp.h
 libnm_lib_h_pub_mkenums = \
 	libnm/nm-enum-types.h
 libnm_lib_h_priv = \
@@ -844,8 +843,7 @@ libnm_lib_cppflags = \
 	-DNMRUNDIR=\"$(nmrundir)\"
 
 libnminclude_HEADERS += \
-	$(libnm_lib_h_pub_real) \
-	$(libnm_lib_h_pub_nointrospect)
+	$(libnm_lib_h_pub_real)
 
 nodist_libnminclude_HEADERS += \
 	$(libnm_lib_h_pub_mkenums)
@@ -877,8 +875,7 @@ GLIB_GENERATED += \
 	$(libnm_lib_c_mkenums)
 nm_enum_types_sources = \
 	$(libnm_lib_h_pub_mkenums) \
-	$(libnm_lib_h_pub_real) \
-	$(libnm_lib_h_pub_nointrospect)
+	$(libnm_lib_h_pub_real)
 nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
 nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
 
@@ -893,7 +890,6 @@ libnm_libnm_la_CPPFLAGS = \
 
 libnm_libnm_la_SOURCES = \
 	$(libnm_lib_h_pub_real) \
-	$(libnm_lib_h_pub_nointrospect) \
 	$(libnm_lib_h_priv) \
 	$(libnm_lib_c_real)
 
@@ -945,7 +941,6 @@ libnm_NM_1_0_gir_FILES = \
 	$(libnm_core_lib_c_real) \
 	$(libnm_lib_h_pub_mkenums) \
 	$(libnm_lib_h_pub_real) \
-	$(libnm_lib_h_pub_nointrospect) \
 	$(libnm_lib_c_mkenums) \
 	$(libnm_lib_c_real)
 libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm
diff --git a/libnm/meson.build b/libnm/meson.build
index d06c379dd6..24e0fb0bf7 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -67,19 +67,21 @@ libnm_headers = files(
   'nm-ip-config.h',
   'nm-object.h',
   'nm-remote-connection.h',
+  'nm-secret-agent-old.h',
   'nm-types.h',
   'nm-vpn-connection.h',
   'nm-vpn-editor.h',
+  'nm-vpn-plugin-old.h',
+  'nm-vpn-service-plugin.h',
   'nm-wimax-nsp.h'
 )
 
-libnm_headers_nointrospect = files(
-  'nm-secret-agent-old.h',
-  'nm-vpn-plugin-old.h',
-  'nm-vpn-service-plugin.h'
+install_headers(
+  libnm_core_headers + libnm_headers + [version_header],
+  subdir: 'libnm'
 )
 
-enums_headers = libnm_headers + libnm_headers_nointrospect + [version_header]
+enums_headers = libnm_headers + [version_header]
 enums = 'nm-enum-types'
 
 libnm_enums_h = gnome.mkenums(
@@ -210,7 +212,7 @@ run_target(
 )
 
 if enable_introspection
-  gir_sources = libnm_core_enums + libnm_core_headers + libnm_core_sources + libnm_enums + libnm_headers + libnm_headers_nointrospect + libnm_sources + [version_header]
+  gir_sources = libnm_core_enums + libnm_core_headers + libnm_core_sources + libnm_enums + libnm_headers + libnm_sources + [version_header]
 
   gir_dir = join_paths(nm_datadir, 'gir-' + nm_gir_version)
   typelib_dir = join_paths(nm_libdir, 'girepository-' + nm_gir_version)
diff --git a/meson.build b/meson.build
index c1c8f4a57b..1437526fc0 100644
--- a/meson.build
+++ b/meson.build
@@ -969,12 +969,6 @@ subdir('introspection')
 subdir('shared')
 subdir('libnm-core')
 subdir('libnm')
-
-install_headers(
-  libnm_core_headers + libnm_headers + libnm_headers_nointrospect + [version_header],
-  subdir: 'libnm'
-)
-
 subdir('src')
 subdir('dispatcher')
 subdir('clients')