merge from gcc

1 files changed, 17 insertions, 14 deletions

diff --git a/libdecnumber/Makefile.in b/libdecnumber/Makefile.in
index 6424c38..d2a697c 100644
--- a/libdecnumber/Makefile.in
+++ b/libdecnumber/Makefile.in
@@ -42,6 +42,7 @@ LIBICONV = @LIBICONV@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 SHELL = @SHELL@
+objext = @OBJEXT@
 
 datarootdir = @datarootdir@
 datadir = @datadir@
@@ -58,10 +59,12 @@ INCLUDES = -I$(srcdir) -I.
 
 ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS)
 
-bid_OBJS = bid2dpd_dpd2bid.o host-ieee32.o host-ieee64.o host-ieee128.o
+bid_OBJS = bid2dpd_dpd2bid.$(objext) host-ieee32.$(objext) \
+	host-ieee64.$(objext) host-ieee128.$(objext)
 
-libdecnumber_a_OBJS = decNumber.o decContext.o \
-	decimal32.o decimal64.o decimal128.o $(ADDITIONAL_OBJS)
+libdecnumber_a_OBJS = decNumber.$(objext) decContext.$(objext) \
+	decimal32.$(objext) decimal64.$(objext) decimal128.$(objext) \
+	$(ADDITIONAL_OBJS)
 
 libdecnumber_a_SOURCES = decContext.c decContext.h decDPD.h \
 	decNumber.c decNumber.h decNumberLocal.h \
@@ -117,38 +120,38 @@ $(srcdir)/config.in: @MAINT@ $(srcdir)/configure
 
 # Dependencies.
 
-decContext.o: decContext.c decContext.h decNumberLocal.h \
+decContext.$(objext): decContext.c decContext.h decNumberLocal.h \
 	decContextSymbols.h
-decNumber.o:  decNumber.c decNumber.h decContext.h decNumberLocal.h \
+decNumber.$(objext):  decNumber.c decNumber.h decContext.h decNumberLocal.h \
 	decNumberSymbols.h
-decimal32.o:  $(srcdir)/$(enable_decimal_float)/decimal32.c \
+decimal32.$(objext):  $(srcdir)/$(enable_decimal_float)/decimal32.c \
    $(srcdir)/$(enable_decimal_float)/decimal32.h \
    $(srcdir)/$(enable_decimal_float)/decimal32Symbols.h \
    decNumber.h decContext.h decNumberLocal.h
 	$(COMPILE) $(srcdir)/$(enable_decimal_float)/decimal32.c
-decimal64.o:  $(srcdir)/$(enable_decimal_float)/decimal64.c \
+decimal64.$(objext):  $(srcdir)/$(enable_decimal_float)/decimal64.c \
    $(srcdir)/$(enable_decimal_float)/decimal64.h \
    $(srcdir)/$(enable_decimal_float)/decimal64Symbols.h \
    decNumber.h decContext.h decNumberLocal.h
 	$(COMPILE) $(srcdir)/$(enable_decimal_float)/decimal64.c
-decimal128.o:  $(srcdir)/$(enable_decimal_float)/decimal128.c \
+decimal128.$(objext):  $(srcdir)/$(enable_decimal_float)/decimal128.c \
    $(srcdir)/$(enable_decimal_float)/decimal128.h \
    $(srcdir)/$(enable_decimal_float)/decimal128Symbols.h\
    $(srcdir)/$(enable_decimal_float)/decimal128Local.h\
    decNumber.h decContext.h decNumberLocal.h 
 	$(COMPILE) $(srcdir)/$(enable_decimal_float)/decimal128.c
-bid2dpd_dpd2bid.o : $(srcdir)/bid/bid2dpd_dpd2bid.c $(srcdir)/bid/bid2dpd_dpd2bid.h
+bid2dpd_dpd2bid.$(objext) : $(srcdir)/bid/bid2dpd_dpd2bid.c $(srcdir)/bid/bid2dpd_dpd2bid.h
 	$(COMPILE) $(srcdir)/bid/bid2dpd_dpd2bid.c
-host-ieee32.o : $(srcdir)/bid/host-ieee32.c $(srcdir)/bid/decimal32.h
+host-ieee32.$(objext) : $(srcdir)/bid/host-ieee32.c $(srcdir)/bid/decimal32.h
 	$(COMPILE) $(srcdir)/bid/host-ieee32.c
-host-ieee64.o : $(srcdir)/bid/host-ieee64.c $(srcdir)/bid/decimal64.h
+host-ieee64.$(objext) : $(srcdir)/bid/host-ieee64.c $(srcdir)/bid/decimal64.h
 	$(COMPILE) $(srcdir)/bid/host-ieee64.c
-host-ieee128.o : $(srcdir)/bid/host-ieee128.c $(srcdir)/bid/decimal128.h
+host-ieee128.$(objext) : $(srcdir)/bid/host-ieee128.c $(srcdir)/bid/decimal128.h
 	$(COMPILE) $(srcdir)/bid/host-ieee128.c
 # Other miscellaneous targets.
 
 mostlyclean:
-	-rm -f *.o
+	-rm -f *.$(objext)
 
 clean: mostlyclean
 	-rm -rf libdecnumber.a $(srcdir)/autom4te.cache
@@ -183,7 +186,7 @@ COMPILE = source='$<' object='$@' libtool=no $(CC) $(DEFS) $(INCLUDES) $(CPPFLAG
 
 # Implicit rules
 
-.c.o:
+.c.$(objext):
 	$(COMPILE) $<
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.