Yasumichi Akahoshi
yasum****@users*****
2005年 3月 28日 (月) 22:44:31 JST
Index: cxplorer/src/Makefile.in
diff -u cxplorer/src/Makefile.in:1.18 cxplorer/src/Makefile.in:1.19
--- cxplorer/src/Makefile.in:1.18 Mon Feb 14 00:35:09 2005
+++ cxplorer/src/Makefile.in Mon Mar 28 22:44:30 2005
@@ -173,6 +173,9 @@
TAR = tar
GZIP_ENV = --best
+DEP_FILES = .deps/actcalls.P .deps/cxp-dir-view.P \
+.deps/cxp-right-pane.P .deps/cxplorer.P .deps/interface.P .deps/main.P \
+.deps/menubar.P .deps/property.P .deps/toolbar.P
SOURCES = $(cxplorer_SOURCES)
OBJECTS = $(cxplorer_OBJECTS)
@@ -180,9 +183,9 @@
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE****@Makef***** $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -212,9 +215,6 @@
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
-.c.o:
- $(COMPILE) -c $<
-
# FIXME: We should only use cygpath when building on Windows,
# and only if it is available.
.c.obj:
@@ -237,9 +237,6 @@
maintainer-clean-compile:
-.c.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
.s.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
@@ -294,6 +291,11 @@
subdir = src
distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
@@ -304,6 +306,38 @@
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+ -rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
+
+%.lo: %.c
+ @echo '$(LTCOMPILE) -c $<'; \
+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
+ < .deps/$(*F).pp > .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm -f .deps/$(*F).pp
info-am:
info: info-am
dvi-am:
@@ -341,26 +375,27 @@
maintainer-clean-generic:
mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
- mostlyclean-libtool mostlyclean-tags \
+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \
- clean-generic mostlyclean-am
+ clean-depend clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \
- distclean-tags distclean-generic clean-am
+ distclean-tags distclean-depend distclean-generic \
+ clean-am
-rm -f libtool
distclean: distclean-am
maintainer-clean-am: maintainer-clean-binPROGRAMS \
maintainer-clean-compile maintainer-clean-libtool \
- maintainer-clean-tags maintainer-clean-generic \
- distclean-am
+ maintainer-clean-tags maintainer-clean-depend \
+ maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
@@ -371,12 +406,14 @@
mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: cxplorer/src/cxp-right-pane.c
diff -u cxplorer/src/cxp-right-pane.c:1.14 cxplorer/src/cxp-right-pane.c:1.15
--- cxplorer/src/cxp-right-pane.c:1.14 Mon Feb 14 00:35:09 2005
+++ cxplorer/src/cxp-right-pane.c Mon Mar 28 22:44:30 2005
@@ -159,7 +159,7 @@
pspec = g_param_spec_string ("preview-dir",
"Command to preview directory",
"Set command line to preview directory",
- "ls" /* default value */ ,
+ NULL,
G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
g_object_class_install_property (gobject_class,
CXP_RIGHT_PANE_PREVIEW_DIR, pspec);
@@ -167,7 +167,7 @@
pspec = g_param_spec_string ("preview-text",
"Command to preview text file",
"Set command line to preview text file",
- "head --lines 20" /* default value */ ,
+ NULL,
G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
g_object_class_install_property (gobject_class,
CXP_RIGHT_PANE_PREVIEW_TEXT, pspec);
@@ -175,8 +175,7 @@
pspec = g_param_spec_string ("preview-binary",
"Command to preview binary file",
"Set command line to preview binary file",
- "od -t x1z -A x -N 112 --width=16"
- /* default value */ ,
+ NULL,
G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
g_object_class_install_property (gobject_class,
CXP_RIGHT_PANE_PREVIEW_BINARY, pspec);
Index: cxplorer/src/cxplorer.c
diff -u cxplorer/src/cxplorer.c:1.22 cxplorer/src/cxplorer.c:1.23
--- cxplorer/src/cxplorer.c:1.22 Mon Feb 14 00:35:09 2005
+++ cxplorer/src/cxplorer.c Mon Mar 28 22:44:30 2005
@@ -5,7 +5,7 @@
* This file contains functions which related struct Cxplorer.
* @author Yasumichi Akahoshi <yasum****@users*****>
* @date Mon Jun 14 13:26:05 2004
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
****************************************************************************/
#ifdef HAVE_CONFIG_H
@@ -36,8 +36,7 @@
cxplorer->profile = cxp_profile_new (g_get_application_name (), "main");
cxplorer->gbShowDotFile =
- cxp_profile_get_integer (cxplorer->profile, "ShowDotFile",
- FALSE);
+ cxp_profile_get_integer (cxplorer->profile, "ShowDotFile");
pixbuf = create_pixbuf ("cxp_dir.png");
cxplorer->dirview =
Index: cxplorer/src/interface.c
diff -u cxplorer/src/interface.c:1.17 cxplorer/src/interface.c:1.18
--- cxplorer/src/interface.c:1.17 Mon Feb 14 00:35:09 2005
+++ cxplorer/src/interface.c Mon Mar 28 22:44:30 2005
@@ -5,7 +5,7 @@
* This file contains functions which create main window and about dialog.
* @author Yasumichi Akahoshi <yasum****@users*****>
* @date 2004
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*/
#ifdef HAVE_CONFIG_H
@@ -51,7 +51,6 @@
gchar *preview_dir;
gchar *preview_text;
gchar *preview_binary;
- gchar *defval;
cxplorer = cxplorer_new ();
accel_group = gtk_accel_group_new ();
@@ -107,20 +106,12 @@
cxplorer->right_pane = right_pane;
/* preview commands. */
- g_object_get (G_OBJECT(cxplorer->right_pane), "preview-dir", &defval, NULL);
- preview_dir = cxp_profile_get_string (cxplorer->profile, "PreviewDir", defval);
- g_free(defval);
-
- g_object_get (G_OBJECT(cxplorer->right_pane), "preview-text", &defval, NULL);
- preview_text = cxp_profile_get_string (cxplorer->profile, "PreviewText", defval);
- g_free(defval);
-
- g_object_get (G_OBJECT(cxplorer->right_pane), "preview-binary", &defval, NULL);
- preview_binary = cxp_profile_get_string (cxplorer->profile, "PreviewBinary", defval);
+ preview_dir = cxp_profile_get_string (cxplorer->profile, "PreviewDir");
+ preview_text = cxp_profile_get_string (cxplorer->profile, "PreviewText");
+ preview_binary = cxp_profile_get_string (cxplorer->profile, "PreviewBinary");
g_object_set (G_OBJECT(cxplorer->right_pane), "preview-binary", preview_binary,
"preview-dir", preview_dir,
"preview-text", preview_text, NULL);
- g_free(defval);
statusbar = gtk_statusbar_new ();
gtk_box_pack_start (GTK_BOX (vbox1), statusbar, FALSE, FALSE, 0);
Index: cxplorer/src/menubar.c
diff -u cxplorer/src/menubar.c:1.32 cxplorer/src/menubar.c:1.33
--- cxplorer/src/menubar.c:1.32 Mon Feb 14 00:35:09 2005
+++ cxplorer/src/menubar.c Mon Mar 28 22:44:30 2005
@@ -5,7 +5,7 @@
* This file contains functions which related menubar.
* @author Yasumichi Akahoshi <yasum****@users*****>
* @date Tue Jun 8 22:32:55 2004
- * $Revision: 1.32 $
+ * $Revision: 1.33 $
****************************************************************************/
#ifdef HAVE_CONFIG_H
@@ -379,7 +379,7 @@
GtkWidget *dialog;
- cmd_format = cxp_profile_get_string (cxplorer->profile, "AttachCommand", "sylpheed --attach %s");
+ cmd_format = cxp_profile_get_string (cxplorer->profile, "AttachCommand");
if((fullpath = cxp_right_pane_get_active_file_name (CXP_RIGHT_PANE(cxplorer->right_pane))) != NULL)
{
cmd = g_strdup_printf(cmd_format, fullpath);