X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2FMakefile.am;h=2c5032afe45592755b1d1ca5495f258db2d8d698;hp=310f1a5f1f3332b17d11e3168a5d8eafe18c3a6e;hb=27863350496534c1bdd6a2d48661f8973aed0945;hpb=6532debf0bd95509cff9eb8634f57aef20a696b9;ds=sidebyside

diff --git a/ui/twin/Makefile.am b/ui/twin/Makefile.am
index 310f1a5..2c5032a 100644
--- a/ui/twin/Makefile.am
+++ b/ui/twin/Makefile.am
@@ -12,51 +12,42 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/lib \
-	-I$(includedir) \
-	$(DEFAULT_CPPFLAGS) \
-	$(twin_CFLAGS)
-
-AM_CFLAGS = \
-	-DPB_ARTWORK_PATH='"$(pkgdatadir)/artwork/"' \
-	$(DEFAULT_CFLAGS)  \
-	 $(twin_CFLAGS)
+ui_twin_common_libs = \
+	ui/twin/libpbt.la \
+	ui/common/libpbui.la \
+	$(core_lib)
 
-AM_LDFLAGS = \
-	$(twin_LIBS)
+ui_twin_common_cppflags = \
+	$(DEFAULT_CPPFLAGS) \
+	-I$(top_srcdir)/lib \
+	-DPB_ARTWORK_PATH='"$(pkgdatadir)/artwork/"'
 
-common_libs = \
-	libpbt.la \
-	$(top_builddir)/ui/common/libpbui.la \
-	$(top_builddir)/lib/libpbcore.la
+noinst_LTLIBRARIES += ui/twin/libpbt.la
 
-noinst_LTLIBRARIES = libpbt.la
+ui_twin_libpbt_la_SOURCES = \
+	ui/twin/pbt-client.c \
+	ui/twin/pbt-client.h \
+	ui/twin/pbt-main.c \
+	ui/twin/pbt-main.h \
+	ui/twin/pbt-menu.c \
+	ui/twin/pbt-menu.h \
+	ui/twin/pbt-scr.c \
+	ui/twin/pbt-scr.h
 
-libpbt_la_SOURCES = \
-	pbt-client.c \
-	pbt-client.h \
-	pbt-main.c \
-	pbt-main.h \
-	pbt-menu.c \
-	pbt-menu.h \
-	pbt-scr.c \
-	pbt-scr.h
+ui_twin_libpbt_la_CPPFLAGS = $(ui_twin_common_cppflags)
 
-bin_PROGRAMS = pb-twin-generic
+sbin_PROGRAMS += ui/twin/petitboot-twin
 
 if ENABLE_PS3
-bin_PROGRAMS += pb-twin-ps3
+sbin_PROGRAMS += ui/twin/petitboot-ps3-twin
 endif
 
 
-pb_twin_generic_SOURCES = main-generic.c
-pb_twin_generic_LDADD = $(common_libs)
-
-pb_twin_ps3_SOURCES = main-ps3.c
-pb_twin_ps3_LDADD = $(common_libs)
-pb_twin_ps3_LDFLAGS = -lps3-utils
+ui_twin_petitboot_twin_SOURCES = ui/twin/main-generic.c
+ui_twin_petitboot_twin_CPPFLAGS = $(ui_twin_common_cppflags)
+ui_twin_petitboot_twin_LDADD = $(ui_twin_common_libs) $(twin_LIBS)
 
+ui_twin_petitboot_ps3_twin_SOURCES = ui/twin/main-ps3.c
+ui_twin_petitboot_ps3_twin_CPPFLAGS = $(ui_twin_common_cppflags)
+ui_twin_petitboot_ps3_twin_LDADD = $(ui_twin_common_libs) $(twin_LIBS) -lps3-utils
 
-MAINTAINERCLEANFILES = Makefile.in