summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@gnu.org>2001-11-01 00:29:34 +0000
committerAnders Carlsson <andersca@src.gnome.org>2001-11-01 00:29:34 +0000
commitac888651eefa47a0d7b1310c730d2915cdfbde4b (patch)
tree369af81540f2d1fa48171e0e36747714fd8220bc
parent40acd65fcb28e070bfd23a8f0b68f4e5b9f1cca3 (diff)
downloadyelp-ac888651eefa47a0d7b1310c730d2915cdfbde4b.tar.gz
Copy the help converters from nautilus. We now depend on libxslt.LIBGNOME_1_105_0
2001-11-01 Anders Carlsson <andersca@gnu.org> * Copy the help converters from nautilus. We now depend on libxslt.
-rw-r--r--src/info2html/Makefile.am9
-rw-r--r--src/info2html/main.c5
-rw-r--r--src/man2html/Makefile.am4
3 files changed, 10 insertions, 8 deletions
diff --git a/src/info2html/Makefile.am b/src/info2html/Makefile.am
index 2bc7984c..9c853ce9 100644
--- a/src/info2html/Makefile.am
+++ b/src/info2html/Makefile.am
@@ -1,8 +1,9 @@
## Process this file with automake to produce Makefile.in.
-INCLUDES =
-LDADD =
+INCLUDES = $(LIBGNOME_CFLAGS)
-bin_PROGRAMS = gnome-info2html2
+bin_PROGRAMS = gnome2-info2html
-gnome_info2html2_SOURCES = main.c parse.c utils.c html.c data.h html.h parse.h utils.h version.h
+gnome2_info2html_SOURCES = main.c parse.c utils.c html.c data.h html.h parse.h utils.h version.h
+
+gnome2_info2html_LDADD = $(LIBGNOME_LIBS) $(BZ_LIBS) \ No newline at end of file
diff --git a/src/info2html/main.c b/src/info2html/main.c
index 3e3d6e67..6d3d3ed1 100644
--- a/src/info2html/main.c
+++ b/src/info2html/main.c
@@ -4,7 +4,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <gnome.h>
+#include <popt.h>
#include <zlib.h>
#ifdef HAVE_LIBBZ2
#include <bzlib.h>
@@ -14,6 +14,7 @@
#include <sys/stat.h>
#include <limits.h>
+#include <glib.h>
#include "data.h"
#include "html.h"
#include "parse.h"
@@ -42,7 +43,7 @@ file_exists(const char *fn)
}
int
-main(int argc, char **argv)
+main(int argc, const char **argv)
{
gzFile f = NULL;
int bz = 0;
diff --git a/src/man2html/Makefile.am b/src/man2html/Makefile.am
index 0c52cc92..c71c7340 100644
--- a/src/man2html/Makefile.am
+++ b/src/man2html/Makefile.am
@@ -2,9 +2,9 @@
LDADD = $(Z_LIBS) $(BZ_LIBS)
-bin_PROGRAMS = gnome-man2html2
+bin_PROGRAMS = gnome2-man2html
-gnome_man2html2_SOURCES = gnome-man2html.c
+gnome2_man2html_SOURCES = gnome-man2html.c
#CFLAGS += -Wall