summaryrefslogtreecommitdiff
path: root/libparted/tests/Makefile.am
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2007-03-02 11:56:02 +0100
committerJim Meyering <jim@meyering.net>2007-03-02 11:56:02 +0100
commit233c78f24efe16ef29626f348cf7e4f4f275668f (patch)
treee7e81025d0c13c42468aa5d193937f4c16fe5aff /libparted/tests/Makefile.am
parent037e1d061a3bbf0f85c80c92d31b1081ea22e182 (diff)
downloadparted-233c78f24efe16ef29626f348cf7e4f4f275668f.tar.gz
Use $(VAR), rather than obsolescent @VAR@ automake notation.
Enable the makefile-check rule. * Makefile.cfg: Remove makefile-check from the list of rules to skip. * Makefile.am: change e.g., @VERSION@ to $(VERSION). * debug/clearfat/Makefile.am: Likewise. * libparted/Makefile.am: Likewise. * libparted/fs/Makefile.am: Likewise. * libparted/fs/amiga/Makefile.am: Likewise. * libparted/fs/bfs/Makefile.am: Likewise. * libparted/fs/ext2/Makefile.am: Likewise. * libparted/fs/fat/Makefile.am: Likewise. * libparted/fs/hfs/Makefile.am: Likewise. * libparted/fs/jfs/Makefile.am: Likewise. * libparted/fs/linux_swap/Makefile.am: Likewise. * libparted/fs/ntfs/Makefile.am: Likewise. * libparted/fs/reiserfs/Makefile.am: Likewise. * libparted/fs/ufs/Makefile.am: Likewise. * libparted/fs/xfs/Makefile.am: Likewise. * libparted/labels/Makefile.am: Likewise. * libparted/tests/Makefile.am: Likewise. * parted/Makefile.am: Likewise. * partprobe/Makefile.am: Likewise. The above conversion caused a problem: * libparted/Makefile.am: Remove this recursive definition: LIBS = @INTLLIBS@ @LIBS@. Once converted to LIBS = ...$(LIBS), GNU make would (rightly) fail, objecting to the recursive definition. (libparted_la_LIBADD): Instead, add $(INTLLIBS) here.
Diffstat (limited to 'libparted/tests/Makefile.am')
-rw-r--r--libparted/tests/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/libparted/tests/Makefile.am b/libparted/tests/Makefile.am
index 62d7c2c..8c1e07b 100644
--- a/libparted/tests/Makefile.am
+++ b/libparted/tests/Makefile.am
@@ -5,8 +5,8 @@
TESTS = label
bin_PROGRAMS = label
-label_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include
-label_LDADD = @CHECK_LIBS@ $(top_builddir)/libparted/libparted.la
+label_CFLAGS = $(CHECK_CFLAGS) -I$(top_srcdir)/include
+label_LDADD = $(CHECK_LIBS) $(top_builddir)/libparted/libparted.la
label_SOURCES = common.h common.c label.c
MAINTAINERCLEANFILES = Makefile.in