GNOME.org
 

[yelp] Massive cleanup of old files

commit 0637f921f36910d7688f73e14b2d2ec79ca90989
Author: Shaun McCance <shaunm gnome org>
Date:   Wed May 18 16:06:08 2011 -0400

    Massive cleanup of old files

 .cvsignore                                    |   26 -
 .gitignore                                    |   51 +-
 Makefile.am                                   |    6 +-
 configure.ac                                  |   17 +-
 data/.cvsignore                               |    5 -
 data/Makefile.am                              |   24 +-
 data/default.css                              |   19 -
 data/icons/.cvsignore                         |    2 -
 data/icons/Makefile.am                        |   20 -
 data/icons/yelp-icon-big.png                  |  Bin 30650 -> 0 bytes
 data/icons/yelp-icon-caution.png              |  Bin 2369 -> 0 bytes
 data/icons/yelp-icon-important.png            |  Bin 2592 -> 0 bytes
 data/icons/yelp-icon-note.png                 |  Bin 2520 -> 0 bytes
 data/icons/yelp-icon-tip.png                  |  Bin 2288 -> 0 bytes
 data/icons/yelp-icon-warning.png              |  Bin 3249 -> 0 bytes
 data/icons/yelp-watermark-blockquote-00AB.png |  Bin 992 -> 0 bytes
 data/icons/yelp-watermark-blockquote-00BB.png |  Bin 1027 -> 0 bytes
 data/icons/yelp-watermark-blockquote-201C.png |  Bin 1102 -> 0 bytes
 data/icons/yelp-watermark-blockquote-201D.png |  Bin 1093 -> 0 bytes
 data/icons/yelp-watermark-blockquote-201E.png |  Bin 1106 -> 0 bytes
 data/images/.cvsignore                        |    2 -
 data/images/Makefile.am                       |    9 -
 data/images/bcg.png                           |  Bin 15304 -> 0 bytes
 data/images/empty.png                         |  Bin 130 -> 0 bytes
 data/images/gnome2-button.png                 |  Bin 3802 -> 0 bytes
 data/info.xml.in                              |    7 -
 data/jquery-1.4.2.min.js                      |  154 ---
 data/js/Makefile.am                           |    4 +
 data/{ => js}/jquery-ui-1.8.custom.min.js     |    0
 data/man.xml.in                               |  138 ---
 data/scrollkeeper.xml                         |  295 -----
 data/toc.xml.in                               |  416 -------
 data/ui/.cvsignore                            |    2 -
 {stylesheets => data/xslt}/Makefile.am        |   15 +-
 {stylesheets => data/xslt}/db2html.xsl.in     |    0
 {stylesheets => data/xslt}/info2html.xsl.in   |    0
 {stylesheets => data/xslt}/mal2html.xsl.in    |    0
 {stylesheets => data/xslt}/man2html.xsl.in    |    0
 {stylesheets => data/xslt}/yelp-common.xsl.in |    2 +-
 data/yelp.js                                  |   95 --
 important_docs.xml                            |   12 -
 po/.cvsignore                                 |   13 -
 po/POTFILES.in                                |    3 -
 src/.cvsignore                                |   23 -
 src/Makefile.am                               |    8 -
 src/eggdesktopfile.h                          |  159 ---
 src/test-document.c                           |  149 ---
 src/test-man-parser.c                         |   68 --
 src/test-page.c                               |   83 --
 src/test-resolver.c                           |  267 -----
 src/yelp-db-print.c                           |  768 -------------
 src/yelp-db-print.h                           |   54 -
 src/yelp-marshal-main.c                       |    2 -
 src/yelp-page.c                               |  164 ---
 src/yelp-page.h                               |   88 --
 src/yelp-print.c                              |  601 ----------
 src/yelp-print.h                              |   89 --
 src/yelp-search-parser.c                      | 1529 -------------------------
 src/yelp-search-parser.h                      |   36 -
 src/yelp-search.c                             |  391 -------
 src/yelp-search.h                             |   53 -
 src/yelp-toc.c                                |  795 -------------
 src/yelp-toc.h                                |   54 -
 src/yelp-utils.c                              |  534 ---------
 src/yelp-utils.h                              |   58 -
 stylesheets/.cvsignore                        |    5 -
 stylesheets/ChangeLog                         |  506 --------
 stylesheets/db-title.xsl.in                   |   23 -
 stylesheets/docbook/.cvsignore                |    3 -
 stylesheets/docbook/dtd/.cvsignore            |    3 -
 stylesheets/docbook/dtd/catalog               |   59 -
 stylesheets/search2html.xsl                   |  171 ---
 stylesheets/toc2html.xsl.in                   |  284 -----
 73 files changed, 46 insertions(+), 8318 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 35c585f..36e71af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,12 +26,29 @@ Makefile.in
 /config.status
 /config.sub
 /configure
