File xlhtml-0.5.patch of Package xlhtml

Overview Repositories Revisions Requests Users Attributes Meta

File xlhtml-0.5.patch of Package xlhtml

Index: cole/utils/Makefile.am
===================================================================
--- cole/utils/Makefile.am.orig
+++ cole/utils/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)
-LDADD = $(top_builddir)/libcole.la
+INCLUDES = -I$(top_srcdir)/cole
+LDADD = $(top_builddir)/cole/libcole.la
 
 noinst_PROGRAMS = cole_tree cole_isfs cole_isfs_fast cole_extract
 
Index: cole/Makefile.am
===================================================================
--- cole/Makefile.am.orig
+++ cole/Makefile.am
@@ -2,7 +2,9 @@
 
 EXTRA_DIST = README-cole README-CVS DOWNLOAD ChangeLog ChangeLog-from1to2 TODO THANKS AUTHORS BUGS doc/* examples/* utils/* 
 
-noinst_LIBRARIES = libcole.a 
-libcole_a_SOURCES = cole.c internal.c oledecod.c olecod.c support.c version.c internal.h support.h 
+# noinst_LIBRARIES = libcole.a 
+lib_LTLIBRARIES = libcole.la
+libcole_la_LDFLAGS = -version-info @VERSION_INFO@
+libcole_la_SOURCES = cole.c internal.c oledecod.c olecod.c support.c version.c internal.h support.h
 AM_CFLAGS = -Wall -Wcast-align -Wpointer-arith 
 
Index: xlhtml/Makefile.am
===================================================================
--- xlhtml/Makefile.am.orig
+++ xlhtml/Makefile.am
@@ -8,7 +8,7 @@ noinst_SCRIPTS = xls-handler gpdemo
 man_MANS = xlhtml.1
 bin_SCRIPTS = nsopen nsxlview
 bin_PROGRAMS = xlhtml
-LDADD = ../cole/libcole.a
+LDADD = ../cole/libcole.la
 xlhtml_SOURCES = support.c xlhtml.c html.c ascii.c xml.c 
 xldump_SOURCES = xldump.c 
 xlcdump_SOURCES = xlcdump.c 
Index: ppthtml/Makefile.am
===================================================================
--- ppthtml/Makefile.am.orig
+++ ppthtml/Makefile.am
@@ -8,6 +8,6 @@ noinst_PROGRAMS = pptdump
 man_MANS = ppthtml.1
 bin_SCRIPTS = nspptview
 bin_PROGRAMS = ppthtml
-LDADD = ../cole/libcole.a
+LDADD = ../cole/libcole.la
 ppthtml_SOURCES = ppthtml.c 
 AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith 
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -16,6 +16,7 @@ AC_SUBST(HOST_OS)
 AM_INIT_AUTOMAKE(xlhtml/xlhtml, 0.4.9.3)
 AM_CONFIG_HEADER(config.h)
 
+AC_PROG_LIBTOOL
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_ISC_POSIX
@@ -57,8 +58,9 @@ dnl
 AC_SUBST(COLE_MAJOR)
 AC_SUBST(COLE_MINOR)
 AC_SUBST(COLE_MICRO)
-  
+let COLE_MAJOR_PLUS_COLE_MINOR=COLE_MAJOR+COLE_MINOR
+AC_SUBST(VERSION_INFO, [$COLE_MAJOR_PLUS_COLE_MINOR:$COLE_MICRO:$COLE_MINOR])  
 
-AC_OUTPUT([Makefile cole/Makefile cole/version.c cole/cole.h xlhtml/Makefile ppthtml/Makefile])
+AC_OUTPUT([Makefile cole/Makefile cole/version.c cole/cole.h cole/cole-config cole/utils/Makefile xlhtml/Makefile ppthtml/Makefile])

Places

File xlhtml-0.5.patch of Package xlhtml

Places