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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index ebb9487..4e792ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ pc_DATA = libparted.pc.in # make distcheck target does not like auto-generated files # being included in the distributed archive. parted.spec: parted.spec.in - sed 's/@''PACKAGE@/@PACKAGE@/;s/@''VERSION@/@VERSION@/' $< > $@-tmp + sed 's/@''PACKAGE@/$(PACKAGE)/;s/@''VERSION@/$(VERSION)/' $< > $@-tmp mv $@-tmp $@ MAINTAINERCLEANFILES = parted.spec |