diff options
| author | Michael Biebl <biebl@debian.org> | 2011-03-18 20:18:01 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-03-18 20:18:01 +0100 |
| commit | 7638c999f0a44ad6c1734d53ad3d057cbaf04273 (patch) | |
| tree | a3b60d74304f5717135fa7f430a52c4519be6b39 /test | |
| parent | 3d5624f02b77c669786cd29dc942dfe78b77ec81 (diff) | |
| parent | e22c6e05e9ebc6cce941762020c5710b8014677b (diff) | |
Merge commit 'upstream/0.8.3.998'
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Makefile.in | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 8e235e43..7bdaf0db 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -10,9 +10,9 @@ AM_CPPFLAGS = \ -DNM_RUN_DIR=\"$(rundir)\" \ -DDATADIR=\"$(datadir)\" -bin_PROGRAMS = nm-tool +bin_PROGRAMS = nm-tool nm-online -noinst_PROGRAMS = nm-online libnm-glib-test +noinst_PROGRAMS = libnm-glib-test nm_tool_SOURCES = nm-tool.c nm_tool_LDADD = \ diff --git a/test/Makefile.in b/test/Makefile.in index 913753ca..64a31543 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -34,8 +34,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = nm-tool$(EXEEXT) -noinst_PROGRAMS = nm-online$(EXEEXT) libnm-glib-test$(EXEEXT) +bin_PROGRAMS = nm-tool$(EXEEXT) nm-online$(EXEEXT) +noinst_PROGRAMS = libnm-glib-test$(EXEEXT) subdir = test DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -202,6 +202,10 @@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ +NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ +NM_MICRO_VERSION = @NM_MICRO_VERSION@ +NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_VERSION = @NM_VERSION@ NSS_CFLAGS = @NSS_CFLAGS@ NSS_LIBS = @NSS_LIBS@ OBJDUMP = @OBJDUMP@ @@ -216,6 +220,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |