X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2FMakefile.am;h=df6ea021144e2baa213a653eb7c5274509fe2a57;hp=9955c18ea6f0e86514b90c72fe888dadedb73fbd;hb=ff7293bba1fd4cdf54bb90bd1b7a38dd393fee69;hpb=6532debf0bd95509cff9eb8634f57aef20a696b9

diff --git a/ui/common/Makefile.am b/ui/common/Makefile.am
index 9955c18..df6ea02 100644
--- a/ui/common/Makefile.am
+++ b/ui/common/Makefile.am
@@ -12,52 +12,39 @@
 #  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)
-
-AM_CFLAGS = \
-	$(DEFAULT_CFLAGS)
-
-noinst_LTLIBRARIES = libpbui.la
-
-libpbui_la_SOURCES = \
-	discover-client.c \
-	discover-client.h \
-	joystick.c \
-	joystick.h \
-	loader.c \
-	loader.h \
-	timer.c \
-	timer.h \
-	ui-system.c \
-	ui-system.h \
-	url.c \
-	url.h
+noinst_LTLIBRARIES += ui/common/libpbui.la
+
+ui_common_libpbui_la_SOURCES = \
+	ui/common/discover-client.c \
+	ui/common/discover-client.h \
+	ui/common/joystick.c \
+	ui/common/joystick.h \
+	ui/common/timer.c \
+	ui/common/timer.h \
+	ui/common/ui-system.c \
+	ui/common/ui-system.h
 
 if ENABLE_PS3
-libpbui_la_SOURCES += \
-	ps3.c \
-	ps3.h
+ui_common_libpbui_la_SOURCES += \
+	ui/common/ps3.c \
+	ui/common/ps3.h
 endif
 
 artwork =
 
 if WITH_TWIN
 artwork += \
-	artwork/background.jpg \
-	artwork/cdrom.png \
-	artwork/cursor.gz \
-	artwork/hdd.png \
-	artwork/network.png \
-	artwork/system.png \
-	artwork/tux.png \
-	artwork/usbpen.png
+	$(srcdir)/ui/common/artwork/background.jpg \
+	$(srcdir)/ui/common/artwork/COPYING-tux \
+	$(srcdir)/ui/common/artwork/tux.png \
+	$(srcdir)/ui/common/artwork/oxygen/applications-system.png \
+	$(srcdir)/ui/common/artwork/oxygen/configure.png \
+	$(srcdir)/ui/common/artwork/oxygen/COPYING-oxygen \
+	$(srcdir)/ui/common/artwork/oxygen/drive-harddisk.png \
+	$(srcdir)/ui/common/artwork/oxygen/network-wired.png \
+	$(srcdir)/ui/common/artwork/oxygen/utilities-terminal.png
 endif
 
 artworkdir = $(pkgdatadir)/artwork/
 dist_artwork_DATA = $(artwork)
 
-MAINTAINERCLEANFILES = Makefile.in