From d55391e2e9206df2d89c6bf7bfa0de2557154e3e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 28 Dec 2009 16:19:58 +0100
Subject: [PATCH] Cleaned up the Makefiles, improve README about what's
 required.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091228151958-ehx17nupq3uckhhg
---
 README             | 10 +++++++---
 lib/Makefile       |  3 +--
 lib/fetch/Makefile |  3 +--
 prog.mk            |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/README b/README
index 22440e94..f9ad0b93 100644
--- a/README
+++ b/README
@@ -2,13 +2,17 @@ See http://xbps.nopcode.org/ for information.
 
 To build this you'll need:
 
-- openssl (development package)
-- libarchive (development package, all features built in)
-- proplib (development package),
+- openssl (development package with static libs)
+- libarchive (development package with static libs, and all features
+  built in: acl/attr, xz, bzip2 and zlib are REQUIRED to build the
+  static binaries!)
+- proplib (development package with static lib),
   available at http://code.google.com/p/portableproplib
 - asciidoc (to build the manpages)
 
 By default it will be installed into /usr/local, can be changed
 by setting PREFIX and DESTDIR vars as make(1) arguments.
 
+Just run "make" and "sudo make DESTDIR=~/xbps install".
+
 Good luck!
diff --git a/lib/Makefile b/lib/Makefile
index 23652c9d..61a41ae5 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -29,8 +29,7 @@ libfetch:
 
 %.o: %.c
 	@echo "    [CC] $@"
-	@$(CC) $(CPPFLAGS) $(SHAREDLIB_CFLAGS) $(CFLAGS) \
-		$(LDFLAGS) $(STATIC_LIBS) -c $<
+	@$(CC) $(CPPFLAGS) $(SHAREDLIB_CFLAGS) $(CFLAGS) -c $<
 
 libxbps.so: $(OBJS) $(LIBFETCH_OBJS)
 	@echo "    [CCLD] $@"
diff --git a/lib/fetch/Makefile b/lib/fetch/Makefile
index 128f2cd5..b92cf3de 100644
--- a/lib/fetch/Makefile
+++ b/lib/fetch/Makefile
@@ -21,8 +21,7 @@ all: $(INCS) $(GEN) $(OBJS)
 
 %.o: %.c $(INCS) $(GEN)
 	@echo "    [CC] $@"
-	@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
-		$(SHAREDLIB_CFLAGS) -c $<
+	@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHAREDLIB_CFLAGS) -c $<
 
 ftperr.h: ftp.errors
 	@echo "    [GEN] $@"
diff --git a/prog.mk b/prog.mk
index 2380ef11..df33f378 100644
--- a/prog.mk
+++ b/prog.mk
@@ -1,5 +1,5 @@
 OBJS	?= main.o
-LDFLAGS	+= -lxbps
+LDFLAGS += -lxbps
 
 .PHONY: all
 all: $(BIN) $(BIN).static $(MAN)
@@ -31,7 +31,7 @@ endif
 
 %.o: %.c
 	@echo "    [CC] $@"
-	@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(STATIC_LIBS) -c $<
+	@$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 $(MAN):
 	@echo "    [ASCIIDOC] $(MAN)"