GNOME.org
 

[buoh] Changes in Makefile.am, AUTHORS, README, HACKING, .gitignore

commit a0a9e31b2080f664d8400e194b864bf369a4e495
Author: Pablo Castellano <pablog src gnome org>
Date:   Tue Jan 26 22:58:00 2010 +0100

    Changes in Makefile.am, AUTHORS, README, HACKING, .gitignore
    
    AUTHORS file was updated: I added myself.
    HACKING file was added.
    README file was updated with the new addresses and keeping the old one.
    Makefile.am files were updated and completed: I did it looking evince ones.

 .gitignore       |    2 +
 AUTHORS          |    1 +
 HACKING          |    5 ++
 Makefile.am      |   41 +++++++++++++++++---
 README           |   11 ++++-
 configure.ac     |    4 +-
 data/Makefile.am |  110 ++++++++++++++++++++++++++++++++++++++++--------------
 src/Makefile.am  |   55 ++++++++++++++++++---------
 8 files changed, 171 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 673b2cd..ca40527 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,8 @@ Makefile
 Makefile.in
 /aclocal.m4
 /autom4te.cache
+/buoh-*.tar.bz2
+/buoh-*.tar.gz
 /config.guess
 /config.status
 /config.h.in
diff --git a/AUTHORS b/AUTHORS
index 423f749..50557c4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
 Esteban Sanchez <steve-o linups org>
 Pablo Arroyo <pablo arroyo linups org>
 Carlos Garcia Campos <carlosgc gnome org>
+Pablo Castellano <pablog src gnome org>
diff --git a/HACKING b/HACKING
new file mode 100644
index 0000000..60a07b1
--- /dev/null
+++ b/HACKING
@@ -0,0 +1,5 @@
+If you want to hack or commit something to seahorse, please first send patches to 
+buoh-list gnome org or submitted on bugzilla.gnome.org if possible.
+
+For a todo list, first check bugzilla, then look at TODO. Bugzilla is also updated 
+with possible enhancements and any current bugs.
diff --git a/Makefile.am b/Makefile.am
index 56ba20a..031df34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,39 @@
-SUBDIRS = src po data
+SUBDIRS = \
+		src		\
+		po		\
+		data
+
+intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
 
 EXTRA_DIST = \
-	intltool-extract.in \
-	intltool-merge.in \
-	intltool-update.in \
-	mkinstalldirs
+	$(intltool_extra)	\
+	autogen.sh			\
+	MAINTAINERS
 
 DISTCLEANFILES = \
-	intltool-extract \
-	intltool-merge \
+	intltool-extract	\
+	intltool-merge		\
 	intltool-update
+
+MAINTAINERCLEANFILES = \
+		ChangeLog \
+		ChangeLog.pre-0.8.3 \
+		$(srcdir)/INSTALL \
+		$(srcdir)/aclocal.m4 \
+		$(srcdir)/autoscan.log \
+		$(srcdir)/compile \
+		$(srcdir)/config.guess \
+		$(srcdir)/config.h.in \
+		$(srcdir)/config.sub \
+		$(srcdir)/configure \
+		$(srcdir)/configure.scan \
+		$(srcdir)/depcomp \
+		$(srcdir)/install-sh \
+		$(srcdir)/ltmain.sh \
+		$(srcdir)/missing \
+		$(srcdir)/mkinstalldirs \
+		$(srcdir)/omf.make \
+		$(srcdir)/xmldocs.make \
+		$(srcdir)/gtk-doc.make \
+		$(srcdir)/po/Makefile.in.in \
+		`find "$(srcdir)" -type f -name Makefile.in -print`
diff --git a/README b/README
index 8174578..af922e1 100644
--- a/README
+++ b/README
@@ -2,10 +2,10 @@
 Buoh aims to help the comic lovers by providing an easy way of browsing and 
 reading their favourites online comic stripes.
 
-Web: http://forge.novell.com/modules/xfmod/project/?buoh
+Web: http://projects.gnome.org/buoh/
 
-Mailing list: buoh-dev forge novell com - For discussions about the
-	                                  development of Buoh itself.
+Mailing list: buoh-list gnome org   - For discussions about the
+	                              development of Buoh itself.
 
 
 -- License --
@@ -15,3 +15,8 @@ in the 'COPYING' file.
 -- Installation --
 See the 'INSTALL' file
 
+-- Past --
+Buoh development was previously in
+
+Web: http://forge.novell.com/modules/xfmod/project/?buoh
+Mailing list: buoh-dev forge novell com
diff --git a/configure.ac b/configure.ac
index 3222ef0..4dded05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,11 +89,11 @@ fi
 
 AC_SUBST(comics_dir)
 