-/data/gsettings_schema_validate_stamp
-/data/info.xml
-/data/man.xml
-/data/toc.xml
-/data/dtd/catalog
 /depcomp
+/ltmain.sh
+/m4
+/missing
+/mkinstalldirs
+/gtk-doc.make
+/install-sh
+/intltool-extract.in
+/intltool-merge.in
+/intltool-update.in
+/libtool
+/stamp-h1
+/yelp.desktop
+/yelp.desktop.in
+
+/data/org.gnome.yelp.gschema.valid
+/data/dtd/catalog
+/data/xslt/db2html.xsl
+/data/xslt/info2html.xsl
+/data/xslt/mal2html.xsl
+/data/xslt/man2html.xsl
+/data/xslt/yelp-common.xsl
+
 /docs/libyelp/html-build.stamp
 /docs/libyelp/html.stamp
 /docs/libyelp/html/
@@ -56,21 +73,13 @@ Makefile.in
 /docs/libyelp/tmpl/
 /docs/libyelp/version.xml
 /docs/libyelp/xml/
-/gtk-doc.make
-/install-sh
-/intltool-extract.in
-/intltool-merge.in
-/intltool-update.in
-/libtool
+
 /libyelp/stamp-yelp-marshal.h
 /libyelp/yelp-marshal.c
 /libyelp/yelp-marshal.h
 /libyelp/yelp-types.c
 /libyelp/yelp-types.h
-/ltmain.sh
-/m4
-/missing
-/mkinstalldirs
+
 /po/*.gmo
 /po/.intltool-merge-cache
 /po/Makefile.in.in
@@ -78,15 +87,9 @@ Makefile.in
 /po/POTFILES
 /po/stamp-it
 /po/yelp.pot
+
 /src/yelp
-/src/yelp-dbus.h
-/stamp-h1
-/stylesheets/db-title.xsl
-/stylesheets/db2html.xsl
-/stylesheets/info2html.xsl
-/stylesheets/mal2html.xsl
-/stylesheets/toc2html.xsl
-/stylesheets/yelp-common.xsl
+
 /tests/test-bz2
 /tests/test-io-channel
 /tests/test-location-entry
@@ -96,5 +99,3 @@ Makefile.in
 /tests/test-transform
 /tests/test-uri
 /tests/test-view
-/yelp.desktop
-/yelp.desktop.in
diff --git a/Makefile.am b/Makefile.am
index 45ca0bc..cb4a807 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = libyelp src stylesheets po data tests docs
+SUBDIRS = libyelp src po data tests docs
 
 @INTLTOOL_DESKTOP_RULE@
 
@@ -8,16 +8,12 @@ desktopdir = $(datadir)/applications
 desktop_in_files=yelp.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
-yelpdatadir = $(datadir)/yelp
-yelpdata_DATA = important_docs.xml
-
 EXTRA_DIST = 						\
 	autogen.sh					\
 	MAINTAINERS					\
 	intltool-extract.in  				\
 	intltool-merge.in    				\
 	intltool-update.in				\
-	important_docs.xml				\
 	$(desktop_in_files)
 
 DISTCLEANFILES = 					\
diff --git a/configure.ac b/configure.ac
index 1b36c71..286558f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,8 +123,6 @@ AC_SUBST([DATADIR])
 
 
 XSL_PATH="`$PKG_CONFIG --variable=xsltdir yelp-xsl`"
-XSL_DB_TITLE="$XSLT_PATH""/docbook/common/db-title.xsl"
-AC_SUBST(XSL_DB_TITLE)
 
 XSL_DB2XHTML="`$PKG_CONFIG --variable=db2xhtml yelp-xsl`"
 AC_SUBST(XSL_DB2XHTML)
@@ -199,14 +197,6 @@ docs/libyelp/Makefile
 docs/libyelp/version.xml
 libyelp/Makefile
 src/Makefile
-stylesheets/Makefile
-stylesheets/db2html.xsl
-stylesheets/db-title.xsl
-stylesheets/info2html.xsl
-stylesheets/mal2html.xsl
-stylesheets/man2html.xsl
-stylesheets/toc2html.xsl
-stylesheets/yelp-common.xsl
 data/Makefile
 data/dtd/Makefile
 data/dtd/catalog
@@ -217,6 +207,13 @@ data/icons/hicolor/16x16/status/Makefile
 data/icons/hicolor/scalable/Makefile
 data/icons/hicolor/scalable/actions/Makefile
 data/icons/hicolor/scalable/status/Makefile
+data/js/Makefile
+data/xslt/Makefile
+data/xslt/db2html.xsl
+data/xslt/info2html.xsl
+data/xslt/mal2html.xsl
+data/xslt/man2html.xsl
+data/xslt/yelp-common.xsl
 po/Makefile.in
 tests/Makefile
 yelp.desktop.in
diff --git a/data/Makefile.am b/data/Makefile.am
index 6947367..6ad2e1d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,31 +1,11 @@
-SUBDIRS = dtd icons
+SUBDIRS = dtd icons js xslt
 
 #This has to be defined, because GSETTINGS_CHECK_RULE adds to it
 MOSTLYCLEANFILES =
 
- INTLTOOL_XML_RULE@
 @INTLTOOL_SCHEMAS_RULE@
 
 gsettings_SCHEMAS = org.gnome.yelp.gschema.xml
 @GSETTINGS_RULES@
 
-tocdir   = $(datadir)/yelp
-toc_DATA = man.xml toc.xml scrollkeeper.xml info.xml
-
-cssdir   = $(datadir)/yelp
-css_DATA = default.css
-
-jsdir   = $(datadir)/yelp
-js_DATA =				\
-	jquery-1.4.2.min.js		\
-	jquery-ui-1.8.custom.min.js	\
-	yelp.js
-
-EXTRA_DIST =					\
-	man.xml			man.xml.in	\
-	toc.xml			toc.xml.in	\
-	info.xml		info.xml.in	\
-	scrollkeeper.xml	default.css	\
-	$(gsettings_SCHEMAS)	$(js_DATA)
-
-CLEANFILES = toc.xml man.xml info.xml
+EXTRA_DIST = $(gsettings_SCHEMAS)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 161f566..658356b 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,21 +1 @@
 SUBDIRS = hicolor
-
-icon192dir = $(datadir)/icons/hicolor/192x192/apps
-
-icon192_DATA = yelp-icon-big.png
-
-icondir = $(datadir)/yelp/icons
-
-icon_DATA = 						\
-	yelp-icon-caution.png				\
-	yelp-icon-important.png				\
-	yelp-icon-note.png				\
-	yelp-icon-tip.png				\
-	yelp-icon-warning.png				\
-	yelp-watermark-blockquote-00AB.png		\
-	yelp-watermark-blockquote-00BB.png		\
-	yelp-watermark-blockquote-201C.png		\
-	yelp-watermark-blockquote-201D.png		\
-	yelp-watermark-blockquote-201E.png
-
-EXTRA_DIST = $(icon_DATA) $(icon192_DATA)
diff --git a/data/js/Makefile.am b/data/js/Makefile.am
new file mode 100644
index 0000000..955f318
--- /dev/null
+++ b/data/js/Makefile.am
@@ -0,0 +1,4 @@
+jsdir   = $(datadir)/yelp/js
+js_DATA = jquery-ui-1.8.custom.min.js
+
+EXTRA_DIST = $(js_DATA)
diff --git a/data/jquery-ui-1.8.custom.min.js b/data/js/jquery-ui-1.8.custom.min.js
similarity index 100%
rename from data/jquery-ui-1.8.custom.min.js
rename to data/js/jquery-ui-1.8.custom.min.js
diff --git a/stylesheets/Makefile.am b/data/xslt/Makefile.am
similarity index 54%
rename from stylesheets/Makefile.am
rename to data/xslt/Makefile.am
index f64d28f..e46ebab 100644
--- a/stylesheets/Makefile.am
+++ b/data/xslt/Makefile.am
@@ -2,22 +2,17 @@
 
 xsldir=$(datadir)/yelp/xslt
 
-xsl_DATA =		\
-	db2html.xsl	\
-	db-title.xsl	\
-	mal2html.xsl	\
-	info2html.xsl	\
-	man2html.xsl	\
-	search2html.xsl	\
-	toc2html.xsl	\
+xsl_DATA =			\
+	db2html.xsl		\
+	info2html.xsl		\
+	mal2html.xsl		\
+	man2html.xsl		\
 	yelp-common.xsl
 
 EXTRA_DIST=			\
 	$(xsl_DATA)		\
 	db2html.xsl.in		\
-	db-title.xsl.in		\
 	info2html.xsl.in	\
 	mal2html.xsl.in		\
 	man2html.xsl.in		\
-	toc2html.xsl.in		\
 	yelp-common.xsl.in
diff --git a/stylesheets/db2html.xsl.in b/data/xslt/db2html.xsl.in
similarity index 100%
rename from stylesheets/db2html.xsl.in
rename to data/xslt/db2html.xsl.in
diff --git a/stylesheets/info2html.xsl.in b/data/xslt/info2html.xsl.in
similarity index 100%
rename from stylesheets/info2html.xsl.in
rename to data/xslt/info2html.xsl.in
diff --git a/stylesheets/mal2html.xsl.in b/data/xslt/mal2html.xsl.in
similarity index 100%
rename from stylesheets/mal2html.xsl.in
rename to data/xslt/mal2html.xsl.in
diff --git a/stylesheets/man2html.xsl.in b/data/xslt/man2html.xsl.in
similarity index 100%
rename from stylesheets/man2html.xsl.in
rename to data/xslt/man2html.xsl.in
diff --git a/stylesheets/yelp-common.xsl.in b/data/xslt/yelp-common.xsl.in
similarity index 98%
rename from stylesheets/yelp-common.xsl.in
rename to data/xslt/yelp-common.xsl.in
index ef27851..7c05f92 100644
--- a/stylesheets/yelp-common.xsl.in
+++ b/data/xslt/yelp-common.xsl.in
@@ -93,7 +93,7 @@ div.body {
 
 <!-- == html.js.custom == -->
 <xsl:template name="html.js.custom">
-<script type="text/javascript" language="javascript" src="@DATADIR@/jquery-ui-1.8.custom.min.js"/>
+<script type="text/javascript" language="javascript" src="@DATADIR@/js/jquery-ui-1.8.custom.min.js"/>
 </xsl:template>
 
 <!-- == html.js.content.custom == -->
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fe485a9..857f8d8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,6 @@
 # Add files with translateable strings here.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-data/info.xml.in
-data/man.xml.in
-data/toc.xml.in
 libyelp/yelp-bz2-decompressor.c
 libyelp/yelp-debug.c
 libyelp/yelp-docbook-document.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 9c563cd..f1c3296 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,14 +5,6 @@ yelp_SOURCES =						\
 	yelp-window.c		yelp-window.h		\
 	yelp.c
 
-#	yelp-toc.h		yelp-toc.c			\
-#	yelp-db-print.c		yelp-db-print.h			\
-#	yelp-man-parser.c 	yelp-man-parser.h		\
-#	yelp-man.c 		yelp-man.h			\
-#	yelp-search.c		yelp-search.h			\
-#	yelp-search-parser.c 	yelp-search-parser.h
-
-
 YELP_DEFINES =								\
 	-DG_LOG_DOMAIN=\"Yelp\"						\
 	-DPREFIX=\""$(prefix)"\"					\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]