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 /libparted/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 'libparted/Makefile.am')
| -rw-r--r-- | libparted/Makefile.am | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libparted/Makefile.am b/libparted/Makefile.am index 4892c8d..0b013cc 100644 --- a/libparted/Makefile.am +++ b/libparted/Makefile.am @@ -11,13 +11,11 @@ endif SUBDIRS = labels fs . $(SUBDIRS_CHECK) -LIBS = @INTLLIBS@ @LIBS@ partedincludedir = -I$(top_srcdir)/lib -I$(top_srcdir)/include lib_LTLIBRARIES = libparted.la libparted_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) - libparted_la_SOURCES = debug.c \ device.c \ exception.c \ @@ -30,21 +28,22 @@ libparted_la_SOURCES = debug.c \ cs/constraint.c \ cs/natmath.c \ arch/blkpg.h \ - arch/@OS@.c + arch/$(OS).c EXTRA_libparted_la_SOURCES = arch/linux.c \ arch/gnu.c \ arch/beos.c -libparted_la_LIBADD = @OS_LIBS@ \ - @DL_LIBS@ \ - @DM_LIBS@ \ - @SELINUX_LIBS@ \ - fs/libfs.la \ +libparted_la_LIBADD = $(OS_LIBS) \ + $(DL_LIBS) \ + $(DM_LIBS) \ + $(SELINUX_LIBS) \ + $(INTLLIBS) \ + fs/libfs.la \ labels/liblabels.la EXTRA_DIST = mbr.s -INCLUDES = $(partedincludedir) @INTLINCS@ +INCLUDES = $(partedincludedir) $(INTLINCS) MAINTAINERCLEANFILES = Makefile.in |