-
+AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"])
 	   
 AC_CONFIG_FILES([
 Makefile
-po/Makefile
+po/Makefile.in
 src/Makefile
 data/Makefile
 data/icons/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index e5e77c9..82d4535 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,49 +1,103 @@
 SUBDIRS = icons
 
- INTLTOOL_SCHEMAS_RULE@
+install-data-local: install-schemas update-icon-cache
+uninstall-local: uninstall-schemas
 
-comicsdir = $(comics_dir)
-uidir = $(ui_dir)
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
+#
+# GConf schema
+#
 
-comics_DATA = comics.xml
-ui_DATA = buoh-ui.xml
+if WITH_GCONF
+ INTLTOOL_SCHEMAS_RULE@
 
 schema_in_files = buoh.schemas.in
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
-Applicationsdir = $(datadir)/applications
-Applications_in_files = buoh.desktop.in
-Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+install-schemas: $(schema_DATA)
+if GCONF_SCHEMAS_INSTALL
+	if test -z "$(DESTDIR)" ; then \
+	for p in $(schema_DATA) ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+			$(GCONFTOOL) \
+			--makefile-install-rule \
+			$(top_builddir)/data/$$p >&1 > /dev/null; \
+	done \
+	fi
+endif
 
-install-data-hook:
+uninstall-schemas: $(schema_DATA)
 if GCONF_SCHEMAS_INSTALL
 	if test -z "$(DESTDIR)" ; then \
-	   for p in $(schema_DATA) ; do \
-	   GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p >&1 > /dev/null; \
-	   done \
+	for p in $^ ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+		$(GCONFTOOL) \
+		--makefile-uninstall-rule \
+		$(top_builddir)/data/$$p; \
+	done \
 	fi
 endif
+	
+else
+
+install-schemas:
+uninstall-schemas:
+
+endif
+
+comicsdir = $(comics_dir)
+
+#
+# UI descriptions
+#
+
+uidir = $(ui_dir)
+ui_DATA = buoh-ui.xml
+
+comics_DATA = comics.xml
+
+#
+# GTK icon cache
+#
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+
+update-icon-cache:
 	if test -z "$(DESTDIR)"; then \
-	   echo "Updating Gtk icon cache."; \
-	   $(gtk_update_icon_cache); \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
 	else \
-	   echo "*** Icon cache not updated.  After install, run this:"; \
-	   echo "***   $(gtk_update_icon_cache)"; \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
+#
+# Desktop file
+#
 
-DISTCLEANFILES =	 	\
-		buoh.desktop    \
-		*.bak		\
-		$(schema_DATA)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST =                    	\
-		$(comics_DATA)		\
-		$(ui_DATA)		\
-		$(schema_in_files)      \
-		$(Applications_in_files)
+DESKTOP_IN_FILES = buoh.desktop.in
+DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop)
+
+#
+# Extra files to be included in the tarball
+#
+
+EXTRA_DIST =                   	\
+	$(comics_DATA)		\
+	$(ui_DATA)		\
+	$(schema_in_files)      \
+	$(DESKTOP_IN_FILES)
+
+#
+# Clean up properly
+#
+
+DISTCLEANFILES = \
+	$(DESKTOP_FILES)	\
+	$(schema_DATA)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 66110f1..9bd13f0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,25 +1,44 @@
-INCLUDES = 						\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-	$(BUOH_CFLAGS)					\
-	$(WARN_CFLAGS)					\
+INCLUDES = 											\
+	-DDATADIR=\"$(pkgdatadir)\"						\
+	-DGNOMEDATADIR=\"$(datadir)\"					\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
+	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\"			\
+	-DBINDIR=\""$(bindir)"\"						\
+	$(BUOH_CFLAGS)									\
+	$(WARN_CFLAGS)									\
 	$(DISABLE_DEPRECATED)
 
 bin_PROGRAMS = buoh
 
-buoh_SOURCES = 							\
-	buoh-comic.h buoh-comic.c				\
-	buoh-window.h buoh-window.c				\
-	buoh-comic-loader.h buoh-comic-loader.c			\
-	buoh-view.h buoh-view.c					\
-	buoh-view-comic.h buoh-view-comic.c	                \
-	buoh-view-message.h buoh-view-message.c			\
-	buoh-comic-list.h buoh-comic-list.c			\
-	buoh-properties-dialog.h buoh-properties-dialog.c	\
-	buoh-add-comic-dialog.h buoh-add-comic-dialog.c		\
-	buoh-comic-manager-date.h buoh-comic-manager-date.c     \
-	buoh-comic-manager.h buoh-comic-manager.c		\
-	buoh-comic-cache.h buoh-comic-cache.c			\
-	buoh.h buoh.c						\
+buoh_SOURCES = \
+	buoh-comic.h 					\
+	buoh-comic.c					\
+	buoh-window.h					\
+	buoh-window.c					\
+	buoh-comic-loader.h				\
+	buoh-comic-loader.c				\
+	buoh-view.h						\
+	buoh-view.c						\
+	buoh-view-comic.h				\
+	buoh-view-comic.c				\
+	buoh-view-message.h				\
+	buoh-view-message.c				\
+	buoh-comic-list.h				\
+	buoh-comic-list.c				\
+	buoh-properties-dialog.h		\
+	buoh-properties-dialog.c		\
+	buoh-add-comic-dialog.h			\
+	buoh-add-comic-dialog.c			\
+	buoh-comic-manager-date.h		\
+	buoh-comic-manager-date.c		\
+	buoh-comic-manager.h			\
+	buoh-comic-manager.c			\
+	buoh-comic-cache.h				\
+	buoh-comic-cache.c				\
+	buoh.h							\
+	buoh.c							\
 	main.c
 
+buoh_LDFLAGS = $(AM_LDFLAGS)
+
 buoh_LDADD = $(BUOH_LIBS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]