maint: avoid long-standing warnings from make:

[android-x86/external-parted.git] / libparted / Makefile.am

diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 0a8923e..828a288 100644 (file)
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of GNU Parted
-# Copyright (C) 1999-2001, 2007, 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2007, 2009-2012 Free Software Foundation, Inc.
 #
 # This file may be modified and/or distributed without restriction.
 
@@ -18,8 +18,9 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 SUBDIRS       = labels fs . $(SUBDIRS_CHECK)
 
 
-partedincludedir      = -I$(top_srcdir)/lib -I$(top_srcdir)/include
-lib_LTLIBRARIES              = libparted.la
+partedincludedir = \
+  -I$(top_srcdir)/lib -I$(top_builddir)/include -I$(top_srcdir)/include
+lib_LTLIBRARIES        = libparted.la
 
 # Set the shared library version, per Libtool's guidelines.
 # For details, see the "Updating library version information" section of
@@ -46,10 +47,11 @@ libparted_la_SOURCES  = debug.c                     \
                        $(ARCH_SOURCE)
 
 
-EXTRA_libparted_la_SOURCES    = arch/linux.c   \
-                               arch/linux.h    \
-                               arch/gnu.c      \
-                               arch/beos.c
+EXTRA_DIST = \
+  arch/linux.c \
+  arch/linux.h \
+  arch/gnu.c   \
+  arch/beos.c
 
 libparted_la_LIBADD =  \
   fs/libfs.la          \
@@ -62,8 +64,6 @@ libparted_la_LIBADD = \
   $(LIB_BLKID)         \
   $(INTLLIBS)
 
-EXTRA_DIST           = mbr.s
+EXTRA_DIST += mbr.s
 
 INCLUDES = $(partedincludedir) $(INTLINCS)
-
-MAINTAINERCLEANFILES = Makefile.in