ui/common: Free message on return

[petitboot] / ui / twin / Makefile.am

diff --git a/ui/twin/Makefile.am b/ui/twin/Makefile.am
index 605e05e3659f1bef3a9193218902c12edd551145..2c5032afe45592755b1d1ca5495f258db2d8d698 100644 (file)
--- a/ui/twin/Makefile.am
+++ b/ui/twin/Makefile.am
@@ -12,43 +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 =
+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 =
-pb_twin_generic_LDADD = $(common_libs)
-
-pb_twin_ps3_SOURCES = 
-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