maint: pass newer "make syntax-check" tests from gnulib

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

diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 0ed01bb..fb8351e 100644 (file)
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -1,11 +1,12 @@
 # This file is part of GNU Parted
-# Copyright (C) 1999-2001, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2007, 2009-2010 Free Software Foundation,
+# Inc.
 #
 # This file may be modified and/or distributed without restriction.
 
 SUBDIRS_CHECK =
 if HAVE_CHECK
-SUBDIRS_CHECK = tests
+SUBDIRS_CHECK += tests
 endif
 
 ARCH_SOURCE = arch/$(OS).c
@@ -13,13 +14,22 @@ if BUILD_LINUX
 ARCH_SOURCE += arch/$(OS).h
 endif
 
+AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+
 SUBDIRS       = labels fs . $(SUBDIRS_CHECK)
 
 
 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)
+
+# Set the shared library version, per Libtool's guidelines.
+# For details, see the "Libtool's versioning system" section of "info libtool"
+CURRENT = 0
+REVISION = 1
+AGE = 0
+
+libparted_la_LDFLAGS  = -version-info $(CURRENT):$(REVISION):$(AGE)
+
 libparted_la_SOURCES  = debug.c                        \
                        architecture.c          \
                        architecture.h          \
@@ -33,7 +43,6 @@ libparted_la_SOURCES  = debug.c                       \
                        cs/geom.c               \
                        cs/constraint.c         \
                        cs/natmath.c            \
-                       arch/blkpg.h            \
                        $(ARCH_SOURCE)
 
 
@@ -50,6 +59,7 @@ libparted_la_LIBADD = \
   $(DL_LIBS)           \
   $(DM_LIBS)           \
   $(SELINUX_LIBS)      \
+  $(LIB_BLKID)         \
   $(INTLLIBS)
 
 EXTRA_DIST           = mbr.s