revision 748:4fa68ea01d29
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz changeset | 748:4fa68ea01d29 |
parent | 747:c2d22fd75c95 |
child | 749:f06c5a12903a |
author | nkeynes |
date | Sat Jul 19 00:56:54 2008 +0000 (15 years ago) |
Add uninstall hook for pixmaps
Fix distcheck in the test dir
Add missing joy_linux.h to dist
Fix distcheck in the test dir
Add missing joy_linux.h to dist
Makefile.am | view | annotate | diff | log | ||
Makefile.in | view | annotate | diff | log | ||
src/Makefile.am | view | annotate | diff | log | ||
src/Makefile.in | view | annotate | diff | log | ||
test/Makefile.in | view | annotate | diff | log |
1.1 --- a/Makefile.am Fri Jul 18 13:21:54 2008 +00001.2 +++ b/Makefile.am Sat Jul 19 00:56:54 2008 +00001.3 @@ -29,6 +29,10 @@1.4 fi1.5 $(mkinstalldirs) $(DESTDIR)$(sysconfdir)1.7 +uninstall-local:1.8 + @$(NORMAL_UNINSTALL)1.9 + rm -rf $(DESTDIR)$(datadir)/pixmaps1.10 +1.11 dist-hook:1.12 if test -d $(srcdir)/pixmaps; then \1.13 mkdir $(distdir)/pixmaps; \
2.1 --- a/Makefile.in Fri Jul 18 13:21:54 2008 +00002.2 +++ b/Makefile.in Sat Jul 19 00:56:54 2008 +00002.3 @@ -13,6 +13,7 @@2.4 # PARTICULAR PURPOSE.2.6 @SET_MAKE@2.7 +2.8 srcdir = @srcdir@2.9 top_srcdir = @top_srcdir@2.10 VPATH = @srcdir@2.11 @@ -35,11 +36,12 @@2.12 POST_UNINSTALL = :2.13 build_triplet = @build@2.14 host_triplet = @host@2.15 -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \2.16 - $(srcdir)/Makefile.in $(srcdir)/config.h.in \2.17 - $(top_srcdir)/configure $(top_srcdir)/test/Makefile.in AUTHORS \2.18 - COPYING ChangeLog INSTALL NEWS acconfig.h config.guess \2.19 - config.sub depcomp install-sh missing mkinstalldirs2.20 +DIST_COMMON = README $(am__configure_deps) $(dist_sysconf_DATA) \2.21 + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \2.22 + $(srcdir)/config.h.in $(top_srcdir)/configure \2.23 + $(top_srcdir)/test/Makefile.in AUTHORS COPYING ChangeLog \2.24 + INSTALL NEWS acconfig.h config.guess config.sub depcomp \2.25 + install-sh missing mkinstalldirs2.26 subdir = .2.27 ACLOCAL_M4 = $(top_srcdir)/aclocal.m42.28 am__aclocal_m4_deps = $(top_srcdir)/configure.in2.29 @@ -59,9 +61,17 @@2.30 pdf-recursive ps-recursive uninstall-info-recursive \2.31 uninstall-recursive2.32 man1dir = $(mandir)/man12.33 -am__installdirs = "$(DESTDIR)$(man1dir)"2.34 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(sysconfdir)"2.35 NROFF = nroff2.36 MANS = $(man_MANS)2.37 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;2.38 +am__vpath_adj = case $$p in \2.39 + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \2.40 + *) f=$$p;; \2.41 + esac;2.42 +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;2.43 +dist_sysconfDATA_INSTALL = $(INSTALL_DATA)2.44 +DATA = $(dist_sysconf_DATA)2.45 ETAGS = etags2.46 CTAGS = ctags2.47 DIST_SUBDIRS = src po test2.48 @@ -241,6 +251,7 @@2.49 @BUILD_SYSTEST_TRUE@TEST_SUBDIR = test2.50 SUBDIRS = src po $(TEST_SUBDIR)2.51 EXTRA_DIST = autogen.sh lxdream.pod bundlelibs.pl2.52 +dist_sysconf_DATA = lxdreamrc2.53 man_MANS = lxdream.12.54 all: config.h2.55 $(MAKE) $(AM_MAKEFLAGS) all-recursive2.56 @@ -344,6 +355,23 @@2.57 echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \2.58 rm -f "$(DESTDIR)$(man1dir)/$$inst"; \2.59 done2.60 +install-dist_sysconfDATA: $(dist_sysconf_DATA)2.61 + @$(NORMAL_INSTALL)2.62 + test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"2.63 + @list='$(dist_sysconf_DATA)'; for p in $$list; do \2.64 + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \2.65 + f=$(am__strip_dir) \2.66 + echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \2.67 + $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \2.68 + done2.69 +2.70 +uninstall-dist_sysconfDATA:2.71 + @$(NORMAL_UNINSTALL)2.72 + @list='$(dist_sysconf_DATA)'; for p in $$list; do \2.73 + f=$(am__strip_dir) \2.74 + echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \2.75 + rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \2.76 + done2.78 # This directory's subdirectories are mostly independent; you can cd2.79 # into them and run `make' without going through this Makefile.2.80 @@ -625,10 +653,10 @@2.81 check-am: all-am2.82 check: check-recursive2.83 @GUI_COCOA_FALSE@all-local:2.84 -all-am: Makefile $(MANS) config.h all-local2.85 +all-am: Makefile $(MANS) $(DATA) config.h all-local2.86 installdirs: installdirs-recursive2.87 installdirs-am:2.88 - for dir in "$(DESTDIR)$(man1dir)"; do \2.89 + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(sysconfdir)"; do \2.90 test -z "$$dir" || $(mkdir_p) "$$dir"; \2.91 done2.92 install: install-recursive2.93 @@ -676,7 +704,7 @@2.95 install-data-am: install-data-local install-man2.97 -install-exec-am:2.98 +install-exec-am: install-dist_sysconfDATA2.100 install-info: install-info-recursive2.102 @@ -702,7 +730,8 @@2.104 ps-am:2.106 -uninstall-am: uninstall-info-am uninstall-man2.107 +uninstall-am: uninstall-dist_sysconfDATA uninstall-info-am \2.108 + uninstall-local uninstall-man2.110 uninstall-info: uninstall-info-recursive2.112 @@ -715,14 +744,15 @@2.113 distclean-generic distclean-hdr distclean-recursive \2.114 distclean-tags distcleancheck distdir distuninstallcheck dvi \2.115 dvi-am html html-am info info-am install install-am \2.116 - install-data install-data-am install-data-local install-exec \2.117 - install-exec-am install-info install-info-am install-man \2.118 - install-man1 install-strip installcheck installcheck-am \2.119 - installdirs installdirs-am maintainer-clean \2.120 - maintainer-clean-generic maintainer-clean-recursive \2.121 - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \2.122 - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \2.123 - uninstall-info-am uninstall-man uninstall-man12.124 + install-data install-data-am install-data-local \2.125 + install-dist_sysconfDATA install-exec install-exec-am \2.126 + install-info install-info-am install-man install-man1 \2.127 + install-strip installcheck installcheck-am installdirs \2.128 + installdirs-am maintainer-clean maintainer-clean-generic \2.129 + maintainer-clean-recursive mostlyclean mostlyclean-generic \2.130 + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \2.131 + uninstall uninstall-am uninstall-dist_sysconfDATA \2.132 + uninstall-info-am uninstall-local uninstall-man uninstall-man12.135 lxdream.1: lxdream.pod2.136 @@ -739,7 +769,10 @@2.137 done \2.138 fi2.139 $(mkinstalldirs) $(DESTDIR)$(sysconfdir)2.140 - $(INSTALL_DATA) lxdreamrc $(DESTDIR)$(sysconfdir)2.141 +2.142 +uninstall-local:2.143 + @$(NORMAL_UNINSTALL)2.144 + rm -rf $(DESTDIR)$(datadir)/pixmaps2.146 dist-hook:2.147 if test -d $(srcdir)/pixmaps; then \
3.1 --- a/src/Makefile.am Fri Jul 18 13:21:54 2008 +00003.2 +++ b/src/Makefile.am Sat Jul 19 00:56:54 2008 +00003.3 @@ -134,7 +134,7 @@3.4 endif3.6 if JOY_LINUX3.7 -lxdream_SOURCES += drivers/joy_linux.c3.8 +lxdream_SOURCES += drivers/joy_linux.c drivers/joy_linux.h3.9 endif
4.1 --- a/src/Makefile.in Fri Jul 18 13:21:54 2008 +00004.2 +++ b/src/Makefile.in Sat Jul 19 00:56:54 2008 +00004.3 @@ -68,7 +68,7 @@4.4 @CDROM_LINUX_TRUE@am__append_12 = drivers/cd_linux.c4.5 @CDROM_OSX_TRUE@am__append_13 = drivers/cd_osx.c drivers/osx_iokit.c drivers/osx_iokit.h4.6 @CDROM_NONE_TRUE@am__append_14 = drivers/cd_none.c4.7 -@JOY_LINUX_TRUE@am__append_15 = drivers/joy_linux.c4.8 +@JOY_LINUX_TRUE@am__append_15 = drivers/joy_linux.c drivers/joy_linux.h4.9 subdir = src4.10 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in4.11 ACLOCAL_M4 = $(top_srcdir)/aclocal.m44.12 @@ -133,7 +133,7 @@4.13 drivers/audio_osx.c drivers/audio_pulse.c drivers/audio_esd.c \4.14 drivers/audio_alsa.c drivers/cd_linux.c drivers/cd_osx.c \4.15 drivers/osx_iokit.c drivers/osx_iokit.h drivers/cd_none.c \4.16 - drivers/joy_linux.c4.17 + drivers/joy_linux.c drivers/joy_linux.h4.18 @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \4.19 @BUILD_SH4X86_TRUE@ x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \4.20 @BUILD_SH4X86_TRUE@ dis-init.$(OBJEXT) dis-buf.$(OBJEXT)
5.1 --- a/test/Makefile.in Fri Jul 18 13:21:54 2008 +00005.2 +++ b/test/Makefile.in Sat Jul 19 00:56:54 2008 +00005.3 @@ -1,6 +1,7 @@5.4 srcdir = @srcdir@5.5 top_srcdir = @top_srcdir@5.6 VPATH = @srcdir@5.7 +mkdir_p = @mkdir_p@5.9 # host compiler and flags5.10 HOSTCC = @CC@5.11 @@ -141,3 +142,65 @@5.13 distclean: clean5.14 rm -f Makefile5.15 +5.16 +install:5.17 +5.18 +installcheck:5.19 +5.20 +uninstall:5.21 +5.22 +DISTFILES = asic.c asic.h bin2c.c crt0.s dma.h dmac.c ide.c ide.h interrupt.s \5.23 + lib.c lib.h math.s pvr.c pvr.h rendload.c sh4/add.s sh4/addc.s \5.24 + sh4/addv.s sh4/and.s sh4/andi.s sh4/bf.s sh4/bsr.s sh4/bt.s sh4/cmp.s \5.25 + sh4/cmpstr.s sh4/div0.s sh4/div1.s sh4/excslot.s sh4/float.s sh4/fmov.s \5.26 + sh4/ftrc.s sh4/inc.s sh4/mac.s sh4/rot.s sh4/shl.s sh4/shld.s sh4/sub.s \5.27 + sh4/subc.s sh4/tas.s sh4/testsh4.c sh4/tlb.s sh4/trapa.s sh4/undef.s \5.28 + sh4/xtrct.s testdata.c testdata.h testdisp.c testide.c testmath.c \5.29 + testmmu.c testregs.c testrend.c testspu.c testta.c testyuv.c timer.c timer.h \5.30 + dc.x lib/libc.a lib/libm.a lib/newlib-1.8.2-dc.patch \5.31 + include/_ansi.h include/_syslist.h include/ar.h include/assert.h include/ctype.h \5.32 + include/dirent.h include/errno.h include/fastmath.h include/fcntl.h include/grp.h \5.33 + include/ieeefp.h include/locale.h include/machine/fastmath.h include/machine/ieeefp.h \5.34 + include/machine/setjmp-dj.h include/machine/setjmp.h include/machine/time.h \5.35 + include/machine/types.h include/malloc.h include/math.h include/paths.h \5.36 + include/process.h include/pwd.h include/reent.h include/regdef.h include/setjmp.h \5.37 + include/signal.h include/stdio.h include/stdlib.h include/string.h include/sys/_types.h \5.38 + include/sys/config.h include/sys/dirent.h include/sys/errno.h include/sys/fcntl.h \5.39 + include/sys/file.h include/sys/param.h include/sys/reent.h include/sys/resource.h \5.40 + include/sys/signal.h include/sys/stat-dj.h include/sys/stat.h include/sys/time.h \5.41 + include/sys/timeb.h include/sys/times.h include/sys/types.h include/sys/unistd.h \5.42 + include/sys/utime.h include/sys/wait.h include/termios.h include/time.h \5.43 + include/unctrl.h include/unistd.h include/utime.h include/utmp.h5.44 +5.45 +5.46 +5.47 +distdir:5.48 + $(mkdir_p) $(distdir)/sh4 $(distdir)/lib $(distdir)/include5.49 + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \5.50 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \5.51 + list='$(DISTFILES)'; for file in $$list; do \5.52 + case $$file in \5.53 + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \5.54 + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \5.55 + esac; \5.56 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \5.57 + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \5.58 + if test "$$dir" != "$$file" && test "$$dir" != "."; then \5.59 + dir="/$$dir"; \5.60 + $(mkdir_p) "$(distdir)$$dir"; \5.61 + else \5.62 + dir=''; \5.63 + fi; \5.64 + if test -d $$d/$$file; then \5.65 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \5.66 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \5.67 + fi; \5.68 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \5.69 + else \5.70 + test -f $(distdir)/$$file \5.71 + || cp -p $$d/$$file $(distdir)/$$file \5.72 + || exit 1; \5.73 + fi; \5.74 + done5.75 +5.76 +dvi:
.