summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-03-13 19:04:00 +0000
commitdf10094870c28cc0c6c5577c9aa03b8ede9cb8a6 (patch)
tree49493696039b285aa751a5bc884fc70c9c85e878 /libbb
parentc5b1d4d6b14f22b5e2f7ae42eb01bf2746b8001c (diff)
downloadbusybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.gz
busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.tar.bz2
busybox-w32-df10094870c28cc0c6c5577c9aa03b8ede9cb8a6.zip
- revert back to r14406
Diffstat (limited to 'libbb')
-rw-r--r--libbb/Makefile.in105
1 files changed, 49 insertions, 56 deletions
diff --git a/libbb/Makefile.in b/libbb/Makefile.in
index 159957aa4..7b501531a 100644
--- a/libbb/Makefile.in
+++ b/libbb/Makefile.in
@@ -4,8 +4,10 @@
4# 4#
5# Licensed under the GPL v2, see the file LICENSE in this tarball. 5# Licensed under the GPL v2, see the file LICENSE in this tarball.
6 6
7srcdir:=$(top_srcdir)/libbb 7ifndef $(LIBBB_DIR)
8objdir:=$(top_builddir)/libbb 8LIBBB_DIR:=$(top_builddir)/libbb
9endif
10srcdir=$(top_srcdir)/libbb
9 11
10LIBBB-n:= 12LIBBB-n:=
11LIBBB-y:= \ 13LIBBB-y:= \
@@ -49,72 +51,77 @@ LIBBB-y:=$(patsubst %,$(srcdir)/%,$(LIBBB-y))
49 51
50# 1:N objects 52# 1:N objects
51LIBBB_MSRC0:=$(srcdir)/messages.c 53LIBBB_MSRC0:=$(srcdir)/messages.c
52LIBBB_M0:=full_version \ 54LIBBB_MOBJ0:=full_version.o \
53 memory_exhausted invalid_date io_error \ 55 memory_exhausted.o invalid_date.o io_error.o \
54 read_error write_error name_longer_than_foo unknown \ 56 read_error.o write_error.o name_longer_than_foo.o unknown.o \
55 can_not_create_raw_socket perm_denied_are_you_root \ 57 can_not_create_raw_socket.o perm_denied_are_you_root.o \
56 shadow_file passwd_file group_file gshadow_file nologin_file \ 58 shadow_file.o passwd_file.o group_file.o gshadow_file.o nologin_file.o \
57 securetty_file motd_file \ 59 securetty_file.o motd_file.o \
58 msg_standard_input msg_standard_output shell_file \ 60 msg_standard_input.o msg_standard_output.o shell_file.o \
59 bb_dev_null bb_common_bufsiz1 61 bb_dev_null.o bb_common_bufsiz1.o
60LIBBB_MOBJ0:=$(patsubst %,$(objdir)/%$(om),$(LIBBB_M0)) 62LIBBB_MOBJ0:=$(patsubst %,$(LIBBB_DIR)/%, $(LIBBB_MOBJ0))
61$(LIBBB_MOBJ0):$(LIBBB_MSRC0) 63$(LIBBB_MOBJ0):$(LIBBB_MSRC0)
64 $(compile.c) -DL_$(notdir $*)
62 65
63LIBBB_MSRC1:=$(srcdir)/xfuncs.c 66LIBBB_MSRC1:=$(srcdir)/xfuncs.c
64LIBBB_M1:=xmalloc xrealloc xcalloc xstrdup xstrndup \ 67LIBBB_MOBJ1:=xmalloc.o xrealloc.o xcalloc.o xstrdup.o xstrndup.o \
65 xfopen xopen xread xread_all xread_char \ 68 xfopen.o xopen.o xread.o xread_all.o xread_char.o \
66 xferror xferror_stdout xfflush_stdout strlen 69 xferror.o xferror_stdout.o xfflush_stdout.o strlen.o
67LIBBB_MOBJ1:=$(patsubst %,$(objdir)/%$(om),$(LIBBB_M1)) 70LIBBB_MOBJ1:=$(patsubst %,$(LIBBB_DIR)/%, $(LIBBB_MOBJ1))
68$(LIBBB_MOBJ1):$(LIBBB_MSRC1) 71$(LIBBB_MOBJ1):$(LIBBB_MSRC1)
72 $(compile.c) -DL_$(notdir $*)
69 73
70LIBBB_MSRC2:=$(srcdir)/printf.c 74LIBBB_MSRC2:=$(srcdir)/printf.c
71LIBBB_M2:=bb_vfprintf bb_vprintf bb_fprintf bb_printf 75LIBBB_MOBJ2:=bb_vfprintf.o bb_vprintf.o bb_fprintf.o bb_printf.o
72LIBBB_MOBJ2:=$(patsubst %,$(objdir)/%$(om),$(LIBBB_M2)) 76LIBBB_MOBJ2:=$(patsubst %,$(LIBBB_DIR)/%, $(LIBBB_MOBJ2))
73$(LIBBB_MOBJ2):$(LIBBB_MSRC2) 77$(LIBBB_MOBJ2):$(LIBBB_MSRC2)
78 $(compile.c) -DL_$(notdir $*)
74 79
75LIBBB_MSRC3:=$(srcdir)/xgetularg.c 80LIBBB_MSRC3:=$(srcdir)/xgetularg.c
76LIBBB_M3:=xgetularg_bnd_sfx xgetlarg_bnd_sfx getlarg10_sfx \ 81LIBBB_MOBJ3:=xgetularg_bnd_sfx.o xgetlarg_bnd_sfx.o getlarg10_sfx.o \
77 xgetularg_bnd xgetularg10_bnd xgetularg10 82 xgetularg_bnd.o xgetularg10_bnd.o xgetularg10.o
78LIBBB_MOBJ3:=$(patsubst %,$(objdir)/%$(om),$(LIBBB_M3)) 83LIBBB_MOBJ3:=$(patsubst %,$(LIBBB_DIR)/%, $(LIBBB_MOBJ3))
79$(LIBBB_MOBJ3):$(LIBBB_MSRC3) 84$(LIBBB_MOBJ3):$(LIBBB_MSRC3)
85 $(compile.c) -DL_$(notdir $*)
80 86
81LIBBB_MSRC4:=$(srcdir)/safe_strtol.c 87LIBBB_MSRC4:=$(srcdir)/safe_strtol.c
82LIBBB_M4:=safe_strtoi safe_strtod safe_strtol safe_strtoul 88LIBBB_MOBJ4:=safe_strtoi.o safe_strtod.o safe_strtol.o safe_strtoul.o
83LIBBB_MOBJ4:=$(patsubst %,$(objdir)/%$(om),$(LIBBB_M4)) 89LIBBB_MOBJ4:=$(patsubst %,$(LIBBB_DIR)/%, $(LIBBB_MOBJ4))
84$(LIBBB_MOBJ4):$(LIBBB_MSRC4) 90$(LIBBB_MOBJ4):$(LIBBB_MSRC4)
91 $(compile.c) -DL_$(notdir $*)
85 92
86LIBBB_MSRC5:=$(srcdir)/bb_pwd.c 93LIBBB_MSRC5:=$(srcdir)/bb_pwd.c
87LIBBB_M5:=bb_xgetpwnam bb_xgetgrnam bb_getgrgid bb_getpwuid \ 94LIBBB_MOBJ5:=bb_xgetpwnam.o bb_xgetgrnam.o bb_getgrgid.o bb_getpwuid.o \
88 bb_getug get_ug_id 95 bb_getug.o get_ug_id.o
89LIBBB_MOBJ5:=$(patsubst %,$(objdir)/%$(om),$(LIBBB_M5)) 96LIBBB_MOBJ5:=$(patsubst %,$(LIBBB_DIR)/%, $(LIBBB_MOBJ5))
90$(LIBBB_MOBJ5):$(LIBBB_MSRC5) 97$(LIBBB_MOBJ5):$(LIBBB_MSRC5)
98 $(compile.c) -DL_$(notdir $*)
91 99
92LIBBB_MSRC6:=$(srcdir)/llist.c 100LIBBB_MSRC6:=$(srcdir)/llist.c
93LIBBB_M6:=llist_add_to llist_add_to_end llist_free_one llist_free 101LIBBB_MOBJ6:=llist_add_to.o llist_add_to_end.o llist_free_one.o llist_free.o
94LIBBB_MOBJ6:=$(patsubst %,$(objdir)/%$(om),$(LIBBB_M6)) 102LIBBB_MOBJ6:=$(patsubst %,$(LIBBB_DIR)/%, $(LIBBB_MOBJ6))
95$(LIBBB_MOBJ6):$(LIBBB_MSRC6) 103$(LIBBB_MOBJ6):$(LIBBB_MSRC6)
104 $(compile.c) -DL_$(notdir $*)
96 105
97 106
98# We need the names of the object files built from MSRC for the L_ defines 107# We need the names of the object files built from MSRC for the L_ defines
99LIBBB_ALL_MDEFS:=$(LIBBB_M0) $(LIBBB_M1) $(LIBBB_M2) $(LIBBB_M3) $(LIBBB_M4) $(LIBBB_M5) $(LIBBB_M6) 108LIBBB_ALL_MOBJ:=$(LIBBB_MOBJ0) $(LIBBB_MOBJ1) $(LIBBB_MOBJ2) $(LIBBB_MOBJ3) $(LIBBB_MOBJ4) $(LIBBB_MOBJ5) $(LIBBB_MOBJ6)
100
101# All multi objects
102libbb_MOBJ$(os):=$(LIBBB_MOBJ0) $(LIBBB_MOBJ1) $(LIBBB_MOBJ2) $(LIBBB_MOBJ3) $(LIBBB_MOBJ4) $(LIBBB_MOBJ5) $(LIBBB_MOBJ6)
103 109
104LIBBB_ALL_MSRC:=$(LIBBB_MSRC0) $(LIBBB_MSRC1) $(LIBBB_MSRC2) $(LIBBB_MSRC3) \ 110LIBBB_ALL_MSRC:=$(LIBBB_MSRC0) $(LIBBB_MSRC1) $(LIBBB_MSRC2) $(LIBBB_MSRC3) \
105 $(LIBBB_MSRC4) $(LIBBB_MSRC5) $(LIBBB_MSRC6) 111 $(LIBBB_MSRC4) $(LIBBB_MSRC5) $(LIBBB_MSRC6)
106 112
107LIBBB-y:=$(sort $(LIBBB-y)) 113LIBBB-y:=$(sort $(LIBBB-y) $(LIBBB_ALL_MSRC))
114
115LIBBB_AR:=$(LIBBB_DIR)/libbb.a
116libraries-y+=$(LIBBB_AR)
108 117
109needcrypt-y:= 118needcrypt-y:=
110ifneq ($(findstring $(srcdir)/pw_encrypt.c,$(LIBBB-y)),) 119ifneq ($(findstring $(srcdir)/pw_encrypt.c,$(LIBBB-y)),)
111needcrypt-y:=y 120needcrypt-y:=y
112endif 121else
113ifneq ($(findstring $(srcdir)/correct_password.c,$(LIBBB-y)),) 122ifneq ($(findstring $(srcdir)/correct_password.c,$(LIBBB-y)),)
114needcrypt-y:=y 123needcrypt-y:=y
115endif 124endif
116ifeq ($(CONFIG_FEATURE_FULL_LIBBUSYBOX),y)
117needcrypt-y:=y
118endif 125endif
119 126
120ifeq ($(needcrypt-y),y) 127ifeq ($(needcrypt-y),y)
@@ -122,32 +129,18 @@ ifeq ($(needcrypt-y),y)
122endif 129endif
123 130
124# all 1:1 objects 131# all 1:1 objects
125libbb_OBJ$(os):=$(patsubst $(srcdir)/%.c,$(objdir)/%$(os),$(LIBBB-y)) 132LIBBB_OBJS:=$(patsubst $(srcdir)/%.c,$(LIBBB_DIR)/%.o, $(LIBBB-y))
133$(LIBBB_DIR)/%.o: $(srcdir)/%.c
134 $(compile.c)
126 135
127LIBBB_SRC-y:=$(sort $(LIBBB-y) $(LIBBB_ALL_MSRC))
128LIBBB_SRC-a:=$(wildcard $(srcdir)/*.c) 136LIBBB_SRC-a:=$(wildcard $(srcdir)/*.c)
129LIBRARY_SRC-y+=$(LIBBB_SRC-y) 137LIBRARY_SRC-y+=$(LIBBB-y)
130LIBRARY_SRC-a+=$(LIBBB_SRC-a) 138LIBRARY_SRC-a+=$(LIBBB_SRC-a)
131 139
132# all defines needed for 1:N objects 140# all defines needed for 1:N objects
133LIBBB_DEFINE-y:=$(patsubst %,-DL_%,$(LIBBB_ALL_MDEFS)) 141LIBBB_DEFINE-y:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(LIBBB_ALL_MOBJ))))
134LIBRARY_DEFINE-y+=$(LIBBB_DEFINE-y) 142LIBRARY_DEFINE-y+=$(LIBBB_DEFINE-y)
135LIBRARY_DEFINE-a+=$(LIBBB_DEFINE-y) 143LIBRARY_DEFINE-a+=$(LIBBB_DEFINE-y)
136 144
137ifeq ($(om),.osm) 145$(LIBBB_AR): $(LIBBB_OBJS) $(LIBBB_ALL_MOBJ)
138# XXX FIXME: 146 $(do_ar)
139# also create a pattern for the non-shared case
140$(LIBBB_MOBJ0:.osm=.om): $(LIBBB_MSRC0)
141$(LIBBB_MOBJ1:.osm=.om): $(LIBBB_MSRC1)
142$(LIBBB_MOBJ2:.osm=.om): $(LIBBB_MSRC2)
143$(LIBBB_MOBJ3:.osm=.om): $(LIBBB_MSRC3)
144$(LIBBB_MOBJ4:.osm=.om): $(LIBBB_MSRC4)
145$(LIBBB_MOBJ5:.osm=.om): $(LIBBB_MSRC5)
146$(LIBBB_MOBJ6:.osm=.om): $(LIBBB_MSRC6)
147endif
148
149$(libbb_OBJ.os): $(objdir)/%.os: $(srcdir)/%.c
150$(libbb_OBJ.o): $(objdir)/%.o: $(srcdir)/%.c
151$(objdir)/libbb.a: $(libbb_OBJ$(os)) $(libbb_MOBJ$(os))
152libraries-y:=$(libraries-y) $(objdir)/libbb.a
153
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 00:36:33 +0000