keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the now external libgsystem

Browse Source 
https://git.gnome.org/browse/libgsystem/commit/?id=9363cfc28ede912e2f06d4ccb42a646bb8a4bd2e
This commit is contained in:
Colin Walters 2014-02-07 17:29:40 -05:00
parent 9762c20fdc
commit 38b995b94e
5 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "libgsystem"]
path = libgsystem
url = git://git.gnome.org/libgsystem

4
Makefile-rpm-ostree.am
View File

@ -23,8 +23,8 @@ rpm_ostree_SOURCES = src/rpm-ostree.c \
src/rpmostree-postprocess.h \
src/rpmostree-postprocess.c \
$(NULL)
rpm_ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libgsystem -I$(srcdir)/src -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS)
rpm_ostree_LDADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS) libgsystem.la
rpm_ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS)
rpm_ostree_LDADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS)
privdatadir=$(pkglibdir)
privdata_DATA = src/tmpfiles-ostree-integration.conf

16
Makefile.am
View File

@ -28,21 +28,5 @@ AM_CFLAGS += $(WARN_CFLAGS)
EXTRA_DIST += autogen.sh COPYING
libgsystem_srcpath := libgsystem
libgsystem_cflags = $(PKGDEP_GIO_UNIX_CFLAGS) -I$(srcdir)/libgsystem
libgsystem_libs = $(PKGDEP_GIO_UNIX_LIBS)
include libgsystem/Makefile-libgsystem.am
privlib_LTLIBRARIES += libgsystem.la
include $(INTROSPECTION_MAKEFILE)
include Makefile-rpm-ostree.am
include Makefile-gsystem-introspection.am
girdir = $(pkgdatadir)/gir-1.0
typelibdir = $(pkglibdir)/girepository-1.0
gir_DATA = $(INTROSPECTION_GIRS)
typelib_DATA = $(gir_DATA:.gir=.typelib)
include Makefile-autobuilder.am

8
autogen.sh
View File

@ -15,14 +15,6 @@ fi
mkdir -p m4
# Fetch submodules if needed
if test ! -f libgsystem/README;
then
echo "+ Setting up submodules"
git submodule init
git submodule update
fi
autoreconf --force --install --verbose
cd $olddir

2
configure.ac
View File

@ -32,7 +32,7 @@ LT_INIT([disable-static])
PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES(PKGDEP_GIO_UNIX, [gio-unix-2.0])
PKG_CHECK_MODULES(PKGDEP_RPMOSTREE, [gio-unix-2.0 ostree-1 libselinux])
PKG_CHECK_MODULES(PKGDEP_RPMOSTREE, [gio-unix-2.0 ostree-1 libgsystem libselinux])
AC_PATH_PROG([XSLTPROC], [xsltproc])
GOBJECT_INTROSPECTION_REQUIRE([1.34.0])