* new_icons/Makefile.in: converted to ...

* new_icons/Makefile.am: ... this
* configure.in: automake conditional GNOME introduced.
"insticons" removed
This commit is contained in:
Pavel Roskin 2000-08-24 21:19:54 +00:00
parent 9377633174
commit b0bd98e58d
4 changed files with 94 additions and 131 deletions

View File

@ -1,5 +1,10 @@
2000-08-24 Pavel Roskin <proski@gnu.org>
* new_icons/Makefile.in: converted to ...
* new_icons/Makefile.am: ... this
* configure.in: automake conditional GNOME introduced.
"insticons" removed
* icons/*: removed
* Makefile.am, configure.in: necessary adjustments

View File

@ -536,12 +536,10 @@ gmcdep=""
libgtkedit=""
xvers="none"
AC_SUBST(insticons)
GNOME_INIT_HOOK([
mx=mx
gmcdep=gmcdep
libgtkedit="libgtkedit.a"
insticons=install_icons
if test x"$xvers" = xnone; then
xvers="Gnome"
else
@ -565,6 +563,7 @@ AC_SUBST(mx)
AC_SUBST(gmcdep)
AC_SUBST(libgtkedit)
AC_SUBST(GNOMEGNORBA_LIBS)
AM_CONDITIONAL(GNOME, test x"$mx" = xmx)
dnl
dnl Check for the -mandoc package

88
new_icons/Makefile.am Normal file
View File

@ -0,0 +1,88 @@
icondir = $(datadir)/pixmaps/mc
ALLICONS = \
gnome-image-bmp.png \
gnome-image-generic.png \
gnome-image-gif.png \
gnome-image-ief.png \
gnome-image-jpeg.png \
gnome-image-pbm.png \
gnome-image-pgm.png \
gnome-image-png.png \
gnome-image-pnm.png \
gnome-image-ppm.png \
gnome-image-ras.png \
gnome-image-rgb.png \
gnome-image-tga.png \
gnome-image-tiff.png \
gnome-image-xbm.png \
gnome-image-xpm.png \
gnome-image-xwd.png \
gnome-library.png \
gnome-pack-deb.png \
gnome-pack-rpm.png \
gnome-pack-slp.png \
gnome-video-mpeg.png \
gnome-video-quicktime.png \
gnome-video-x-msvideo.png \
gnome-text-html.png \
gnome-http-url.png \
gnome-image-generic.png \
gnome-application-encapsulated_postscript.png \
gnome-application-pdf.png \
gnome-application-pgp.png \
gnome-application-postscript.png \
gnome-application-x-c-header.png \
gnome-application-x-c-source.png \
gnome-application-x-cc-source.png \
gnome-application-x-e-theme.png \
gnome-application-x-kde-app-info.png \
gnome-application-x-generic-spreadsheet.png \
gnome-application-x-gnome-app-info.png \
gnome-application-x-java-source.png \
gnome-application-x-php.png \
gnome-application-x-reject.png \
gnome-application-x-scheme-source.png \
gnome-application-x-sql.png \
gnome-package.png \
gnome-compressed.png \
gnome-core.png \
gnome-manpage.png \
gnome-objectfile.png \
gnome-textfile.png \
gnome-tex.png \
gnome-trashcan.png \
gnome-text-x-authors.png \
gnome-text-x-copying.png \
gnome-text-x-credits.png \
gnome-text-x-install.png \
gnome-text-x-makefile.png \
gnome-text-x-readme.png \
gnome-audio.png \
gnome-audio-basic.png \
gnome-audio-midi.png \
gnome-audio-ulaw.png \
gnome-audio-x-aiff.png \
gnome-audio-x-mod.png \
gnome-audio-x-mp3.png \
gnome-audio-x-pn-realaudio.png \
gnome-audio-x-s3m.png \
gnome-audio-x-stm.png \
gnome-audio-x-voc.png \
gnome-audio-x-wav.png \
gnome-audio-x-xi.png \
gnome-audio-x-xm.png \
gnome-font-afm.png \
gnome-font-ttf.png \
gnome-font-x-pcf.png \
gnome-image-psd.png \
gnome-image-xcf.png \
gnome-image-x-xfig.png
if GNOME
icon_DATA = $(ALLICONS)
else
icon_DATA =
endif
EXTRA_DIST = $(ALLICONS)

View File

@ -1,129 +0,0 @@
srcdir = @srcdir@
VPATH = @srcdir@
rootdir = $(srcdir)/..
@MCFG@@MCF@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
#
# Distribution variables
#
DISTICONS = Makefile.in $(ALLICONS)
ALLICONS = \
gnome-image-bmp.png \
gnome-image-generic.png \
gnome-image-gif.png \
gnome-image-ief.png \
gnome-image-jpeg.png \
gnome-image-pbm.png \
gnome-image-pgm.png \
gnome-image-png.png \
gnome-image-pnm.png \
gnome-image-ppm.png \
gnome-image-ras.png \
gnome-image-rgb.png \
gnome-image-tga.png \
gnome-image-tiff.png \
gnome-image-xbm.png \
gnome-image-xpm.png \
gnome-image-xwd.png \
gnome-library.png \
gnome-pack-deb.png \
gnome-pack-rpm.png \
gnome-pack-slp.png \
gnome-video-mpeg.png \
gnome-video-quicktime.png \
gnome-video-x-msvideo.png \
gnome-text-html.png \
gnome-http-url.png \
gnome-image-generic.png \
gnome-application-encapsulated_postscript.png \
gnome-application-pdf.png \
gnome-application-pgp.png \
gnome-application-postscript.png \
gnome-application-x-c-header.png \
gnome-application-x-c-source.png \
gnome-application-x-cc-source.png \
gnome-application-x-e-theme.png \
gnome-application-x-kde-app-info.png \
gnome-application-x-generic-spreadsheet.png \
gnome-application-x-gnome-app-info.png \
gnome-application-x-java-source.png \
gnome-application-x-php.png \
gnome-application-x-reject.png \
gnome-application-x-scheme-source.png \
gnome-application-x-sql.png \
gnome-package.png \
gnome-compressed.png \
gnome-core.png \
gnome-manpage.png \
gnome-objectfile.png \
gnome-textfile.png \
gnome-tex.png \
gnome-trashcan.png \
gnome-text-x-authors.png \
gnome-text-x-copying.png \
gnome-text-x-credits.png \
gnome-text-x-install.png \
gnome-text-x-makefile.png \
gnome-text-x-readme.png \
gnome-audio.png \
gnome-audio-basic.png \
gnome-audio-midi.png \
gnome-audio-ulaw.png \
gnome-audio-x-aiff.png \
gnome-audio-x-mod.png \
gnome-audio-x-mp3.png \
gnome-audio-x-pn-realaudio.png \
gnome-audio-x-s3m.png \
gnome-audio-x-stm.png \
gnome-audio-x-voc.png \
gnome-audio-x-wav.png \
gnome-audio-x-xi.png \
gnome-audio-x-xm.png \
gnome-font-afm.png \
gnome-font-ttf.png \
gnome-font-x-pcf.png \
gnome-image-psd.png \
gnome-image-xcf.png \
gnome-image-x-xfig.png
all:
install: @insticons@ Makefile
Makefile: Makefile.in ../config.status
(cd ..; CONFIG_FILES=new_icons/Makefile CONFIG_HEADERS= ./config.status)
install_icons:
for I in $(ALLICONS); \
do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(icondir)/$$I; done
uninstall:
for I in $(ALLICONS); \
do $(RMF) $(DESTDIR)$(icondir)/$$I; done
-rmdir $(DESTDIR)$(icondir)
check:
@echo no tests are supplied.
TAGS:
cross:
clean:
realclean:
distclean:
$(RMF) $(srcdir)/*~ $(srcdir)/Makefile
distcopy:
for I in $(DISTICONS); do $(CP) $(top_srcdir)/new_icons/$$I $(top_srcdir)/mc-$(VERSION)/new_icons; done
depend dep: