diff options
| author | Jim Meyering <jim@meyering.net> | 2007-03-02 11:56:02 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-03-02 11:56:02 +0100 |
| commit | 233c78f24efe16ef29626f348cf7e4f4f275668f (patch) | |
| tree | e7e81025d0c13c42468aa5d193937f4c16fe5aff /debug | |
| parent | 037e1d061a3bbf0f85c80c92d31b1081ea22e182 (diff) | |
| download | parted-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 'debug')
| -rw-r--r-- | debug/clearfat/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debug/clearfat/Makefile.am b/debug/clearfat/Makefile.am index 70e1481..0101ceb 100644 --- a/debug/clearfat/Makefile.am +++ b/debug/clearfat/Makefile.am @@ -2,12 +2,12 @@ noinst_PROGRAMS = clearfat clearfat_SOURCES = clearfat.c -clearfat_LDADD = @LIBS@ @PARTED_LIBS@ \ +clearfat_LDADD = $(LIBS) $(PARTED_LIBS) \ $(top_builddir)/libparted/libparted.la partedincludedir = -I$(top_srcdir)/include -INCLUDES = $(partedincludedir) @INTLINCS@ +INCLUDES = $(partedincludedir) $(INTLINCS) MAINTAINERCLEANFILES = Makefile.in |