summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2008-01-27 19:35:21 -0800
committerGeoff Levand <geoffrey.levand@am.sony.com>2008-01-27 19:35:21 -0800
commit43ffbb3843eddc26805a39dd31238c37bf2c1293 (patch)
tree2ee1194a6e347b292805dbf004cfe57de02fbda6
parent09b35cc82dac1bf30c1dc8cd175b3fdd186c0ad9 (diff)
downloadps3-utils-43ffbb3843eddc26805a39dd31238c37bf2c1293.tar.gz
Makefile.am cleanups.
-rw-r--r--Makefile.am10
-rw-r--r--lib/Makefile.am12
2 files changed, 18 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 6a0350b..2076170 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,18 +24,22 @@ EXTRA_DIST = \
$(man_MANS) \
bootstrap \
config.sub.patch \
- $(raw_bin_scripts) \
$(addsuffix .in, $(composed_bin_scripts)) \
$(addsuffix .in, $(composed_sbin_scripts)) \
ps3-utils.spec
MAINTAINERCLEANFILES = Makefile.in
+composed_bin_scripts =
+
composed_sbin_scripts = \
ps3-boot-game-os \
ps3-dump-bootloader \
ps3-rtc-init
+bin_SCRIPTS = \
+ $(composed_bin_scripts)
+
sbin_SCRIPTS = \
$(composed_sbin_scripts)
@@ -72,11 +76,11 @@ AM_CFLAGS = \
-Winline
ps3_flash_util_SOURCES = ps3-flash-util.c
-ps3_flash_util_LDFLAGS = -Llib -Wl,--rpath -Wl,$(libdir)
+ps3_flash_util_LDFLAGS = -Llib
ps3_flash_util_LDADD = -lps3-utils
ps3_video_mode_SOURCES = ps3-video-mode.c
-ps3_video_mode_LDFLAGS = -Llib -Wl,--rpath -Wl,$(libdir)
+ps3_video_mode_LDFLAGS = -Llib
ps3_video_mode_LDADD = -lps3-utils
edit = sed \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 08cb506..7faeb13 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -49,5 +49,15 @@ AM_CFLAGS = \
-Wredundant-decls \
-Winline
+# version-info rules (current:revision:age):
+# * If the library source code has changed since the last release, then
+# increment revision.
+# * If any interfaces have been added, removed, or changed since the
+# last release, then increment current and set revision to 0.
+# * If any interfaces have been added since the last release, then
+# increment age.
+# * If any interfaces have been removed since the last release, then
+# set age to 0.
+
libps3_utils_la_SOURCES = flash.c flash-db.c
-libps3_utils_la_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -version-info 1:0:0 ${EXTRA_LDFLAGS}
+libps3_utils_la_LDFLAGS = -version-info 2:0:0 ${EXTRA_LDFLAGS}