# HG changeset patch
# User nkeynes
# Date 1216429014 0
# Node ID 4fa68ea01d294aa7754e6d66ad13fffc002b89ac
# Parent  c2d22fd75c953c0fa12777b682f176fbabf4c113
Add uninstall hook for pixmaps
Fix distcheck in the test dir
Add missing joy_linux.h to dist

--- a/Makefile.am	Fri Jul 18 13:21:54 2008 +0000
+++ b/Makefile.am	Sat Jul 19 00:56:54 2008 +0000
@@ -29,6 +29,10 @@
 	fi
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
 
+uninstall-local:
+	@$(NORMAL_UNINSTALL) 
+	rm -rf $(DESTDIR)$(datadir)/pixmaps
+               
 dist-hook:
 	if test -d $(srcdir)/pixmaps; then \
 	  mkdir $(distdir)/pixmaps; \
--- a/Makefile.in	Fri Jul 18 13:21:54 2008 +0000
+++ b/Makefile.in	Sat Jul 19 00:56:54 2008 +0000
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -35,11 +36,12 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure $(top_srcdir)/test/Makefile.in AUTHORS \
-	COPYING ChangeLog INSTALL NEWS acconfig.h config.guess \
-	config.sub depcomp install-sh missing mkinstalldirs
+DIST_COMMON = README $(am__configure_deps) $(dist_sysconf_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(top_srcdir)/configure \
+	$(top_srcdir)/test/Makefile.in AUTHORS COPYING ChangeLog \
+	INSTALL NEWS acconfig.h config.guess config.sub depcomp \
+	install-sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -59,9 +61,17 @@
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(sysconfdir)"
 NROFF = nroff
 MANS = $(man_MANS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_sysconf_DATA)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = src po test
@@ -241,6 +251,7 @@
 @BUILD_SYSTEST_TRUE@TEST_SUBDIR = test
 SUBDIRS = src po $(TEST_SUBDIR)
 EXTRA_DIST = autogen.sh lxdream.pod bundlelibs.pl
+dist_sysconf_DATA = lxdreamrc
 man_MANS = lxdream.1
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -344,6 +355,23 @@
 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
+install-dist_sysconfDATA: $(dist_sysconf_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
+	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
+	done
+
+uninstall-dist_sysconfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
+	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -625,10 +653,10 @@
 check-am: all-am
 check: check-recursive
 @GUI_COCOA_FALSE@all-local:
-all-am: Makefile $(MANS) config.h all-local
+all-am: Makefile $(MANS) $(DATA) config.h all-local
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(man1dir)"; do \
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(sysconfdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
@@ -676,7 +704,7 @@
 
 install-data-am: install-data-local install-man
 
-install-exec-am:
+install-exec-am: install-dist_sysconfDATA
 
 install-info: install-info-recursive
 
@@ -702,7 +730,8 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-man
+uninstall-am: uninstall-dist_sysconfDATA uninstall-info-am \
+	uninstall-local uninstall-man
 
 uninstall-info: uninstall-info-recursive
 
@@ -715,14 +744,15 @@
 	distclean-generic distclean-hdr distclean-recursive \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-man1 install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-man uninstall-man1
+	install-data install-data-am install-data-local \
+	install-dist_sysconfDATA install-exec install-exec-am \
+	install-info install-info-am install-man install-man1 \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_sysconfDATA \
+	uninstall-info-am uninstall-local uninstall-man uninstall-man1
 
 
 lxdream.1: lxdream.pod
@@ -739,7 +769,10 @@
 	  done \
 	fi
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-	$(INSTALL_DATA) lxdreamrc $(DESTDIR)$(sysconfdir)
+
+uninstall-local:
+	@$(NORMAL_UNINSTALL) 
+	rm -rf $(DESTDIR)$(datadir)/pixmaps
 
 dist-hook:
 	if test -d $(srcdir)/pixmaps; then \
--- a/src/Makefile.am	Fri Jul 18 13:21:54 2008 +0000
+++ b/src/Makefile.am	Sat Jul 19 00:56:54 2008 +0000
@@ -134,7 +134,7 @@
 endif
 
 if JOY_LINUX
-lxdream_SOURCES += drivers/joy_linux.c
+lxdream_SOURCES += drivers/joy_linux.c drivers/joy_linux.h
 endif
 
 
--- a/src/Makefile.in	Fri Jul 18 13:21:54 2008 +0000
+++ b/src/Makefile.in	Sat Jul 19 00:56:54 2008 +0000
@@ -68,7 +68,7 @@
 @CDROM_LINUX_TRUE@am__append_12 = drivers/cd_linux.c
 @CDROM_OSX_TRUE@am__append_13 = drivers/cd_osx.c drivers/osx_iokit.c drivers/osx_iokit.h
 @CDROM_NONE_TRUE@am__append_14 = drivers/cd_none.c
-@JOY_LINUX_TRUE@am__append_15 = drivers/joy_linux.c
+@JOY_LINUX_TRUE@am__append_15 = drivers/joy_linux.c drivers/joy_linux.h
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -133,7 +133,7 @@
 	drivers/audio_osx.c drivers/audio_pulse.c drivers/audio_esd.c \
 	drivers/audio_alsa.c drivers/cd_linux.c drivers/cd_osx.c \
 	drivers/osx_iokit.c drivers/osx_iokit.h drivers/cd_none.c \
-	drivers/joy_linux.c
+	drivers/joy_linux.c drivers/joy_linux.h
 @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
 @BUILD_SH4X86_TRUE@	x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \
 @BUILD_SH4X86_TRUE@	dis-init.$(OBJEXT) dis-buf.$(OBJEXT)
--- a/test/Makefile.in	Fri Jul 18 13:21:54 2008 +0000
+++ b/test/Makefile.in	Sat Jul 19 00:56:54 2008 +0000
@@ -1,6 +1,7 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+mkdir_p = @mkdir_p@
 
 # host compiler and flags
 HOSTCC		= @CC@
@@ -141,3 +142,65 @@
 
 distclean: clean
 	rm -f Makefile
+
+install:
+
+installcheck:
+
+uninstall:
+
+DISTFILES = asic.c asic.h bin2c.c crt0.s dma.h dmac.c ide.c ide.h interrupt.s \
+        lib.c lib.h math.s pvr.c pvr.h rendload.c sh4/add.s sh4/addc.s \
+        sh4/addv.s sh4/and.s sh4/andi.s sh4/bf.s sh4/bsr.s sh4/bt.s sh4/cmp.s \
+        sh4/cmpstr.s sh4/div0.s sh4/div1.s sh4/excslot.s sh4/float.s sh4/fmov.s \
+        sh4/ftrc.s sh4/inc.s sh4/mac.s sh4/rot.s sh4/shl.s sh4/shld.s sh4/sub.s \
+        sh4/subc.s sh4/tas.s sh4/testsh4.c sh4/tlb.s sh4/trapa.s sh4/undef.s \
+        sh4/xtrct.s testdata.c testdata.h testdisp.c testide.c testmath.c \
+        testmmu.c testregs.c testrend.c testspu.c testta.c testyuv.c timer.c timer.h \
+        dc.x lib/libc.a lib/libm.a lib/newlib-1.8.2-dc.patch \
+	include/_ansi.h include/_syslist.h include/ar.h include/assert.h include/ctype.h \
+	include/dirent.h include/errno.h include/fastmath.h include/fcntl.h include/grp.h \
+	include/ieeefp.h include/locale.h include/machine/fastmath.h include/machine/ieeefp.h \
+	include/machine/setjmp-dj.h include/machine/setjmp.h include/machine/time.h \
+	include/machine/types.h include/malloc.h include/math.h include/paths.h \
+	include/process.h include/pwd.h include/reent.h include/regdef.h include/setjmp.h \
+	include/signal.h include/stdio.h include/stdlib.h include/string.h include/sys/_types.h \
+	include/sys/config.h include/sys/dirent.h include/sys/errno.h include/sys/fcntl.h \
+	include/sys/file.h include/sys/param.h include/sys/reent.h include/sys/resource.h \
+	include/sys/signal.h include/sys/stat-dj.h include/sys/stat.h include/sys/time.h \
+	include/sys/timeb.h include/sys/times.h include/sys/types.h include/sys/unistd.h \
+	include/sys/utime.h include/sys/wait.h include/termios.h include/time.h \
+	include/unctrl.h include/unistd.h include/utime.h include/utmp.h
+                        
+
+
+distdir:
+	$(mkdir_p) $(distdir)/sh4 $(distdir)/lib $(distdir)/include
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+
+dvi: