Default changed to IMA compiling, disabled explicitely where currently not possible...

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

diff --git a/libintl/Makefile b/libintl/Makefile
index 8977b5b..8fe45f5 100644 (file)
--- a/libintl/Makefile
+++ b/libintl/Makefile
@@ -24,41 +24,43 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
-CFLAGS+=$(SSP_ALL_CFLAGS)
+CFLAGS += $(SSP_ALL_CFLAGS)
 
-LIBINTL=libintl.a
-LIBINTL_SHARED=libintl.so
-LIBINTL_SHARED_FULLNAME=libintl-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+LIB_NAME := libintl
+AR_LIB_NAME := $(TOPDIR)lib/$(LIB_NAME).a
+SO_LIB_NAME = $(TOPDIR)lib/$(LIB_NAME).so
+SO_FULL_NAME = $(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 
-MSRC= intl.c
-MOBJ= gettext.o ngettext.o  dgettext.o dcgettext.o dngettext.o dcngettext.o \
+MSRC := intl.c
+MOBJ := gettext.o ngettext.o  dgettext.o dcgettext.o dngettext.o dcngettext.o \
        textdomain.o bindtextdomain.o bind_textdomain_codeset.o \
        _nl_expand_alias.o _nl_msg_cat_cntr.o # glibc-isms
 
-OBJS=$(MOBJ)
+OBJS := $(MOBJ)
 
-all: $(LIBINTL)
+ifeq ($(HAVE_SHARED),y)
+all: $(SO_LIB_NAME)
+else
+all: $(AR_LIB_NAME)
+endif
 
-$(LIBINTL) ar-target: $(OBJS)
-       $(AR) $(ARFLAGS) $(LIBINTL) $(OBJS)
+$(AR_LIB_NAME): $(OBJS)
        $(INSTALL) -d $(TOPDIR)lib
-       $(RM) $(TOPDIR)lib/$(LIBINTL)
-       $(INSTALL) -m 644 $(LIBINTL) $(TOPDIR)lib/
+       $(RM) $@
+       $(STRIPTOOL) -x -R .note -R .comment $^
+       $(AR) $(ARFLAGS) $@ $^
 
-$(MOBJ): $(MSRC)
-       $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
-       $(STRIPTOOL) -x -R .note -R .comment $*.o
-
-shared: all
-       $(LD) $(LDFLAGS) -soname=$(LIBINTL_SHARED).$(MAJOR_VERSION) \
-               -o $(LIBINTL_SHARED_FULLNAME) --whole-archive $(LIBINTL) \
+$(SO_LIB_NAME): $(AR_LIB_NAME)
+       $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@
+       $(LD) $(LDFLAGS) -soname=$(LIB_NAME).so.$(MAJOR_VERSION) \
+               -o $(TOPDIR)lib/$(SO_FULL_NAME) --whole-archive $< \
                --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
                -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
-       $(INSTALL) -d $(TOPDIR)lib
-       $(RM) $(TOPDIR)lib/$(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED).$(MAJOR_VERSION)
-       $(INSTALL) -m 644 $(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib
-       $(LN) -sf $(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED)
-       $(LN) -sf $(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED).$(MAJOR_VERSION)
+       $(LN) -sf $(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION)
+       $(LN) -sf $(SO_FULL_NAME) $@
+
+$(MOBJ): $(MSRC)
+       $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
 
 clean:
-       $(RM) *.[oa] *~ core $(LIBINTL) $(LIBINTL_SHARED_FULLNAME)
+       $(RM) *.o *~ core