[arch-commits] Commit in libfetch/trunk (Makefile PKGBUILD)

Dan McGee dan at archlinux.org
Wed Jan 5 11:07:06 EST 2011


    Date: Wednesday, January 5, 2011 @ 11:07:05
  Author: dan
Revision: 104943

FS#22293 make Makefile honor CFLAGS/LDFLAGS, general cleanup

Modified:
  libfetch/trunk/Makefile
  libfetch/trunk/PKGBUILD

----------+
 Makefile |   71 +++++++++++++++++++++----------------------------------------
 PKGBUILD |    4 +--
 2 files changed, 27 insertions(+), 48 deletions(-)

Modified: Makefile
===================================================================
--- Makefile	2011-01-05 16:03:00 UTC (rev 104942)
+++ Makefile	2011-01-05 16:07:05 UTC (rev 104943)
@@ -5,31 +5,23 @@
 FETCH_WITH_OPENSSL = true
 
 WARNINGS = -Wall -Wstrict-prototypes -Wsign-compare -Wchar-subscripts \
-	   -Wpointer-arith -Wcast-align
-CFLAGS   = -O2 -pipe -I. -fPIC $(WARNINGS) \
-	   -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES
+           -Wpointer-arith -Wcast-align
 
-CFLAGS	+= -DFTP_COMBINE_CWDS -DNETBSD
+CFLAGS  ?= -O2 -pipe
 
+CFLAGS  += -fPIC $(WARNINGS)
+CFLAGS  += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES
+CFLAGS  += -DFTP_COMBINE_CWDS -DNETBSD
+
 ifeq ($(strip $(FETCH_WITH_INET6)), true)
-CFLAGS+=	-DINET6
+CFLAGS  += -DINET6
 endif
 
 ifeq ($(strip $(FETCH_WITH_OPENSSL)), true)
-CFLAGS+=	-DWITH_SSL
-LDFLAGS=	-lssl -lcrypto
+CFLAGS  += -DWITH_SSL
+LDADD   += -Wl,-lssl -Wl,-lcrypto
 endif
 
-ifeq ($(strip $(DEBUG)), true)
-CFLAGS += -g -DDEBUG
-else
-CFLAGS += -UDEBUG
-endif
-
-CC = gcc
-LD = gcc
-AR = ar
-RANLIB = ranlib
 INSTALL = install -c -D
 
 OBJS= fetch.o common.o ftp.o http.o file.o
@@ -37,53 +29,40 @@
 GEN = ftperr.h httperr.h
 MAN = libdownload.3
 
-#pretty print!
-E = @/bin/echo
-Q = @
-
 all: libfetch.so libfetch.a
 .PHONY: all
 
 %.o: %.c $(INCS) $(GEN)
-	$(E) "  compile   " $@
-	$(Q) $(CC) $(CFLAGS) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 ftperr.h: ftp.errors Makefile errlist.sh
-	$(E) "  generate  " $@
-	$(Q) ./errlist.sh ftp_errlist FTP ftp.errors > $@
+	./errlist.sh ftp_errlist FTP ftp.errors > $@
 
 httperr.h: http.errors Makefile errlist.sh
-	$(E) "  generate  " $@
-	$(Q) ./errlist.sh http_errlist HTTP http.errors > $@
+	./errlist.sh http_errlist HTTP http.errors > $@
 
 libfetch.so: $(GEN) $(INCS) $(OBJS)
-	$(E) "  build     " $@
-	$(Q) rm -f $@
-	$(Q) $(LD) $(LDFLAGS) *.o -shared -o $@
-	$(E) "  built with:  " $(CFLAGS)
+	rm -f $@
+	$(CC) $(LDFLAGS) $(OBJS) $(LDADD) -shared -fPIC -o $@
 
 libfetch.a: $(GEN) $(INCS) $(OBJS)
-	$(E) "  build     " $@
-	$(Q) rm -f $@
-	$(Q) $(AR) rcs $@ *.o
-	$(Q) $(RANLIB) $@
-	$(E) "  built with:  " $(CFLAGS)
+	rm -f $@
+	$(AR) rcs $@ $(OBJS)
 
 clean:
-	$(E) "  clean     "
-	$(Q) rm -f libfetch.so libfetch.a *.o $(GEN)
+	rm -f libfetch.so libfetch.a *.o $(GEN)
 .PHONY: clean
 
 install: all
-	$(Q) $(INSTALL) -m 755 libfetch.so $(DESTDIR)$(prefix)/lib/libfetch.so
-	$(Q) $(INSTALL) -m 644 libfetch.a $(DESTDIR)$(prefix)/lib/libfetch.a
-	$(Q) $(INSTALL) -m 644 fetch.h $(DESTDIR)$(prefix)/include/fetch.h
-	$(Q) $(INSTALL) -m 644 fetch.3 $(DESTDIR)$(prefix)/share/man/man3/fetch.3
+	$(INSTALL) -m 755 libfetch.so $(DESTDIR)$(prefix)/lib/libfetch.so
+	$(INSTALL) -m 644 libfetch.a $(DESTDIR)$(prefix)/lib/libfetch.a
+	$(INSTALL) -m 644 fetch.h $(DESTDIR)$(prefix)/include/fetch.h
+	$(INSTALL) -m 644 fetch.3 $(DESTDIR)$(prefix)/share/man/man3/fetch.3
 .PHONY: install
 
 uninstall:
-	$(Q) rm -f $(DESTDIR)$(prefix)/lib/libfetch.so
-	$(Q) rm -f $(DESTDIR)$(prefix)/lib/libfetch.a
-	$(Q) rm -f $(DESTDIR)$(prefix)/include/fetch.h
-	$(Q) rm -f $(DESTDIR)$(prefix)/share/man/man3/fetch.3
+	rm -f $(DESTDIR)$(prefix)/lib/libfetch.so
+	rm -f $(DESTDIR)$(prefix)/lib/libfetch.a
+	rm -f $(DESTDIR)$(prefix)/include/fetch.h
+	rm -f $(DESTDIR)$(prefix)/share/man/man3/fetch.3
 .PHONY: uninstall

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-05 16:03:00 UTC (rev 104942)
+++ PKGBUILD	2011-01-05 16:07:05 UTC (rev 104943)
@@ -4,7 +4,7 @@
 
 pkgname=libfetch
 pkgver=2.33
-pkgrel=1
+pkgrel=2
 pkgdesc="URL based download library"
 arch=('i686' 'x86_64')
 license=('BSD')
@@ -12,7 +12,7 @@
 url="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/"
 source=(Makefile
         ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('5167d18db7660228e75290fc7d25fe56'
+md5sums=('7dffdd5a81bb32084a2f45e61f70dcf9'
          'a176b94f7f30344ef8a71c047ca2136b')
 
 # keep an upgrade path for older installations



More information about the arch-commits mailing list