Restructure the Makefiles, INET6 and SSL support in libfetch is now

mandatory, build executables as PIE objects.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20100106101556-tqzwk80xpp0iz20t

lib/Makefile

@@ -1,14 +1,11 @@
 include ../vars.mk
 
-LIBMAJOR	= 0
-LIBMINOR	= 0
-LIBMICRO	= 0
-LIBXBPS_SHLIB	= libxbps.so.$(LIBMAJOR).$(LIBMINOR).$(LIBMICRO)
-SHAREDLIB_LDFLAGS = -lprop -larchive
-ifdef WITH_SSL
-SHAREDLIB_LDFLAGS += -lssl
-endif
-SHAREDLIB_LDFLAGS += -shared -Wl,-soname,libxbps.so.$(LIBMAJOR)
+LIBMAJOR = 0
+LIBMINOR = 0
+LIBMICRO = 0
+LIBXBPS_SHLIB = libxbps.so.$(LIBMAJOR).$(LIBMINOR).$(LIBMICRO)
+LDFLAGS += -lprop -larchive -lssl
+LDFLAGS += -shared -Wl,-soname,libxbps.so.$(LIBMAJOR)
 
 # libfetch
 LIBFETCH_OBJS = fetch/common.o fetch/fetch.o fetch/file.o fetch/ftp.o fetch/http.o
@@ -29,11 +26,11 @@ libfetch:
 
 %.o: %.c
 	@echo "    [CC] $@"
-	@$(CC) $(CPPFLAGS) $(SHAREDLIB_CFLAGS) $(CFLAGS) -c $<
+	@$(CC) $(CPPFLAGS) $(CFLAGS) $(SHAREDLIB_CFLAGS) -c $<
 
 libxbps.so: $(OBJS) $(LIBFETCH_OBJS)
 	@echo "    [CCLD] $@"
-	@$(CC) $(LDFLAGS) $(SHAREDLIB_LDFLAGS) $^ -o $(LIBXBPS_SHLIB)
+	@$(CC) $(LDFLAGS) $^ -o $(LIBXBPS_SHLIB)
 	@-ln -sf $(LIBXBPS_SHLIB) libxbps.so.$(LIBMAJOR)
 	@-ln -sf $(LIBXBPS_SHLIB) libxbps.so
 

lib/fetch/Makefile

@@ -3,14 +3,7 @@ include $(TOPDIR)/vars.mk
 
 CFLAGS += -Wno-unused-macros -Wno-conversion -Wno-stack-protector
 CPPFLAGS += -DFTP_COMBINE_CWDS -DNETBSD -I$(TOPDIR)/include
-
-ifdef WITH_INET6
-CPPFLAGS += -DINET6
-endif
-
-ifdef WITH_SSL
-CPPFLAGS += -DWITH_SSL
-endif
+CPPFLAGS += -DINET6 -DWITH_SSL
 
 OBJS= fetch.o common.o ftp.o http.o file.o
 INCS= common.h
@@ -21,7 +14,7 @@ all: $(INCS) $(GEN) $(OBJS)
 
 %.o: %.c $(INCS) $(GEN)
 	@echo "    [CC] $@"
-	@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHAREDLIB_CFLAGS) -c $<
+	@$(CC) $(CPPFLAGS) $(CFLAGS) $(SHAREDLIB_CFLAGS) $(LDFLAGS) -c $<
 
 ftperr.h: ftp.errors
 	@echo "    [GEN] $@"