File dont_build_xls2csv.patch of Package catdoc.6985

Overview Repositories Revisions Requests Users Attributes Meta

File dont_build_xls2csv.patch of Package catdoc.6985

Index: catdoc-0.95/doc/Makefile.in
===================================================================
--- catdoc-0.95.orig/doc/Makefile.in
+++ catdoc-0.95/doc/Makefile.in
@@ -22,21 +22,19 @@ datarootdir = @datarootdir@
 all:
 	touch build
 
-dosdoc: catdoc.txt catdoc.ps xls2csv.txt xls2csv.ps catppt.txt catppt.ps
+dosdoc: catdoc.txt catdoc.ps catppt.txt catppt.ps
 clean:
 	$(RM) catppt.txt catppt.ps  \
             catdoc.txt catdoc.ps \
-            xls2csv.txt xls2csv.ps \
             wordview.txt wordview.ps build
 install: @installtargets@
-install-catdoc: catdoc.1 xls2csv.1 catppt.1
+install-catdoc: catdoc.1 catppt.1
 	../mkinstalldirs $(installroot)$(mandir)
 	$(INSTALL) -m 644 catdoc.1 $(installroot)$(mandir)/man1/catdoc.1
-	$(INSTALL) -m 644 xls2csv.1 $(installroot)$(mandir)/man1/xls2csv.1
 	$(INSTALL) -m 644 catppt.1 $(installroot)$(mandir)/man1/catppt.1
 install-wordview:	
 	../mkinstalldirs $(installroot)$(mandir)
 	$(INSTALL) -m 644 wordview.1 $(installroot)$(mandir)/man1/wordview.1
 distclean: clean
-	$(RM)  Makefile catdoc.1 xls2csv.1 catppt.1 wordview.1
+	$(RM)  Makefile catdoc.1 catppt.1 wordview.1
 
Index: catdoc-0.95/src/Makefile.in
===================================================================
--- catdoc-0.95.orig/src/Makefile.in
+++ catdoc-0.95/src/Makefile.in
@@ -68,25 +68,20 @@ COMMONOBJ=charsets.o substmap.o fileutil
 
 OBJ=catdoc.o reader.o writer.o analyze.o rtfread.o $(COMMONOBJ)
 
-OBJXLS=xls2csv.o sheet.o xlsparse.o $(COMMONOBJ)
-
 OBJPPT=catppt.o pptparse.o $(COMMONOBJ)
 #.c.o:
 #	$(CC) -c $(CFLAGS) $*
 all: @buildtargets@
 catdoc: $(OBJ)
 	$(CC)  -o catdoc  $(OBJ) $(LDFLAGS)
-xls2csv: $(OBJXLS)
-	$(CC) -o xls2csv $(OBJXLS) -lm $(LDFLAGS)
 
 catppt: $(OBJPPT)
 	$(CC) -o catppt $(OBJPPT) -lm $(LDFLAGS)
 
 install: @installtargets@
-install-catdoc:catdoc xls2csv catppt 
+install-catdoc:catdoc catppt 
 	../mkinstalldirs $(installroot)$(bindir)
 	$(INSTALL) -m 755 catdoc $(installroot)$(bindir)/catdoc
-	$(INSTALL) -m 755 xls2csv $(installroot)$(bindir)/xls2csv
 	$(INSTALL) -m 755 catppt $(installroot)$(bindir)/catppt
 install-wordview: wordview 
 	../mkinstalldirs $(installroot)$(bindir)
@@ -99,6 +94,6 @@ wordview: wordview.tcl
 strftime.o: ../compat/strftime.c
 	$(CC) -c $(FLAGS) -o $@ $*
 clean:
-	rm -f *.o catdoc wordview xls2csv catppt
+	rm -f *.o catdoc wordview catppt
 distclean: clean
 	rm Makefile
Index: catdoc-0.95/src/makefile.tc
===================================================================
--- catdoc-0.95.orig/src/makefile.tc
+++ catdoc-0.95/src/makefile.tc
@@ -8,8 +8,6 @@ OBJ=charsets.obj substmap.obj reader.obj
 all: catdoc.exe xls2csv.exe catppt.exe
 catdoc.exe: catdoc.obj catdoc.lib
 	$(CC) -v -mc  catdoc.obj catdoc.lib    
-xls2csv.exe: xls2csv.obj catdoc.lib
-	$(CC) -v -mc  xls2csv.obj catdoc.lib
 catppt.exe: catppt.obj catdoc.lib
 	$(CC) -v -mc catppt.obj catdoc.lib
 langinfo.obj: ..\compat\langinfo.c

Places

File dont_build_xls2csv.patch of Package catdoc.6985

Places