From: Geoff Levand <geoff@infradead.org>
Date: Sun, 30 Jun 2013 20:45:58 +0000 (-0700)
Subject: discover: Fix automake warnings
X-Git-Tag: v1.0.0~560
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=434a6c9c100bc8daca1e6c41137f993d88f20fe3;hp=203254ec7ca2352e898acc9ac5c971bcbf630720

discover: Fix automake warnings

Change the Makfile.am relocatable output files from automake _LIBRARIES
to automake _PROGRAMS.  Also, change the output file name extension
from .o to .ro to better show these are relocatable files.

Fixes automake warnings like these:

  discover/Makefile.am: `libparser.o' is not a standard library name
  discover/Makefile.am: did you mean `libparser.a'?

Signed-off-by: Geoff Levand <geoff@infradead.org>
---

diff --git a/discover/Makefile.am b/discover/Makefile.am
index 0feb3e5..d4fe722 100644
--- a/discover/Makefile.am
+++ b/discover/Makefile.am
@@ -22,9 +22,9 @@ AM_CFLAGS = $(DEFAULT_CFLAGS)  \
 	-DPKG_SYSCONF_DIR='"$(pkgsysconfdir)"' \
 	-DLOCAL_STATE_DIR='"$(localstatedir)"'
 
-noinst_LIBRARIES = libparser.o
+noinst_PROGRAMS = libparser.ro
 
-libparser_o_SOURCES = \
+libparser_ro_SOURCES = \
 	parser.c \
 	parser.h \
 	parser-conf.c \
@@ -38,7 +38,7 @@ libparser_o_SOURCES = \
 	yaboot-parser.c \
 	pxe-parser.c
 
-libparser.o: $(libparser_o_OBJECTS)
+libparser.ro: $(libparser_ro_OBJECTS)
 	$(LD) -r -o $@ $^
 
 EXTRA_DIST = native-parser.c
@@ -68,7 +68,7 @@ pb_discover_SOURCES = \
 	user-event.c \
 	user-event.h
 
-pb_discover_LDADD = libparser.o $(top_builddir)/lib/libpbcore.la
+pb_discover_LDADD = libparser.ro $(top_builddir)/lib/libpbcore.la
 
 pb_discover_LDFLAGS = -ludev
 
diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index e5c32cf..5dba679 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -23,7 +23,7 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = -O0 -ggdb -Wall -Wextra -Werror
 
-LDADD = $(top_builddir)/lib/libpbcore.la libtest.o
+LDADD = $(top_builddir)/lib/libpbcore.la libtest.ro
 
 TESTS = \
 	test-null \
@@ -54,18 +54,17 @@ parser_objs = \
 	$(top_srcdir)/discover/device-handler.c \
 	$(top_srcdir)/discover/parser-conf.c
 
-libtest_o_SOURCES = \
+libtest_ro_SOURCES = \
 	main.c \
 	utils.c \
 	handler.c \
 	parser-test.h \
 	$(parser_objs)
 
-libtest.o: $(libtest_o_OBJECTS)
+libtest.ro: $(libtest_ro_OBJECTS)
 	$(LD) -o $@ -r $^
 
-check_PROGRAMS = $(TESTS)
-check_LIBRARIES = libtest.o
+check_PROGRAMS = $(TESTS) libtest.ro
 
 check_DATA = \
 	data/grub2-f18-ppc64.conf \