FSViewer-ac_am15.patch

   1 diff -Nru FSViewer.app-0.2.3/configure.in FSViewer.app-0.2.3.new/configure.in
   2 --- FSViewer.app-0.2.3/configure.in     Sat Oct  9 20:45:21 1999
   3 +++ FSViewer.app-0.2.3.new/configure.in Mon Sep 17 18:39:05 2001
   4 @@ -5,10 +5,7 @@
   5
   6  AC_PROG_MAKE_SET
   7
   8 -PACKAGE=FSViewer.app
   9 -AC_SUBST(PACKAGE)
  10 -VERSION=0.2.3
  11 -AC_SUBST(VERSION)
  12 +AM_INIT_AUTOMAKE(FSViewer.app, 0.2.3)
  13
  14  dnl Checks for programs.
  15  AC_PROG_CC
  16 @@ -17,11 +14,6 @@
  17  AC_ARG_PROGRAM
  18  AC_PROG_RANLIB
  19
  20 -AC_PATH_PROG(AUTOCONF, autoconf)
  21 -AC_PATH_PROG(ACLOCAL, aclocal)
  22 -AC_PATH_PROG(AUTOHEADER, autoheader)
  23 -AC_PATH_PROG(AUTOMAKE, automake)
  24 -
  25  dnl the prefix
  26  dnl ==========
  27  dnl
  28 @@ -43,9 +35,6 @@
  29  fi
  30
  31  dnl Additional "default" items
  32 -#LIBS="$LIBS -lX11"
  33 -#CFLAGS="$CFLAGS -I/usr/local/include"
  34 -#LDFLAGS="$LDFLAGS -L/usr/local/lib"
  35
  36  dnl Check for get-wraster-flags
  37  AC_CHECK_PROG(GET_WRASTER_FLAGS, get-wraster-flags, get-wraster-flags)
  38 @@ -154,4 +143,4 @@
  39
  40  AC_DEFINE_UNQUOTED(ICONDIR, "${fsviewerdir}")
  41
  42 -AC_OUTPUT(Makefile src/Makefile src/regexp/Makefile defs/Makefile)
  43 +AC_OUTPUT(Makefile src/Makefile defs/Makefile)
  44 diff -Nru FSViewer.app-0.2.3/src/Makefile.am FSViewer.app-0.2.3.new/src/Makefile.am
  45 --- FSViewer.app-0.2.3/src/Makefile.am  Sat Oct  9 20:45:22 1999
  46 +++ FSViewer.app-0.2.3.new/src/Makefile.am      Mon Sep 17 18:38:49 2001
  47 @@ -1,10 +1,9 @@
  48  ## Process this file with automake to produce Makefile.in
  49  ##
  50 -SUBDIRS                 = regexp
  51 -bindir                 = @fsviewerdir@
  52 +bindir                 = $(fsviewerdir)
  53  bin_PROGRAMS           = FSViewer
  54 -datadir                        = @fsviewerdir@
  55 -pkgdatadir              = @fsviewerdir@
  56 +datadir                        = $(fsviewerdir)
  57 +pkgdatadir              = $(fsviewerdir)
  58  FSViewer_SOURCES       = FSViewer.c files.c FSFileBrowser.c\
  59                           list.c misc.c prop.c timestampWidget.c \
  60                           attribsInspector.c editInspector.c exeInspector.c \
  61 @@ -13,11 +12,15 @@
  62                           FSFileView.c FSInspector.c magic.c DnD.c \
  63                           FSPathView.c xmodifier.c FSFinder.c FSFileButton.c\
  64                           FSMCList.c FSPrefs.c
  65 -LDADD                   = -Lregexp -lregx
  66  noinst_HEADERS         = FSViewer.h filebrowser.h files.h list.h misc.h \
  67                           timestampWidget.h FSBrowser.h FSPanel.h FSUtils.h \
  68                           FSMenu.h FSFileView.h magic.h DnD.h FSFileButton.h \
  69                           FSFinder.h FSMCList.h FSPathView.h FSPrefs.h
  70  pkgdata_DATA           = MagicFiles
  71 -##EXTRA_DIST           = icons/* xpm/* fsviewer.sh
  72 -EXTRA_DIST             = xpm/* MagicFiles
  73 +EXTRA_DIST             = MagicFiles arrow.xpm backing2.xpm backing.xpm \
  74 +                         clk.xpm date.xpm file_plain.xpm FSViewer.xpm \
  75 +                         led.xpm list_dir.xpm list_dir.xpm.bak \
  76 +                         list_exe.xpm list_file.xpm month.xpm transparent.xpm \
  77 +                         weekday.xpm wmanalog.xpm wmdigital.xpm wmtime.xpm \
  78 +                         year.xpm
  79 +
  80 diff -Nru FSViewer.app-0.2.3/src/regexp/Makefile.am FSViewer.app-0.2.3.new/src/regexp/Makefile.am
  81 --- FSViewer.app-0.2.3/src/regexp/Makefile.am   Sat Oct  9 20:45:23 1999
  82 +++ FSViewer.app-0.2.3.new/src/regexp/Makefile.am       Thu Jan  1 01:00:00 1970
  83 @@ -1,5 +0,0 @@
  84 -## Process this file with automake to produce Makefile.in
  85 -##
  86 -libregx_a_SOURCES      = regerror.c regexp.c regsub.c regexp.h regmagic.h
  87 -noinst_LIBRARIES       = libregx.a
  88 -EXTRA_DIST             = README regexp.3
  89 diff -Nru FSViewer.app-0.2.3/xpm/Makefile.am FSViewer.app-0.2.3.new/xpm/Makefile.am
  90 --- FSViewer.app-0.2.3/xpm/Makefile.am  Fri Apr 16 19:34:30 1999
  91 +++ FSViewer.app-0.2.3.new/xpm/Makefile.am      Mon Sep 17 18:38:28 2001
  92 @@ -1,4 +1,36 @@
  93  icondatadir              = $(pkgdatadir)/icons
  94
  95 -icondata_DATA            = *.xpm *.tif
  96 +icondata_DATA            = arrow.xpm file-dot-c.xpm file-dot-mov.xpm \
  97 +                          file-dot-sh.xpm file-generic-gnustep.xpm \
  98 +                          generic-library.xpm clk.xpm file-dot-dat.xpm \
  99 +                          file-dot-mp3.xpm file-dot-so.xpm file-link.xpm \
 100 +                          generic-sound.xpm date.xpm file-dot-deb.xpm \
 101 +                          file-dot-mpg.xpm file-dot-tar.xpm \
 102 +                          file-makefile.xpm generic-text.xpm \
 103 +                          exec-link.xpm file-dot-eps.xpm file-dot-m.xpm \
 104 +                          file-dot-tcl.xpm file_plain.xpm home.xpm \
 105 +                          file-core.xpm file-dot-f90.xpm file-dot-o.xpm \
 106 +                          file-dot-texi.xpm file-plain.xpm led.xpm \
 107 +                          file-dot-aiff.xpm file-dot-fig.xpm \
 108 +                          file-dot-pdf.xpm file-dot-tex.xpm \
 109 +                          file-readme.xpm month.xpm file-dot-au.xpm \
 110 +                          file-dot-for.xpm file-dot-pedro.xpm \
 111 +                          file-dot-tga.xpm folder-link.xpm mycomputer.xpm \
 112 +                          file-dot-avi.xpm file-dot-gif.xpm \
 113 +                          file-dot-pl.xpm file-dot-txt.xpm folder.xpm \
 114 +                          neighbour.xpm file-dot-a.xpm file-dot-gz.xpm \
 115 +                          file-dot-png.xpm file-dot-wav.xpm Folder.xpm \
 116 +                          penguin.xpm file-dot-bz2.xpm file-dot-html.xpm \
 117 +                          file-dot-ps.xpm file-dot-xbm.xpm FSViewer2.xpm \
 118 +                          weekday.xpm file-dot-cc.xpm file-dot-h.xpm \
 119 +                          file-dot-py.xpm file-dot-xcf.xpm FSViewer.xpm \
 120 +                          wmanalog.xpm file-dot-class.xpm \
 121 +                          file-dot-jar.xpm file-dot-rc.xpm \
 122 +                          file-dot-xpm.xpm full-folder.xpm wmdigital.xpm \
 123 +                          file-dot-conf.xpm file-dot-java.xpm \
 124 +                          file-dot-rpm.xpm file-dot-zip.xpm \
 125 +                          generic-coding.xpm wmtime.xpm file-dot-cpp.xpm \
 126 +                          file-dot-jpg.xpm file-dot-shar.xpm \
 127 +                          file-executable.xpm generic-conf.xpm year.xpm
 128 +
 129  EXTRA_DIST              = $(icondata_DATA)