mkostemp: fix implementation

[uclinux-h8/uClibc.git] / libintl / Makefile.in

diff --git a/libintl/Makefile.in b/libintl/Makefile.in
index 78bcc8d..22ae70c 100644 (file)
--- a/libintl/Makefile.in
+++ b/libintl/Makefile.in
@@ -1,18 +1,19 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-libintl := -DNOT_IN_libc $(SSP_ALL_CFLAGS)
+subdirs += libintl
+
+CFLAGS-libintl := -DNOT_IN_libc -DIS_IN_libintl $(SSP_ALL_CFLAGS)
 
 LDFLAGS-libintl.so := $(LDFLAGS)
 
 LIBS-libintl.so := $(LIBS)
 
-libintl_FULL_NAME := libintl-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libintl_FULL_NAME := libintl-$(VERSION).so
 
 MOBJ := \
        gettext.o ngettext.o  dgettext.o dcgettext.o dngettext.o dcngettext.o \
@@ -25,34 +26,44 @@ libintl_OUT := $(top_builddir)libintl
 libintl_MSRC := $(libintl_DIR)/intl.c
 libintl_MOBJ := $(patsubst %.o,$(libintl_OUT)/%.o,$(MOBJ))
 
-libintl_DEF := $(patsubst %,-DL_%,$(subst .o,,$(notdir $(libintl_MOBJ))))
+ifneq ($(DOMULTI),n)
+CFLAGS-libintl += $(patsubst %,-DL_%,$(subst .o,,$(notdir $(libintl_MOBJ))))
+endif
 
+ifeq ($(DOPIC),y)
+libintl-a-y := $(libintl_MOBJ:.o=.os)
+else
 libintl-a-y := $(libintl_MOBJ)
+endif
 libintl-so-y := $(libintl_MOBJ:.o=.os)
 
-CFLAGS-multi-y := $(libintl_DEF)
-libintl-multi-y := $(libintl_MSRC)
-
 lib-a-$(UCLIBC_HAS_GETTEXT_AWARENESS) += $(top_builddir)lib/libintl.a
 lib-so-$(UCLIBC_HAS_GETTEXT_AWARENESS) += $(top_builddir)lib/libintl.so
-objclean-y += libintl_clean
+objclean-y += CLEAN_libintl
 
-$(top_builddir)lib/libintl.so: $(libintl_OUT)/libintl_so.a libc-y
-       $(call link.so,$(libintl_FULL_NAME),$(MAJOR_VERSION))
+ifeq ($(DOMULTI),n)
+ifeq ($(DOPIC),y)
+$(top_builddir)lib/libintl.so: $(top_builddir)lib/libintl.a $(libc.depend)
+else
+$(top_builddir)lib/libintl.so: $(libintl_OUT)/libintl_so.a $(libc.depend)
+endif
+       $(call link.so,$(libintl_FULL_NAME),$(ABI_VERSION))
+else
+$(top_builddir)lib/libintl.so: $(libintl_OUT)/libintl.oS | $(libc.depend)
+       $(call linkm.so,$(libintl_FULL_NAME),$(ABI_VERSION))
+endif
 
 $(libintl_OUT)/libintl_so.a: $(libintl-so-y)
        $(Q)$(RM) $@
-       $(do_strip)
        $(do_ar)
 
-ifeq ($(DOPIC),y)
-$(top_builddir)lib/libintl.a: $(libintl-a-y:.o=.os)
-else
+$(libintl_OUT)/libintl.oS: $(libintl_MSRC)
+       $(Q)$(RM) $@
+       $(compile-m)
+
 $(top_builddir)lib/libintl.a: $(libintl-a-y)
-endif
        $(Q)$(INSTALL) -d $(dir $@)
        $(Q)$(RM) $@
-       $(do_strip)
        $(do_ar)
 
 $(libintl_MOBJ): $(libintl_MSRC)
@@ -61,5 +72,5 @@ $(libintl_MOBJ): $(libintl_MSRC)
 $(libintl_MOBJ:.o=.os): $(libintl_MSRC)
        $(compile.m)
 
-libintl_clean:
-       $(RM) $(libintl_OUT)/*.{o,os,a}
+CLEAN_libintl:
+       $(do_rm) $(addprefix $(libintl_OUT)/*., o os oS a)