[gentoo-commits] gentoo-x86 commit in app-text/csvfix/files: csvfix-1.20-make.patch

[gentoo-commits] gentoo-x86 commit in app-text/csvfix/files: csvfix-1.20-make.patch

[Tim Harder (radhermit)]

radhermit    11/12/14 03:56:06

  Added:                csvfix-1.20-make.patch
  Log:
  Version bump.
  
  (Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-text/csvfix/files/csvfix-1.20-make.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/csvfix/files/csvfix-1.20-make.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/csvfix/files/csvfix-1.20-make.patch?rev=1.1&content-type=text/plain

Index: csvfix-1.20-make.patch
===================================================================
--- csvfix-build.orig/alib/Makefile
+++ csvfix-build/alib/Makefile
@@ -5,9 +5,8 @@
 CC = g++
 IDIR = inc
 ODIR = obj
-XDIR = expat
 SDIR = src
-INC = -Iinc -Iexpat
+INC = -Iinc
 
 _OBJS = a_chsrc.o a_csv.o a_enc.o a_env.o a_except.o \
 		a_expr.o a_myth.o a_inifile.o  a_exec.o \
@@ -21,9 +20,6 @@
 _WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o
 WINOBJS = $(patsubst %,$(ODIR)/%,$(_WINOBJS))
 
-_EXPAT = xmlparse.o  xmlrole.o  xmltok.o  xmltok_impl.o  xmltok_ns.o
-EXPAT = $(patsubst %,$(ODIR)/%,$(_EXPAT))
-
 $(ODIR)/%.o: $(SDIR)/%.cpp $(IDIR)/%.h 
 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 
 
@@ -31,10 +27,10 @@
 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 
 
 win: $(OBJS) $(EXPAT) $(WINOBJS)
-	ar rvs $(OUT) $^
+	$(AR) rvs $(OUT) $^
 
-lin: $(OBJS) $(EXPAT) 
-	ar rvs $(OUT) $^
+lin: $(OBJS)
+	$(AR) rvs $(OUT) $^
 
 .PHONY: clean
 
--- csvfix-build.orig/csvfix/Makefile
+++ csvfix-build/csvfix/Makefile
@@ -17,7 +17,7 @@
 INC = -Iinc -I../alib/inc
 
 WINLIBS = ../alib/lib/alib.a -lodbc32 
-LINLIBS = ../alib/lib/alib.a 
+LINLIBS = ../alib/lib/alib.a -lexpat
 
 _OBJS = csved_atable.o \
 		csved_case.o \
@@ -86,16 +86,15 @@
 	strip $(WINOUT)
 
 $(LINOUT): $(OBJS) 
-	$(CC) -o $@ $^ $(LINLIBS)
-	strip $(LINOUT)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)
 
 .PHONY: win
 win:
-	make $(WINOUT)
+	$(MAKE) $(WINOUT)
 
 .PHONY: lin
 lin:
-	make $(LINOUT)
+	$(MAKE) $(LINOUT)
 
 .PHONY: clean
 clean:
--- csvfix-build.orig/Makefile
+++ csvfix-build/Makefile
@@ -3,14 +3,14 @@
 
 win:
 	mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
-	cd alib; make win
-	cd csvfix; make win
+	cd alib; $(MAKE) win
+	cd csvfix; $(MAKE) win
 
 lin:
 	mkdir -p alib/obj alib/lib csvfix/obj csvfix/bin
-	cd alib; make lin
-	cd csvfix; make lin
+	cd alib; $(MAKE) lin
+	cd csvfix; $(MAKE) lin
 
 clean:
-	cd alib; make clean
-	cd csvfix; make clean
+	cd alib; $(MAKE) clean
+	cd csvfix; $(MAKE) clean