diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-06 02:38:36 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-06 02:38:36 +0000 |
| commit | 7608c85140162446c3830421eb94ae42a1bbb893 (patch) | |
| tree | f2509aa04d8f09f3807c1ddaa85463c98f66400d | |
| parent | fc2b9cdd9c21b9dd41c4e9a64d640e0473a12fa4 (diff) | |
| download | uClibc-alpine-7608c85140162446c3830421eb94ae42a1bbb893.tar.bz2 uClibc-alpine-7608c85140162446c3830421eb94ae42a1bbb893.tar.xz | |
Merge from trunk.
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | librt/Makefile.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index f8c082bbe..2515880c8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,9 +27,9 @@ include $(top_srcdir)libintl/Makefile.in include $(top_srcdir)libm/Makefile.in include $(top_srcdir)libnsl/Makefile.in include $(top_srcdir)libresolv/Makefile.in -include $(top_srcdir)librt/Makefile.in include $(top_srcdir)libutil/Makefile.in include $(top_srcdir)libpthread/Makefile.in +include $(top_srcdir)librt/Makefile.in include $(top_srcdir)extra/locale/Makefile.in # last included to catch all the objects added by others (locales/threads) diff --git a/librt/Makefile.in b/librt/Makefile.in index ec405e556..5fddb5fc6 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -20,11 +20,11 @@ librt_SRC := $(wildcard $(librt_DIR)/*.c) librt_OBJ := $(patsubst $(librt_DIR)/%.c,$(librt_OUT)/%.o,$(librt_SRC)) ifeq ($(DOPIC),y) -librt-a-y := $(librt_OBJ:.o=.os) +librt-a-y += $(librt_OBJ:.o=.os) else -librt-a-y := $(librt_OBJ) +librt-a-y += $(librt_OBJ) endif -librt-so-y := $(librt_OBJ:.o=.os) +librt-so-y += $(librt_OBJ:.o=.os) librt-multi-y += $(librt_SRC) |