diff options
| author | Thomas Jepp <tom@tomjepp.co.uk> | 2015-12-16 21:16:13 +0000 |
|---|---|---|
| committer | Thomas Jepp <tom@tomjepp.co.uk> | 2015-12-16 21:16:13 +0000 |
| commit | f1f400ffc9bed893b58025c0dc383a34484ac950 (patch) | |
| tree | 4d0e30210452131be10760f47b960256926c7122 | |
| parent | cb788b1cba70caee3b7d1a6716a4074e3acaff0e (diff) | |
| download | vyatta-cfg-f1f400ffc9bed893b58025c0dc383a34484ac950.tar.gz vyatta-cfg-f1f400ffc9bed893b58025c0dc383a34484ac950.zip | |
Update Makefile.am and configure.ac to properly add GObject linking.
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index cbd5ea6..e277a99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,12 +13,11 @@ if USE_UNIONFSFUSE USE_UNIONFSFUSE = -DUSE_UNIONFSFUSE=1 endif -AM_CFLAGS = -g -I src -Wall `pkg-config --cflags gio-2.0 gobject-2.0 glib-2.0` $(USE_UNIONFSFUSE) -AM_CXXFLAGS = -g -I src -Wall -Werror $(USE_UNIONFSFUSE) -AM_CXXFLAGS += `pkg-config --cflags gio-2.0 gobject-2.0 glib-2.0` +AM_CFLAGS = -I src -Wall $(GOBJECT_CFLAGS) +AM_CXXFLAGS = -I src -Wall -Werror $(USE_UNIONFSFUSE) +AM_CXXFLAGS += $(GOBJECT_CFLAGS) AM_YFLAGS = -d --name-prefix=yy_`basename $* .y`_ AM_LFLAGS = --prefix=yy_`basename $* .l`_ -olex.yy.c -AM_LDFLAGS = `pkg-config --libs gio-2.0 gobject-2.0 glib-2.0` completion_DATA = etc/bash_completion.d/vyatta-cfg initd_SCRIPTS = etc/init.d/vyatta-router @@ -63,7 +62,7 @@ CLEANFILES = src/cli_parse.c src/cli_parse.h src/cli_def.c src/cli_val.c CLEANFILES += src/cparse/cparse.cpp src/cparse/cparse.h CLEANFILES += src/cparse/cparse_lex.c LDADD = src/libvyatta-cfg.la -#LDADD += /usr/lib/libglib-2.0.la +LDADD += $(GOBJECT_LIBS) vincludedir = $(includedir)/vyatta-cfg vinclude_HEADERS = src/cli_cstore.h @@ -149,3 +148,4 @@ install-exec-hook: cd $(DESTDIR)/bin ; \ $(LN_S) $(sbindir)/my_cli_shell_api cli-shell-api + diff --git a/configure.ac b/configure.ac index 7d8c694..8bd1ebe 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,10 @@ AC_CONFIG_FILES( [debian/vyatta-cfg.postrm]) AC_SUBST(NOSTRIP) +PKG_CHECK_MODULES(GOBJECT, [gobject-2.0]) +AC_SUBST(GOBJECT_CFLAGS) +AC_SUBST(GOBJECT_LIBS) AC_OUTPUT + |