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

[Tim Harder (radhermit)]

radhermit    12/05/31 18:25:42

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

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

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

Index: csvfix-1.3-make.patch
===================================================================
--- csvfix-1.3/alib/Makefile
+++ csvfix-1.3/alib/Makefile
@@ -2,12 +2,12 @@
 # Copyright (C) 2009 Neil Butterworth
 
 OUT = lib/alib.a
+AR = ar
 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 +21,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 +28,10 @@
 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 
 
 win: $(OBJS) $(EXPAT) $(WINOBJS)
-	ar rvs $(OUT) $^
+	$(AR) rvs $(OUT) $^
 
 lin: $(OBJS) $(EXPAT) 
-	ar rvs $(OUT) $^
+	$(AR) rvs $(OUT) $^
 
 .PHONY: clean
 clean:
--- csvfix-1.3/csvfix/Makefile
+++ csvfix-1.3/csvfix/Makefile
@@ -18,7 +18,7 @@
 
 ALIB = ../alib/lib/alib.a
 WINLIBS = ../alib/lib/alib.a -lodbc32 
-LINLIBS = ../alib/lib/alib.a 
+LINLIBS = ../alib/lib/alib.a -lexpat
 
 _OBJS = csved_atable.o \
 		csved_block.o \
@@ -89,8 +89,7 @@
 	strip $(WINOUT)
 
 $(LINOUT): $(OBJS) $(ALIB)
-	$(CC) -o $@ $^ $(LINLIBS)
-	strip $(LINOUT)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)
 
 .PHONY: win
 win: