diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-15 17:04:57 +0300 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-15 17:04:57 +0300 |
commit | 7ca61b6f3379bf66b446617b8834d92c13b366dd (patch) | |
tree | c0aaacfeb97a9bc74e73f8ff36ecbf1fd173808b /networking | |
parent | 8c9daa12dcb4c1aa8f0f475896c9cfbcfb38370d (diff) |
- shared libbusybox.
- IMA compilation option (aka IPO, IPA,..)
Please holler if i broke something..
Diffstat (limited to 'networking')
-rw-r--r-- | networking/Makefile.in | 12 | ||||
-rw-r--r-- | networking/libiproute/Makefile.in | 45 | ||||
-rw-r--r-- | networking/udhcp/Makefile.in | 30 |
3 files changed, 52 insertions, 35 deletions
diff --git a/networking/Makefile.in b/networking/Makefile.in index 376ecea63..2263acc00 100644 --- a/networking/Makefile.in +++ b/networking/Makefile.in @@ -9,6 +9,7 @@ ifndef $(NETWORKING_DIR) NETWORKING_DIR:=$(top_builddir)/networking/ endif srcdir=$(top_srcdir)/networking + NETWORKING-y:= NETWORKING-$(CONFIG_ARPING) += arping.o NETWORKING-$(CONFIG_ETHER_WAKE) += ether-wake.o @@ -41,13 +42,22 @@ NETWORKING-$(CONFIG_VCONFIG) += vconfig.o NETWORKING-$(CONFIG_WGET) += wget.o NETWORKING-$(CONFIG_ZCIP) += zcip.o +NETWORKING-y:=$(sort $(NETWORKING-y)) libraries-y+=$(NETWORKING_DIR)$(NETWORKING_AR) +NETWORKING_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(NETWORKING-y)) +NETWORKING_SRC-a:=$(wildcard $(srcdir)/*.c) +APPLET_SRC-y+=$(NETWORKING_SRC-y) +APPLET_SRC-a+=$(NETWORKING_SRC-a) + +LIBRARY_DEFINE-y+= -I$(top_srcdir)/networking +LIBRARY_DEFINE-a+= -I$(top_srcdir)/networking + needcrypt-y:= needcrypt-$(CONFIG_FEATURE_HTTPD_AUTH_MD5) := y ifeq ($(needcrypt-y),y) - LIBRARIES += -lcrypt + LIBRARIES := -lcrypt $(filter-out -lcrypt,$(LIBRARIES)) endif $(NETWORKING_DIR)$(NETWORKING_AR): $(patsubst %,$(NETWORKING_DIR)%, $(NETWORKING-y)) diff --git a/networking/libiproute/Makefile.in b/networking/libiproute/Makefile.in index a28af4611..37d556dd9 100644 --- a/networking/libiproute/Makefile.in +++ b/networking/libiproute/Makefile.in @@ -2,27 +2,16 @@ # # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. # LIBIPROUTE_AR:=libiproute.a ifndef $(LIBIPROUTE_DIR) -LIBIPROUTE_DIR:=$(top_builddir)/networking/libiproute/ +LIBIPROUTE_DIR:=$(top_builddir)/networking/libiproute endif srcdir=$(top_srcdir)/networking/libiproute +LIBIPROUTE-y:= LIBIPROUTE-$(CONFIG_IP) += \ ip_parse_common_args.o \ ipaddress.o \ @@ -74,11 +63,31 @@ LIBIPROUTE-$(CONFIG_IPTUNNEL) += \ rt_names.o \ utils.o -libraries-y+=$(LIBIPROUTE_DIR)$(LIBIPROUTE_AR) +LIBIPROUTE-y:=$(sort $(LIBIPROUTE-y)) + +LIBIPROUTE_SRC-y:=$(patsubst %,$(srcdir)/%,$(subst .o,.c,$(LIBIPROUTE-y))) +LIBIPROUTE_SRC-a:=$(wildcard $(srcdir)/*.c) +LIBRARY_SRC-y+=$(LIBIPROUTE_SRC-y) +LIBRARY_SRC-a+=$(LIBIPROUTE_SRC-a) + +LIBIPROUTE-obj:=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR) + +# We do not need to build an empty non-pic object/archive +ifneq ($(strip $(LIBIPROUTE-y)),) +libraries-y+=$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR) +endif + +# If we are building libbusybox.so _and_ we will use it ourselves then we +# keep it as small as possible +ifeq ($(strip $(CONFIG_FEATURE_SHARED_BUSYBOX)),y) +ifneq ($(strip $(LIBIPROUTE-y)),) +libraries-m+=$(LIBIPROUTE-multi-pic) +endif +endif -$(LIBIPROUTE_DIR)$(LIBIPROUTE_AR): $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y)) - $(AR) $(ARFLAGS) $@ $(patsubst %,$(LIBIPROUTE_DIR)%, $(LIBIPROUTE-y)) +$(LIBIPROUTE_DIR)/$(LIBIPROUTE_AR): $(patsubst %,$(LIBIPROUTE_DIR)/%,$(LIBIPROUTE-y)) + $(AR) $(ARFLAGS) $@ $(^) -$(LIBIPROUTE_DIR)%.o: $(srcdir)/%.c +$(LIBIPROUTE_DIR)/%.o: $(srcdir)/%.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< diff --git a/networking/udhcp/Makefile.in b/networking/udhcp/Makefile.in index ac9be5c57..8573a2fc4 100644 --- a/networking/udhcp/Makefile.in +++ b/networking/udhcp/Makefile.in @@ -2,19 +2,7 @@ # # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Licensed under the GPL v2 or later, see the file LICENSE in this tarball. # UDHCP_AR:=udhcp.a @@ -24,10 +12,10 @@ endif srcdir=$(top_srcdir)/networking/udhcp #ok, so I forgot how to do an or, but this is a quick and dirty hack -ifeq ($(CONFIG_UDHCPC), y) +ifeq ($(strip $(CONFIG_UDHCPC)),y) CONFIG_UDHCP_SHARED=y else -ifeq ($(CONFIG_UDHCPD), y) +ifeq ($(strip $(CONFIG_UDHCPD)),y) CONFIG_UDHCP_SHARED=y else CONFIG_UDHCP_SHARED=n @@ -42,10 +30,20 @@ UDHCP-$(CONFIG_UDHCPC) += dhcpc.c clientpacket.c clientsocket.c \ UDHCP-$(CONFIG_UDHCPD) += dhcpd.c arpping.c files.c leases.c \ serverpacket.c static_leases.c UDHCP-$(CONFIG_DUMPLEASES) += dumpleases.c -UDHCP_OBJS=$(patsubst %.c,$(UDHCP_DIR)%.o, $(UDHCP-y)) +UDHCP_OBJS:=$(patsubst %.c,$(UDHCP_DIR)%.o, $(UDHCP-y)) libraries-y+=$(UDHCP_DIR)$(UDHCP_AR) +UDHCP-y:=$(patsubst %,$(srcdir)/%,$(UDHCP-y)) +UDHCP-a:=$(wildcard $(srcdir)/*.c) +APPLET_SRC-y+=$(UDHCP-y) +APPLET_SRC-a+=$(UDHCP-a) + +UDHCP_INCLUDES:=$(srcdir) + +APPLETS_DEFINE-y+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES) +APPLETS_DEFINE-a+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES) + $(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS) $(AR) $(ARFLAGS) $@ $(UDHCP_OBJS) |