[network-manager-openvpn/th/include-nm-default-bgo761198: 6/7] all: move "common" directory to "shared"

[Thomas Haller <thaller src gnome org>]

commit 8d6da523c5c75806acadb9a6878bdf7cb96cfb9c
Author: Thomas Haller <thaller redhat com>
Date:   Wed Jan 27 17:33:12 2016 +0100

    all: move "common" directory to "shared"

 Makefile.am                  |    2 +-
 auth-dialog/Makefile.am      |    3 +--
 common/Makefile.am           |   26 --------------------------
 configure.ac                 |    1 -
 properties/Makefile.am       |    5 ++---
 properties/tests/Makefile.am |    1 -
 shared/Makefile.am           |   29 +++++++++++++++++++++++++++++
 {common => shared}/utils.c   |    0
 {common => shared}/utils.h   |    0
 src/Makefile.am              |    3 +--
 10 files changed, 34 insertions(+), 36 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 01d420e..7903cd9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = shared common src
+SUBDIRS = shared src
 
 if WITH_GNOME
 SUBDIRS += auth-dialog properties po
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 9885fc0..0042f3a 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -6,7 +6,6 @@ nm_openvpn_auth_dialog_CPPFLAGS =                       \
        $(LIBNM_CFLAGS)                 \
        $(LIBNMA_CFLAGS)                \
        $(LIBSECRET_CFLAGS) \
-       -I$(top_srcdir)/common \
        -I$(top_srcdir)/shared \
        -DICONDIR=\""$(datadir)/pixmaps"\"      \
        -DUIDIR=\""$(uidir)"\"          \
@@ -21,6 +20,6 @@ nm_openvpn_auth_dialog_LDADD = \
        $(LIBNM_LIBS) \
        $(LIBNMA_LIBS) \
        $(LIBSECRET_LIBS) \
-       $(top_builddir)/common/libnm-vpn-plugin-openvpn-common.la
+       $(top_builddir)/shared/libnm-vpn-plugin-openvpn-shared.la
 
 CLEANFILES = *~
diff --git a/configure.ac b/configure.ac
index 787fcc2..faaf481 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,6 @@ fi
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
-common/Makefile
 auth-dialog/Makefile
 properties/Makefile
 properties/tests/Makefile
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 95ac4ea..726db2e 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -23,7 +23,6 @@ ui_DATA = nm-openvpn-dialog.ui
 common_CFLAGS =                                         \
         $(GLIB_CFLAGS)                                  \
         $(GTK_CFLAGS)                                   \
-        -I$(top_srcdir)/common                          \
         -I$(top_srcdir)/shared                          \
         -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
         -DICONDIR=\""$(datadir)/pixmaps"\"              \
@@ -45,13 +44,13 @@ libnm_vpn_plugin_openvpn_la_LIBADD =                    \
         $(GTK_LIBS)                                     \
         $(LIBNM_LIBS)                                   \
         $(LIBNMA_LIBS)                                  \
-        $(top_builddir)/common/libnm-vpn-plugin-openvpn-common.la
+        $(top_builddir)/shared/libnm-vpn-plugin-openvpn-shared.la
 
 libnm_openvpn_properties_la_LIBADD =                \
         $(GTK_LIBS)                                     \
         $(LIBNM_GLIB_LIBS)                              \
         $(LIBNM_GTK_LIBS)                               \
-        $(top_builddir)/common/libnm-openvpn-common.la
+        $(top_builddir)/shared/libnm-openvpn-shared.la
 
 libnm_vpn_plugin_openvpn_la_LDFLAGS =                   \
         -avoid-version
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index c22d5f9..a585e08 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = conf
 AM_CFLAGS = \
     -I${top_srcdir}/shared \
     -I${top_srcdir} \
-    -I${top_srcdir}/common \
     -I${top_srcdir}/properties
 
 noinst_PROGRAMS = test-import-export
diff --git a/shared/Makefile.am b/shared/Makefile.am
index 7b84a4b..9ec51ea 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -1,6 +1,35 @@
+noinst_LTLIBRARIES=libnm-vpn-plugin-openvpn-shared.la
+if WITH_LIBNM_GLIB
+noinst_LTLIBRARIES += libnm-openvpn-shared.la
+endif
+
+libnm_vpn_plugin_openvpn_shared_la_CPPFLAGS = \
+    $(LIBNM_CFLAGS) \
+    -I$(top_srcdir)/shared
+
+libnm_openvpn_shared_la_CPPFLAGS = \
+    -DNM_OPENVPN_OLD \
+    $(LIBNM_GLIB_CFLAGS) \
+    -I$(top_srcdir)/shared
+
+libnm_vpn_plugin_openvpn_shared_la_SOURCES= \
+    utils.c \
+    utils.h \
+    nm-openvpn-service-defines.h
+
+libnm_openvpn_shared_la_SOURCES = \
+    $(libnm_vpn_plugin_openvpn_shared_la_SOURCES)
+
+libnm_vpn_plugin_openvpn_shared_la_LIBADD = \
+    $(LIBNM_LIBS)
+
+libnm_openvpn_shared_la_LIBADD = \
+    $(LIBNM_GLIB_LIBS)
+
 EXTRA_DIST = \
      gsystem-local-alloc.h \
      nm-dbus-compat.h \
      nm-default.h \
      nm-glib.h \
      nm-macros-internal.h
+
diff --git a/common/utils.c b/shared/utils.c
similarity index 100%
rename from common/utils.c
rename to shared/utils.c
diff --git a/common/utils.h b/shared/utils.h
similarity index 100%
rename from common/utils.h
rename to shared/utils.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e9b52f..0b8b7a5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(LIBNM_CFLAGS) \
-       -I$(top_srcdir)/common \
        -I$(top_srcdir)/shared \
        -DBINDIR=\"$(bindir)\" \
        -DPREFIX=\""$(prefix)"\" \
@@ -22,7 +21,7 @@ nm_openvpn_service_SOURCES = \
 
 nm_openvpn_service_LDADD = \
        $(LIBNM_LIBS) \
-        $(top_builddir)/common/libnm-vpn-plugin-openvpn-common.la
+        $(top_builddir)/shared/libnm-vpn-plugin-openvpn-shared.la
 
 nm_openvpn_service_openvpn_helper_SOURCES = \
        nm-openvpn-service-openvpn-helper.c