There were a couple of nits in Makefiles, so I've done this:
>From 980c84a39039aad86dc18a71195d7272ad8ae3a1 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email protected]>
Date: Sun, 19 Jul 2009 20:09:29 +0200
Subject: [PATCH] build: adjust Makefiles
* libparted/Makefile.am (ARCH_SOURCE): Factor out duplication.
* libparted/labels/Makefile.am (partedincludedir): Split long line.
---
libparted/Makefile.am | 14 ++++++--------
libparted/labels/Makefile.am | 3 ++-
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index c58081e..0ed01bb 100644
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -1,18 +1,16 @@
# This file is part of GNU Parted
-# Copyright (C) 1999, 2000, 2001, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2007, 2009 Free Software Foundation, Inc.
#
# This file may be modified and/or distributed without restriction.
+SUBDIRS_CHECK =
if HAVE_CHECK
SUBDIRS_CHECK = tests
-else
-SUBDIRS_CHECK =
endif
-if BUILD_LINUX
-ARCH_SOURCE = arch/$(OS).c arch/$(OS).h
-else
ARCH_SOURCE = arch/$(OS).c
+if BUILD_LINUX
+ARCH_SOURCE += arch/$(OS).h
endif
SUBDIRS = labels fs . $(SUBDIRS_CHECK)
@@ -39,9 +37,9 @@ libparted_la_SOURCES = debug.c \
$(ARCH_SOURCE)
-EXTRA_libparted_la_SOURCES = arch/linux.c \
+EXTRA_libparted_la_SOURCES = arch/linux.c \
arch/linux.h \
- arch/gnu.c \
+ arch/gnu.c \
arch/beos.c
libparted_la_LIBADD = \
diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am
index 6bbe2bf..9140291 100644
--- a/libparted/labels/Makefile.am
+++ b/libparted/labels/Makefile.am
@@ -9,7 +9,8 @@ else
S390_SRCS =
endif
-partedincludedir = -I$(top_srcdir)/lib -I$(top_srcdir)/include
-I$(top_srcdir)/libparted
+partedincludedir = \
+ -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libparted
noinst_LTLIBRARIES = liblabels.la
liblabels_la_SOURCES = \
--
1.6.4.rc1.169.gd0406
_______________________________________________
parted-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/parted-devel
