From e5893c43294d63e6b7364ef0ced84392d543dff0 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Sun, 21 Aug 2005 22:10:54 +0000 Subject: [PATCH] moved stuff git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@130 7f574dfc-610e-0410-a909-a81674777703 --- Makefile.am | 32 +- Makefile.in | 350 ++++++++++++++++++--- configure.in | 4 +- install-sh | 438 ++++++++++++++++----------- cairo.c => src/cairo.c | 0 common.c => src/common.c | 0 src/config.h.in | 133 ++++++++ conky.c => src/conky.c | 0 conky.h => src/conky.h | 0 freebsd.c => src/freebsd.c | 0 fs.c => src/fs.c | 0 ftp.c => src/ftp.c | 0 ftp.h => src/ftp.h | 0 libmpdclient.c => src/libmpdclient.c | 0 libmpdclient.h => src/libmpdclient.h | 0 linux.c => src/linux.c | 0 mail.c => src/mail.c | 0 mixer.c => src/mixer.c | 0 mldonkey.c => src/mldonkey.c | 0 mpd.c => src/mpd.c | 0 netbsd.c => src/netbsd.c | 0 remotec.c => src/remotec.c | 0 remotec.h => src/remotec.h | 0 remoted.c => src/remoted.c | 0 remoted.h => src/remoted.h | 0 seti.c => src/seti.c | 0 solaris.c => src/solaris.c | 0 top.c => src/top.c | 0 top.h => src/top.h | 0 x11.c => src/x11.c | 0 30 files changed, 714 insertions(+), 243 deletions(-) rename cairo.c => src/cairo.c (100%) rename common.c => src/common.c (100%) create mode 100644 src/config.h.in rename conky.c => src/conky.c (100%) rename conky.h => src/conky.h (100%) rename freebsd.c => src/freebsd.c (100%) rename fs.c => src/fs.c (100%) rename ftp.c => src/ftp.c (100%) rename ftp.h => src/ftp.h (100%) rename libmpdclient.c => src/libmpdclient.c (100%) rename libmpdclient.h => src/libmpdclient.h (100%) rename linux.c => src/linux.c (100%) rename mail.c => src/mail.c (100%) rename mixer.c => src/mixer.c (100%) rename mldonkey.c => src/mldonkey.c (100%) rename mpd.c => src/mpd.c (100%) rename netbsd.c => src/netbsd.c (100%) rename remotec.c => src/remotec.c (100%) rename remotec.h => src/remotec.h (100%) rename remoted.c => src/remoted.c (100%) rename remoted.h => src/remoted.h (100%) rename seti.c => src/seti.c (100%) rename solaris.c => src/solaris.c (100%) rename top.c => src/top.c (100%) rename top.h => src/top.h (100%) rename x11.c => src/x11.c (100%) diff --git a/Makefile.am b/Makefile.am index 335695e7..46a68118 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,56 +1,56 @@ bin_PROGRAMS = conky if BUILD_SETI -seti = seti.c +seti = src/seti.c endif if BUILD_MPD -mpd = mpd.c libmpdclient.c +mpd = src/mpd.c src/libmpdclient.c endif if BUILD_LINUX -linux = linux.c +linux = src/linux.c endif if BUILD_SOLARIS -solaris = solaris.c +solaris = src/solaris.c endif if BUILD_FREEBSD -freebsd = freebsd.c +freebsd = src/freebsd.c endif if BUILD_NETBSD -netbsd = netbsd.c +netbsd = src/netbsd.c endif if BUILD_CAIRO -cairo = cairo.c +cairo = src/cairo.c endif if BUILD_MLDONKEY -mldonkey = mldonkey.c +mldonkey = src/mldonkey.c endif if BUILD_X11 -x11 = x11.c +x11 = src/x11.c endif -conky_SOURCES = common.c fs.c top.c $(linux) mail.c mixer.c $(seti) $(mpd) \ - $(solaris) $(freebsd) $(netbsd) $(cairo) conky.c conky.h $(x11) \ - $(mldonkey) remoted.c remoted.h remotec.c remotec.h +conky_SOURCES = src/common.c src/fs.c src/top.c $(linux) src/mail.c src/mixer.c $(seti) $(mpd) \ + $(solaris) $(freebsd) $(netbsd) $(cairo) src/conky.c src/conky.h $(x11) \ + $(mldonkey) src/remoted.c src/remoted.h src/remotec.c src/remotec.h conky_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS) conky_LDADD = $(METAR_LIBS) -man_MANS = conky.1 +man_MANS = doc/conky.1 LIBS = -lm -lpthread # conky.1 is in EXTRA_DIST in case that someone doesn't have help2man -EXTRA_DIST = conkyrc.sample conky.1 conky.x \ +EXTRA_DIST = conkyrc.sample doc/conky.1 \ app-admin/conky/conky-1.2.ebuild app-admin/conky/conky-1.9999.ebuild -EXTRA_conky_SOURCES = seti.c linux.c solaris.c freebsd.c netbsd.c mpd.c libmpdclient.c \ -cairo.c libmpdclient.h top.h mldonkey.c ftp.c ftp.h x11.c \ No newline at end of file +EXTRA_conky_SOURCES = src/seti.c src/linux.c src/solaris.c src/freebsd.c src/netbsd.c src/mpd.c src/libmpdclient.c \ +src/cairo.c src/libmpdclient.h src/top.h src/mldonkey.c src/ftp.c src/ftp.h src/x11.c diff --git a/Makefile.in b/Makefile.in index 70d1a980..593d5aaf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -39,9 +39,9 @@ POST_UNINSTALL = : bin_PROGRAMS = conky$(EXEEXT) subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO depcomp install-sh missing mkinstalldirs + $(srcdir)/Makefile.in $(top_srcdir)/configure \ + $(top_srcdir)/src/config.h.in AUTHORS COPYING ChangeLog \ + INSTALL NEWS TODO depcomp install-sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -49,15 +49,16 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h +CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am__conky_SOURCES_DIST = common.c fs.c top.c linux.c mail.c mixer.c \ - seti.c mpd.c libmpdclient.c solaris.c freebsd.c netbsd.c \ - cairo.c conky.c conky.h x11.c mldonkey.c remoted.c remoted.h \ - remotec.c remotec.h +am__conky_SOURCES_DIST = src/common.c src/fs.c src/top.c src/linux.c \ + src/mail.c src/mixer.c src/seti.c src/mpd.c src/libmpdclient.c \ + src/solaris.c src/freebsd.c src/netbsd.c src/cairo.c \ + src/conky.c src/conky.h src/x11.c src/mldonkey.c src/remoted.c \ + src/remoted.h src/remotec.c src/remotec.h @BUILD_LINUX_TRUE@am__objects_1 = linux.$(OBJEXT) @BUILD_SETI_TRUE@am__objects_2 = seti.$(OBJEXT) @BUILD_MPD_TRUE@am__objects_3 = mpd.$(OBJEXT) libmpdclient.$(OBJEXT) @@ -75,7 +76,7 @@ am_conky_OBJECTS = common.$(OBJEXT) fs.$(OBJEXT) top.$(OBJEXT) \ remoted.$(OBJEXT) remotec.$(OBJEXT) conky_OBJECTS = $(am_conky_OBJECTS) conky_DEPENDENCIES = -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -193,32 +194,31 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@BUILD_SETI_TRUE@seti = seti.c -@BUILD_MPD_TRUE@mpd = mpd.c libmpdclient.c -@BUILD_LINUX_TRUE@linux = linux.c -@BUILD_SOLARIS_TRUE@solaris = solaris.c -@BUILD_FREEBSD_TRUE@freebsd = freebsd.c -@BUILD_NETBSD_TRUE@netbsd = netbsd.c -@BUILD_CAIRO_TRUE@cairo = cairo.c -@BUILD_MLDONKEY_TRUE@mldonkey = mldonkey.c -@BUILD_X11_TRUE@x11 = x11.c -conky_SOURCES = common.c fs.c top.c $(linux) mail.c mixer.c $(seti) $(mpd) \ - $(solaris) $(freebsd) $(netbsd) $(cairo) conky.c conky.h $(x11) \ - $(mldonkey) remoted.c remoted.h remotec.c remotec.h +@BUILD_SETI_TRUE@seti = src/seti.c +@BUILD_MPD_TRUE@mpd = src/mpd.c src/libmpdclient.c +@BUILD_LINUX_TRUE@linux = src/linux.c +@BUILD_SOLARIS_TRUE@solaris = src/solaris.c +@BUILD_FREEBSD_TRUE@freebsd = src/freebsd.c +@BUILD_NETBSD_TRUE@netbsd = src/netbsd.c +@BUILD_CAIRO_TRUE@cairo = src/cairo.c +@BUILD_MLDONKEY_TRUE@mldonkey = src/mldonkey.c +@BUILD_X11_TRUE@x11 = src/x11.c +conky_SOURCES = src/common.c src/fs.c src/top.c $(linux) src/mail.c src/mixer.c $(seti) $(mpd) \ + $(solaris) $(freebsd) $(netbsd) $(cairo) src/conky.c src/conky.h $(x11) \ + $(mldonkey) src/remoted.c src/remoted.h src/remotec.c src/remotec.h conky_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS) conky_LDADD = $(METAR_LIBS) -man_MANS = conky.1 +man_MANS = doc/conky.1 # conky.1 is in EXTRA_DIST in case that someone doesn't have help2man -EXTRA_DIST = conkyrc.sample conky.1 conky.x \ +EXTRA_DIST = conkyrc.sample doc/conky.1 \ app-admin/conky/conky-1.2.ebuild app-admin/conky/conky-1.9999.ebuild -EXTRA_conky_SOURCES = seti.c linux.c solaris.c freebsd.c netbsd.c mpd.c libmpdclient.c \ -cairo.c libmpdclient.h top.h mldonkey.c ftp.c ftp.h x11.c +EXTRA_conky_SOURCES = src/seti.c src/linux.c src/solaris.c src/freebsd.c src/netbsd.c src/mpd.c src/libmpdclient.c \ +src/cairo.c src/libmpdclient.h src/top.h src/mldonkey.c src/ftp.c src/ftp.h src/x11.c -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-am +all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj @@ -256,22 +256,22 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -config.h: stamp-h1 +src/config.h: src/stamp-h1 @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + rm -f src/stamp-h1; \ + $(MAKE) src/stamp-h1; \ else :; fi -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) +src/stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status + @rm -f src/stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status src/config.h +$(top_srcdir)/src/config.h.in: $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 + rm -f src/stamp-h1 touch $@ distclean-hdr: - -rm -f config.h stamp-h1 + -rm -f src/config.h src/stamp-h1 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @@ -338,6 +338,272 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +common.o: src/common.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT common.o -MD -MP -MF "$(DEPDIR)/common.Tpo" -c -o common.o `test -f 'src/common.c' || echo '$(srcdir)/'`src/common.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/common.Tpo" "$(DEPDIR)/common.Po"; else rm -f "$(DEPDIR)/common.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/common.c' object='common.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o common.o `test -f 'src/common.c' || echo '$(srcdir)/'`src/common.c + +common.obj: src/common.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT common.obj -MD -MP -MF "$(DEPDIR)/common.Tpo" -c -o common.obj `if test -f 'src/common.c'; then $(CYGPATH_W) 'src/common.c'; else $(CYGPATH_W) '$(srcdir)/src/common.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/common.Tpo" "$(DEPDIR)/common.Po"; else rm -f "$(DEPDIR)/common.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/common.c' object='common.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o common.obj `if test -f 'src/common.c'; then $(CYGPATH_W) 'src/common.c'; else $(CYGPATH_W) '$(srcdir)/src/common.c'; fi` + +fs.o: src/fs.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fs.o -MD -MP -MF "$(DEPDIR)/fs.Tpo" -c -o fs.o `test -f 'src/fs.c' || echo '$(srcdir)/'`src/fs.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fs.Tpo" "$(DEPDIR)/fs.Po"; else rm -f "$(DEPDIR)/fs.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/fs.c' object='fs.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fs.o `test -f 'src/fs.c' || echo '$(srcdir)/'`src/fs.c + +fs.obj: src/fs.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fs.obj -MD -MP -MF "$(DEPDIR)/fs.Tpo" -c -o fs.obj `if test -f 'src/fs.c'; then $(CYGPATH_W) 'src/fs.c'; else $(CYGPATH_W) '$(srcdir)/src/fs.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fs.Tpo" "$(DEPDIR)/fs.Po"; else rm -f "$(DEPDIR)/fs.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/fs.c' object='fs.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fs.obj `if test -f 'src/fs.c'; then $(CYGPATH_W) 'src/fs.c'; else $(CYGPATH_W) '$(srcdir)/src/fs.c'; fi` + +top.o: src/top.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT top.o -MD -MP -MF "$(DEPDIR)/top.Tpo" -c -o top.o `test -f 'src/top.c' || echo '$(srcdir)/'`src/top.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/top.Tpo" "$(DEPDIR)/top.Po"; else rm -f "$(DEPDIR)/top.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/top.c' object='top.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o top.o `test -f 'src/top.c' || echo '$(srcdir)/'`src/top.c + +top.obj: src/top.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT top.obj -MD -MP -MF "$(DEPDIR)/top.Tpo" -c -o top.obj `if test -f 'src/top.c'; then $(CYGPATH_W) 'src/top.c'; else $(CYGPATH_W) '$(srcdir)/src/top.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/top.Tpo" "$(DEPDIR)/top.Po"; else rm -f "$(DEPDIR)/top.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/top.c' object='top.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o top.obj `if test -f 'src/top.c'; then $(CYGPATH_W) 'src/top.c'; else $(CYGPATH_W) '$(srcdir)/src/top.c'; fi` + +linux.o: src/linux.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT linux.o -MD -MP -MF "$(DEPDIR)/linux.Tpo" -c -o linux.o `test -f 'src/linux.c' || echo '$(srcdir)/'`src/linux.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/linux.Tpo" "$(DEPDIR)/linux.Po"; else rm -f "$(DEPDIR)/linux.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/linux.c' object='linux.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o linux.o `test -f 'src/linux.c' || echo '$(srcdir)/'`src/linux.c + +linux.obj: src/linux.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT linux.obj -MD -MP -MF "$(DEPDIR)/linux.Tpo" -c -o linux.obj `if test -f 'src/linux.c'; then $(CYGPATH_W) 'src/linux.c'; else $(CYGPATH_W) '$(srcdir)/src/linux.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/linux.Tpo" "$(DEPDIR)/linux.Po"; else rm -f "$(DEPDIR)/linux.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/linux.c' object='linux.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o linux.obj `if test -f 'src/linux.c'; then $(CYGPATH_W) 'src/linux.c'; else $(CYGPATH_W) '$(srcdir)/src/linux.c'; fi` + +mail.o: src/mail.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail.o -MD -MP -MF "$(DEPDIR)/mail.Tpo" -c -o mail.o `test -f 'src/mail.c' || echo '$(srcdir)/'`src/mail.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail.Tpo" "$(DEPDIR)/mail.Po"; else rm -f "$(DEPDIR)/mail.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/mail.c' object='mail.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail.o `test -f 'src/mail.c' || echo '$(srcdir)/'`src/mail.c + +mail.obj: src/mail.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mail.obj -MD -MP -MF "$(DEPDIR)/mail.Tpo" -c -o mail.obj `if test -f 'src/mail.c'; then $(CYGPATH_W) 'src/mail.c'; else $(CYGPATH_W) '$(srcdir)/src/mail.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mail.Tpo" "$(DEPDIR)/mail.Po"; else rm -f "$(DEPDIR)/mail.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/mail.c' object='mail.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mail.obj `if test -f 'src/mail.c'; then $(CYGPATH_W) 'src/mail.c'; else $(CYGPATH_W) '$(srcdir)/src/mail.c'; fi` + +mixer.o: src/mixer.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mixer.o -MD -MP -MF "$(DEPDIR)/mixer.Tpo" -c -o mixer.o `test -f 'src/mixer.c' || echo '$(srcdir)/'`src/mixer.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mixer.Tpo" "$(DEPDIR)/mixer.Po"; else rm -f "$(DEPDIR)/mixer.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/mixer.c' object='mixer.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mixer.o `test -f 'src/mixer.c' || echo '$(srcdir)/'`src/mixer.c + +mixer.obj: src/mixer.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mixer.obj -MD -MP -MF "$(DEPDIR)/mixer.Tpo" -c -o mixer.obj `if test -f 'src/mixer.c'; then $(CYGPATH_W) 'src/mixer.c'; else $(CYGPATH_W) '$(srcdir)/src/mixer.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mixer.Tpo" "$(DEPDIR)/mixer.Po"; else rm -f "$(DEPDIR)/mixer.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/mixer.c' object='mixer.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mixer.obj `if test -f 'src/mixer.c'; then $(CYGPATH_W) 'src/mixer.c'; else $(CYGPATH_W) '$(srcdir)/src/mixer.c'; fi` + +seti.o: src/seti.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seti.o -MD -MP -MF "$(DEPDIR)/seti.Tpo" -c -o seti.o `test -f 'src/seti.c' || echo '$(srcdir)/'`src/seti.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/seti.Tpo" "$(DEPDIR)/seti.Po"; else rm -f "$(DEPDIR)/seti.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/seti.c' object='seti.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seti.o `test -f 'src/seti.c' || echo '$(srcdir)/'`src/seti.c + +seti.obj: src/seti.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seti.obj -MD -MP -MF "$(DEPDIR)/seti.Tpo" -c -o seti.obj `if test -f 'src/seti.c'; then $(CYGPATH_W) 'src/seti.c'; else $(CYGPATH_W) '$(srcdir)/src/seti.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/seti.Tpo" "$(DEPDIR)/seti.Po"; else rm -f "$(DEPDIR)/seti.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/seti.c' object='seti.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seti.obj `if test -f 'src/seti.c'; then $(CYGPATH_W) 'src/seti.c'; else $(CYGPATH_W) '$(srcdir)/src/seti.c'; fi` + +mpd.o: src/mpd.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpd.o -MD -MP -MF "$(DEPDIR)/mpd.Tpo" -c -o mpd.o `test -f 'src/mpd.c' || echo '$(srcdir)/'`src/mpd.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mpd.Tpo" "$(DEPDIR)/mpd.Po"; else rm -f "$(DEPDIR)/mpd.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/mpd.c' object='mpd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpd.o `test -f 'src/mpd.c' || echo '$(srcdir)/'`src/mpd.c + +mpd.obj: src/mpd.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpd.obj -MD -MP -MF "$(DEPDIR)/mpd.Tpo" -c -o mpd.obj `if test -f 'src/mpd.c'; then $(CYGPATH_W) 'src/mpd.c'; else $(CYGPATH_W) '$(srcdir)/src/mpd.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mpd.Tpo" "$(DEPDIR)/mpd.Po"; else rm -f "$(DEPDIR)/mpd.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/mpd.c' object='mpd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpd.obj `if test -f 'src/mpd.c'; then $(CYGPATH_W) 'src/mpd.c'; else $(CYGPATH_W) '$(srcdir)/src/mpd.c'; fi` + +libmpdclient.o: src/libmpdclient.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpdclient.o -MD -MP -MF "$(DEPDIR)/libmpdclient.Tpo" -c -o libmpdclient.o `test -f 'src/libmpdclient.c' || echo '$(srcdir)/'`src/libmpdclient.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libmpdclient.Tpo" "$(DEPDIR)/libmpdclient.Po"; else rm -f "$(DEPDIR)/libmpdclient.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/libmpdclient.c' object='libmpdclient.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpdclient.o `test -f 'src/libmpdclient.c' || echo '$(srcdir)/'`src/libmpdclient.c + +libmpdclient.obj: src/libmpdclient.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpdclient.obj -MD -MP -MF "$(DEPDIR)/libmpdclient.Tpo" -c -o libmpdclient.obj `if test -f 'src/libmpdclient.c'; then $(CYGPATH_W) 'src/libmpdclient.c'; else $(CYGPATH_W) '$(srcdir)/src/libmpdclient.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libmpdclient.Tpo" "$(DEPDIR)/libmpdclient.Po"; else rm -f "$(DEPDIR)/libmpdclient.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/libmpdclient.c' object='libmpdclient.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpdclient.obj `if test -f 'src/libmpdclient.c'; then $(CYGPATH_W) 'src/libmpdclient.c'; else $(CYGPATH_W) '$(srcdir)/src/libmpdclient.c'; fi` + +solaris.o: src/solaris.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT solaris.o -MD -MP -MF "$(DEPDIR)/solaris.Tpo" -c -o solaris.o `test -f 'src/solaris.c' || echo '$(srcdir)/'`src/solaris.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/solaris.Tpo" "$(DEPDIR)/solaris.Po"; else rm -f "$(DEPDIR)/solaris.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/solaris.c' object='solaris.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o solaris.o `test -f 'src/solaris.c' || echo '$(srcdir)/'`src/solaris.c + +solaris.obj: src/solaris.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT solaris.obj -MD -MP -MF "$(DEPDIR)/solaris.Tpo" -c -o solaris.obj `if test -f 'src/solaris.c'; then $(CYGPATH_W) 'src/solaris.c'; else $(CYGPATH_W) '$(srcdir)/src/solaris.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/solaris.Tpo" "$(DEPDIR)/solaris.Po"; else rm -f "$(DEPDIR)/solaris.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/solaris.c' object='solaris.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o solaris.obj `if test -f 'src/solaris.c'; then $(CYGPATH_W) 'src/solaris.c'; else $(CYGPATH_W) '$(srcdir)/src/solaris.c'; fi` + +freebsd.o: src/freebsd.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT freebsd.o -MD -MP -MF "$(DEPDIR)/freebsd.Tpo" -c -o freebsd.o `test -f 'src/freebsd.c' || echo '$(srcdir)/'`src/freebsd.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/freebsd.Tpo" "$(DEPDIR)/freebsd.Po"; else rm -f "$(DEPDIR)/freebsd.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/freebsd.c' object='freebsd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd.o `test -f 'src/freebsd.c' || echo '$(srcdir)/'`src/freebsd.c + +freebsd.obj: src/freebsd.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT freebsd.obj -MD -MP -MF "$(DEPDIR)/freebsd.Tpo" -c -o freebsd.obj `if test -f 'src/freebsd.c'; then $(CYGPATH_W) 'src/freebsd.c'; else $(CYGPATH_W) '$(srcdir)/src/freebsd.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/freebsd.Tpo" "$(DEPDIR)/freebsd.Po"; else rm -f "$(DEPDIR)/freebsd.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/freebsd.c' object='freebsd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd.obj `if test -f 'src/freebsd.c'; then $(CYGPATH_W) 'src/freebsd.c'; else $(CYGPATH_W) '$(srcdir)/src/freebsd.c'; fi` + +netbsd.o: src/netbsd.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netbsd.o -MD -MP -MF "$(DEPDIR)/netbsd.Tpo" -c -o netbsd.o `test -f 'src/netbsd.c' || echo '$(srcdir)/'`src/netbsd.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/netbsd.Tpo" "$(DEPDIR)/netbsd.Po"; else rm -f "$(DEPDIR)/netbsd.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/netbsd.c' object='netbsd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netbsd.o `test -f 'src/netbsd.c' || echo '$(srcdir)/'`src/netbsd.c + +netbsd.obj: src/netbsd.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netbsd.obj -MD -MP -MF "$(DEPDIR)/netbsd.Tpo" -c -o netbsd.obj `if test -f 'src/netbsd.c'; then $(CYGPATH_W) 'src/netbsd.c'; else $(CYGPATH_W) '$(srcdir)/src/netbsd.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/netbsd.Tpo" "$(DEPDIR)/netbsd.Po"; else rm -f "$(DEPDIR)/netbsd.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/netbsd.c' object='netbsd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netbsd.obj `if test -f 'src/netbsd.c'; then $(CYGPATH_W) 'src/netbsd.c'; else $(CYGPATH_W) '$(srcdir)/src/netbsd.c'; fi` + +cairo.o: src/cairo.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo.o -MD -MP -MF "$(DEPDIR)/cairo.Tpo" -c -o cairo.o `test -f 'src/cairo.c' || echo '$(srcdir)/'`src/cairo.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cairo.Tpo" "$(DEPDIR)/cairo.Po"; else rm -f "$(DEPDIR)/cairo.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/cairo.c' object='cairo.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo.o `test -f 'src/cairo.c' || echo '$(srcdir)/'`src/cairo.c + +cairo.obj: src/cairo.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cairo.obj -MD -MP -MF "$(DEPDIR)/cairo.Tpo" -c -o cairo.obj `if test -f 'src/cairo.c'; then $(CYGPATH_W) 'src/cairo.c'; else $(CYGPATH_W) '$(srcdir)/src/cairo.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/cairo.Tpo" "$(DEPDIR)/cairo.Po"; else rm -f "$(DEPDIR)/cairo.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/cairo.c' object='cairo.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cairo.obj `if test -f 'src/cairo.c'; then $(CYGPATH_W) 'src/cairo.c'; else $(CYGPATH_W) '$(srcdir)/src/cairo.c'; fi` + +conky.o: src/conky.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT conky.o -MD -MP -MF "$(DEPDIR)/conky.Tpo" -c -o conky.o `test -f 'src/conky.c' || echo '$(srcdir)/'`src/conky.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/conky.Tpo" "$(DEPDIR)/conky.Po"; else rm -f "$(DEPDIR)/conky.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/conky.c' object='conky.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o conky.o `test -f 'src/conky.c' || echo '$(srcdir)/'`src/conky.c + +conky.obj: src/conky.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT conky.obj -MD -MP -MF "$(DEPDIR)/conky.Tpo" -c -o conky.obj `if test -f 'src/conky.c'; then $(CYGPATH_W) 'src/conky.c'; else $(CYGPATH_W) '$(srcdir)/src/conky.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/conky.Tpo" "$(DEPDIR)/conky.Po"; else rm -f "$(DEPDIR)/conky.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/conky.c' object='conky.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o conky.obj `if test -f 'src/conky.c'; then $(CYGPATH_W) 'src/conky.c'; else $(CYGPATH_W) '$(srcdir)/src/conky.c'; fi` + +x11.o: src/x11.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT x11.o -MD -MP -MF "$(DEPDIR)/x11.Tpo" -c -o x11.o `test -f 'src/x11.c' || echo '$(srcdir)/'`src/x11.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/x11.Tpo" "$(DEPDIR)/x11.Po"; else rm -f "$(DEPDIR)/x11.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/x11.c' object='x11.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o x11.o `test -f 'src/x11.c' || echo '$(srcdir)/'`src/x11.c + +x11.obj: src/x11.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT x11.obj -MD -MP -MF "$(DEPDIR)/x11.Tpo" -c -o x11.obj `if test -f 'src/x11.c'; then $(CYGPATH_W) 'src/x11.c'; else $(CYGPATH_W) '$(srcdir)/src/x11.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/x11.Tpo" "$(DEPDIR)/x11.Po"; else rm -f "$(DEPDIR)/x11.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/x11.c' object='x11.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o x11.obj `if test -f 'src/x11.c'; then $(CYGPATH_W) 'src/x11.c'; else $(CYGPATH_W) '$(srcdir)/src/x11.c'; fi` + +mldonkey.o: src/mldonkey.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mldonkey.o -MD -MP -MF "$(DEPDIR)/mldonkey.Tpo" -c -o mldonkey.o `test -f 'src/mldonkey.c' || echo '$(srcdir)/'`src/mldonkey.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mldonkey.Tpo" "$(DEPDIR)/mldonkey.Po"; else rm -f "$(DEPDIR)/mldonkey.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/mldonkey.c' object='mldonkey.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mldonkey.o `test -f 'src/mldonkey.c' || echo '$(srcdir)/'`src/mldonkey.c + +mldonkey.obj: src/mldonkey.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mldonkey.obj -MD -MP -MF "$(DEPDIR)/mldonkey.Tpo" -c -o mldonkey.obj `if test -f 'src/mldonkey.c'; then $(CYGPATH_W) 'src/mldonkey.c'; else $(CYGPATH_W) '$(srcdir)/src/mldonkey.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/mldonkey.Tpo" "$(DEPDIR)/mldonkey.Po"; else rm -f "$(DEPDIR)/mldonkey.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/mldonkey.c' object='mldonkey.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mldonkey.obj `if test -f 'src/mldonkey.c'; then $(CYGPATH_W) 'src/mldonkey.c'; else $(CYGPATH_W) '$(srcdir)/src/mldonkey.c'; fi` + +remoted.o: src/remoted.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT remoted.o -MD -MP -MF "$(DEPDIR)/remoted.Tpo" -c -o remoted.o `test -f 'src/remoted.c' || echo '$(srcdir)/'`src/remoted.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/remoted.Tpo" "$(DEPDIR)/remoted.Po"; else rm -f "$(DEPDIR)/remoted.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/remoted.c' object='remoted.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o remoted.o `test -f 'src/remoted.c' || echo '$(srcdir)/'`src/remoted.c + +remoted.obj: src/remoted.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT remoted.obj -MD -MP -MF "$(DEPDIR)/remoted.Tpo" -c -o remoted.obj `if test -f 'src/remoted.c'; then $(CYGPATH_W) 'src/remoted.c'; else $(CYGPATH_W) '$(srcdir)/src/remoted.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/remoted.Tpo" "$(DEPDIR)/remoted.Po"; else rm -f "$(DEPDIR)/remoted.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/remoted.c' object='remoted.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o remoted.obj `if test -f 'src/remoted.c'; then $(CYGPATH_W) 'src/remoted.c'; else $(CYGPATH_W) '$(srcdir)/src/remoted.c'; fi` + +remotec.o: src/remotec.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT remotec.o -MD -MP -MF "$(DEPDIR)/remotec.Tpo" -c -o remotec.o `test -f 'src/remotec.c' || echo '$(srcdir)/'`src/remotec.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/remotec.Tpo" "$(DEPDIR)/remotec.Po"; else rm -f "$(DEPDIR)/remotec.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/remotec.c' object='remotec.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o remotec.o `test -f 'src/remotec.c' || echo '$(srcdir)/'`src/remotec.c + +remotec.obj: src/remotec.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT remotec.obj -MD -MP -MF "$(DEPDIR)/remotec.Tpo" -c -o remotec.obj `if test -f 'src/remotec.c'; then $(CYGPATH_W) 'src/remotec.c'; else $(CYGPATH_W) '$(srcdir)/src/remotec.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/remotec.Tpo" "$(DEPDIR)/remotec.Po"; else rm -f "$(DEPDIR)/remotec.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/remotec.c' object='remotec.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o remotec.obj `if test -f 'src/remotec.c'; then $(CYGPATH_W) 'src/remotec.c'; else $(CYGPATH_W) '$(srcdir)/src/remotec.c'; fi` + +ftp.o: src/ftp.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ftp.o -MD -MP -MF "$(DEPDIR)/ftp.Tpo" -c -o ftp.o `test -f 'src/ftp.c' || echo '$(srcdir)/'`src/ftp.c; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/ftp.Tpo" "$(DEPDIR)/ftp.Po"; else rm -f "$(DEPDIR)/ftp.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/ftp.c' object='ftp.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ftp.o `test -f 'src/ftp.c' || echo '$(srcdir)/'`src/ftp.c + +ftp.obj: src/ftp.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ftp.obj -MD -MP -MF "$(DEPDIR)/ftp.Tpo" -c -o ftp.obj `if test -f 'src/ftp.c'; then $(CYGPATH_W) 'src/ftp.c'; else $(CYGPATH_W) '$(srcdir)/src/ftp.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/ftp.Tpo" "$(DEPDIR)/ftp.Po"; else rm -f "$(DEPDIR)/ftp.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/ftp.c' object='ftp.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ftp.obj `if test -f 'src/ftp.c'; then $(CYGPATH_W) 'src/ftp.c'; else $(CYGPATH_W) '$(srcdir)/src/ftp.c'; fi` uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) @@ -395,11 +661,11 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -411,11 +677,11 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -436,7 +702,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/app-admin/conky + $(mkdir_p) $(distdir)/app-admin/conky $(distdir)/doc $(distdir)/src @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -562,7 +828,7 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(MANS) config.h +all-am: Makefile $(PROGRAMS) $(MANS) installdirs: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ diff --git a/configure.in b/configure.in index 64240717..166e87f0 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ -AC_INIT(conky.c) +AC_INIT(src/conky.c) AM_INIT_AUTOMAKE(conky, 1.3) -AM_CONFIG_HEADER(config.h) +AM_CONFIG_HEADER(src/config.h) uname=`uname` diff --git a/install-sh b/install-sh index e9de2384..1a835340 100644 --- a/install-sh +++ b/install-sh @@ -1,19 +1,38 @@ #!/bin/sh -# # install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). + +scriptversion=2005-02-02.21 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. # -# Copyright 1991 by the Massachusetts Institute of Technology +# Copyright (C) 1994 X Consortium # -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it @@ -23,13 +42,11 @@ # from scratch. It can only install one file at a time, a restriction # shared with many OS's install programs. - # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" @@ -41,211 +58,266 @@ stripprog="${STRIPPROG-strip}" rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" -instcmd="$mvprog" chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +chowncmd= +chgrpcmd= +stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" -src="" -dst="" -dir_arg="" +src= +dst= +dir_arg= +dstarg= +no_target_directory= -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... - -d) dir_arg=true - shift - continue;; +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. - -o) chowncmd="$chownprog $2" - shift - shift - continue;; +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; +while test -n "$1"; do + case $1 in + -c) shift + continue;; - -s) stripcmd="$stripprog" - shift - continue;; + -d) dir_arg=true + shift + continue;; - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; + --help) echo "$usage"; exit $?;; - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi + -o) chowncmd="$chownprog $2" + shift + shift + continue;; -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else + -s) stripcmd=$stripprog + shift + continue;; -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" + -t) dstarg=$2 shift + shift + continue;; - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi + -T) no_target_directory=true + shift + continue;; - pathcomp="${pathcomp}/" + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 fi -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else + if test -n "$dir_arg"; then + dst=$src + src= -# If we're going to rename the final executable, determine the name now. + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi -# don't allow the sed command to completely eliminate the filename + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi -# Make a temp file name in the proper directory. + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - dsttmp=$dstdir/#inst.$$# + # Make sure that the destination directory exists. -# Move or copy the file name to the temp name + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" - $doit $instcmd $src $dsttmp && + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS - trap "rm -f ${dsttmp}" 0 && + pathcomp= -# and set any options; do chmod last to preserve setuid bits + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && + else + dstfile=`basename "$dst"` -# Now rename the file to the real destination. + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 -fi && + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && -exit 0 + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/cairo.c b/src/cairo.c similarity index 100% rename from cairo.c rename to src/cairo.c diff --git a/common.c b/src/common.c similarity index 100% rename from common.c rename to src/common.c diff --git a/src/config.h.in b/src/config.h.in new file mode 100644 index 00000000..c08ebec5 --- /dev/null +++ b/src/config.h.in @@ -0,0 +1,133 @@ +/* src/config.h.in. Generated from configure.in by autoheader. */ + +/* Define if you are using Cairo */ +#undef CAIRO + +/* Define if you want support for the DBE extension */ +#undef DOUBLE_BUFFER + +/* Define to 1 if you have the header file. */ +#undef HAVE_CAIRO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_CAIRO_XLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_DIRENT_H + +/* Define if you have getloadavg */ +#undef HAVE_GETLOADAVG + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define if you have kstat (Solaris) */ +#undef HAVE_KSTAT + +/* Define if you have libXext */ +#undef HAVE_LIBXEXT + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_SOUNDCARD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `popen' function. */ +#undef HAVE_POPEN + +/* Define to 1 if you have the header file. */ +#undef HAVE_SIGNAL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define if you have sysinfo (Linux) */ +#undef HAVE_SYSINFO + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MOUNT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STATFS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UTSNAME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define if you have X11 */ +#undef HAVE_X11 + +/* Define to 1 if you have the header file. */ +#undef HAVE_X11_EXTENSIONS_XDBE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_X11_XLIB_H + +/* Xdbe */ +#undef HAVE_XDBE + +/* Define if you want MLDonkey support */ +#undef MLDONKEY + +/* Define if you want MPD support */ +#undef MPD + +/* Define if you want support for window creating */ +#undef OWN_WINDOW + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define if you want to use /proc/uptime for uptime */ +#undef PROC_UPTIME + +/* Define if you want SETI at Home stats */ +#undef SETI + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION + +/* Define if you want to use X11 */ +#undef X11 + +/* Define if you are using Xft */ +#undef XFT diff --git a/conky.c b/src/conky.c similarity index 100% rename from conky.c rename to src/conky.c diff --git a/conky.h b/src/conky.h similarity index 100% rename from conky.h rename to src/conky.h diff --git a/freebsd.c b/src/freebsd.c similarity index 100% rename from freebsd.c rename to src/freebsd.c diff --git a/fs.c b/src/fs.c similarity index 100% rename from fs.c rename to src/fs.c diff --git a/ftp.c b/src/ftp.c similarity index 100% rename from ftp.c rename to src/ftp.c diff --git a/ftp.h b/src/ftp.h similarity index 100% rename from ftp.h rename to src/ftp.h diff --git a/libmpdclient.c b/src/libmpdclient.c similarity index 100% rename from libmpdclient.c rename to src/libmpdclient.c diff --git a/libmpdclient.h b/src/libmpdclient.h similarity index 100% rename from libmpdclient.h rename to src/libmpdclient.h diff --git a/linux.c b/src/linux.c similarity index 100% rename from linux.c rename to src/linux.c diff --git a/mail.c b/src/mail.c similarity index 100% rename from mail.c rename to src/mail.c diff --git a/mixer.c b/src/mixer.c similarity index 100% rename from mixer.c rename to src/mixer.c diff --git a/mldonkey.c b/src/mldonkey.c similarity index 100% rename from mldonkey.c rename to src/mldonkey.c diff --git a/mpd.c b/src/mpd.c similarity index 100% rename from mpd.c rename to src/mpd.c diff --git a/netbsd.c b/src/netbsd.c similarity index 100% rename from netbsd.c rename to src/netbsd.c diff --git a/remotec.c b/src/remotec.c similarity index 100% rename from remotec.c rename to src/remotec.c diff --git a/remotec.h b/src/remotec.h similarity index 100% rename from remotec.h rename to src/remotec.h diff --git a/remoted.c b/src/remoted.c similarity index 100% rename from remoted.c rename to src/remoted.c diff --git a/remoted.h b/src/remoted.h similarity index 100% rename from remoted.h rename to src/remoted.h diff --git a/seti.c b/src/seti.c similarity index 100% rename from seti.c rename to src/seti.c diff --git a/solaris.c b/src/solaris.c similarity index 100% rename from solaris.c rename to src/solaris.c diff --git a/top.c b/src/top.c similarity index 100% rename from top.c rename to src/top.c diff --git a/top.h b/src/top.h similarity index 100% rename from top.h rename to src/top.h diff --git a/x11.c b/src/x11.c similarity index 100% rename from x11.c rename to src/x11.c