libgsystem: remove submodule libgsystem

Signed-off-by: Thomas Haller <thaller@redhat.com>

diff --git a/.gitignore b/.gitignore
index a1a417e..5162fe7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,8 @@ cscope.*out
 valgrind-*.log
 *-glue.h
 
+/libgsystem/
+
 /ABOUT-NLS
 /COPYING
 /INSTALL

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644 (file)
index e93bbea..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "libgsystem"]
-       path = libgsystem
-       url = git://git.gnome.org/libgsystem

diff --git a/Makefile.am b/Makefile.am
index 86102ab..97f094d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,10 +66,4 @@ CLEANFILES = cscope.in.out cscope.out cscope.po.out
 cscope:
        cscope -b -q -R -Iinclude -ssrc -slibnm-glib -slibnm-util -scli/src;
 
-libgsystem_srcpath := libgsystem
-libgsystem_cflags := $(filter-out -DGLIB_VERSION%,$(GLIB_CFLAGS)) -I$(srcdir)/libgsystem
-libgsystem_libs = $(GLIB_LIBS)
-include libgsystem/Makefile-libgsystem.am
-noinst_LTLIBRARIES = libgsystem.la
-
 .PHONY: cscope

diff --git a/libgsystem b/libgsystem
deleted file mode 160000 (submodule)
index 856b8f9..0000000
--- a/libgsystem
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 856b8f9431a63c7807fb3859ed6de2a0f3abfb3b

diff --git a/src/Makefile.am b/src/Makefile.am
index 0a0b52d..ebbee17 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,7 +38,6 @@ endif
 
 AM_CPPFLAGS =                          \
        -I$(top_srcdir)/include         \
-       -I${top_srcdir}/libgsystem      \
        -I$(top_srcdir)/libnm-util      \
        -I$(top_builddir)/libnm-util    \
        -I$(top_srcdir)/callouts        \
@@ -58,7 +57,7 @@ sbin_PROGRAMS = NetworkManager
 NetworkManager_SOURCES = \
        main.c
 
-NetworkManager_LDADD = libNetworkManager.la $(top_builddir)/libgsystem.la $(LIBNDP_LIBS)
+NetworkManager_LDADD = libNetworkManager.la $(LIBNDP_LIBS)
 
 noinst_LTLIBRARIES = libNetworkManager.la
 
@@ -356,7 +355,6 @@ libNetworkManager_la_SOURCES = \
        $(glue_sources)
 
 libNetworkManager_la_LIBADD = \
-       $(top_builddir)/libgsystem.la \
        $(top_builddir)/libnm-util/libnm-util.la \
        $(DBUS_LIBS) \
        $(GLIB_LIBS) \