Use OBJEXT for the object file extension.

* Makefile.comm (.SUFFIXES): Add .obj.
(.cc.obj, .c.obj): New implicit rules.
* Makefile.in (OBJEXT): New variable, initialized from autoconf.
(MDEFINES): Add EXEEXT and OBJEXT.
* */Makefile.sub: s/.o/.$(OBJEXT)/.

28 files changed, 132 insertions, 113 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d975523..a0320d24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-2002-08-22  Werner LEMERG  <wl@gnu.org>
+2002-08-23  Werner LEMBERG  <wl@gnu.org>
+
+	Use OBJEXT for the object file extension.
+
+	* Makefile.comm (.SUFFIXES): Add .obj.
+	(.cc.obj, .c.obj): New implicit rules.
+	* Makefile.in (OBJEXT): New variable, initialized from autoconf.
+	(MDEFINES): Add EXEEXT and OBJEXT.
+	* */Makefile.sub: s/.o/.$(OBJEXT)/.
+
+2002-08-22  Werner LEMBERG  <wl@gnu.org>
 
 	* INSTALL: Mention texinfo 4.2 as a prerequisite.
 
diff --git a/Makefile.comm b/Makefile.comm
index c86aa4c0..256aed19 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -96,7 +96,7 @@ extraclean: distclean
 	-rm -f \#* *~ =* core junk grot old temp tmp tem
 
 .SUFFIXES:
-.SUFFIXES: .o .cc .c .y .man .n
+.SUFFIXES: .o .obj .cc .c .y .man .n
 
 .cc.o:
 	$(COMPILE.cc) $<
@@ -104,6 +104,12 @@ extraclean: distclean
 .c.o:
 	$(COMPILE.c) $<
 
+.cc.obj:
+	$(COMPILE.cc) $<
+
+.c.obj:
+	$(COMPILE.c) $<
+
 .y.cc:
 	if test -n "$(YTABH)"; then \
 	  $(YACC) $(YACCFLAGS) -d $<; \
diff --git a/Makefile.in b/Makefile.in
index a54d9a91..e19a65d0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,7 +259,7 @@ DEFINES=@DEFS@
 
 # Include
 #
-#   fmod.o, getcwd.o, mkstemp.o, putenv.o, snprintf.o, strerror.o, strtol.o
+#   {fmod,getcwd,mkstemp,putenv,snprintf,strerror,strtol}.$(OBJEXT)
 #
 # in LIBOBJS if your C library is missing the corresponding function.
 LIBOBJS=@LIBOBJS@
@@ -279,6 +279,7 @@ YACC=@YACC@
 YACCFLAGS=-v
 
 EXEEXT=@EXEEXT@
+OBJEXT=@OBJEXT@
 LIBS=@LIBS@
 LIBM=@LIBM@
 RANLIB=@RANLIB@
@@ -360,6 +361,8 @@ MDEFINES= \
   "tmac_an_prefix=$(tmac_an_prefix)" \
   "tmac_s_prefix=$(tmac_s_prefix)" \
   "tmac_m_prefix=$(tmac_m_prefix)" \
+  "EXEEXT=$(EXEEXT)" \
+  "OBJEXT=$(OBJEXT)" \
   "CCC=$(CCC)" \
   "CC=$(CC)" \
   "CCDEFINES=$(CCDEFINES)" \
diff --git a/src/devices/grodvi/Makefile.sub b/src/devices/grodvi/Makefile.sub
index a0dcdf17..74e627db 100644
--- a/src/devices/grodvi/Makefile.sub
+++ b/src/devices/grodvi/Makefile.sub
@@ -2,5 +2,5 @@ PROG=grodvi$(EXEEXT)
 MAN1=grodvi.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
-OBJS=dvi.o
+OBJS=dvi.$(OBJEXT)
 CCSRCS=$(srcdir)/dvi.cc
diff --git a/src/devices/grohtml/Makefile.sub b/src/devices/grohtml/Makefile.sub
index f2499139..33e41f8f 100644
--- a/src/devices/grohtml/Makefile.sub
+++ b/src/devices/grohtml/Makefile.sub
@@ -3,10 +3,10 @@ MAN1=grohtml.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=\
-  post-html.o \
-  html-table.o \
-  html-text.o \
-  output.o
+  post-html.$(OBJEXT) \
+  html-table.$(OBJEXT) \
+  html-text.$(OBJEXT) \
+  output.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/post-html.cc \
   $(srcdir)/html-table.cc \
diff --git a/src/devices/grolbp/Makefile.sub b/src/devices/grolbp/Makefile.sub
index d5c82aa5..d8000d16 100644
--- a/src/devices/grolbp/Makefile.sub
+++ b/src/devices/grolbp/Makefile.sub
@@ -2,5 +2,5 @@ PROG=grolbp$(EXEEXT)
 MAN1=grolbp.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
-OBJS=lbp.o
+OBJS=lbp.$(OBJEXT)
 CCSRCS=$(srcdir)/lbp.cc
diff --git a/src/devices/grolj4/Makefile.sub b/src/devices/grolj4/Makefile.sub
index 08073598..21c37805 100644
--- a/src/devices/grolj4/Makefile.sub
+++ b/src/devices/grolj4/Makefile.sub
@@ -2,5 +2,5 @@ PROG=grolj4$(EXEEXT)
 MAN1=grolj4.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
-OBJS=lj4.o
+OBJS=lj4.$(OBJEXT)
 CCSRCS=$(srcdir)/lj4.cc
diff --git a/src/devices/grops/Makefile.sub b/src/devices/grops/Makefile.sub
index dff973b5..ee2e6d1c 100644
--- a/src/devices/grops/Makefile.sub
+++ b/src/devices/grops/Makefile.sub
@@ -3,8 +3,8 @@ MAN1=grops.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=\
-  ps.o \
-  psrm.o
+  ps.$(OBJEXT) \
+  psrm.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/ps.cc \
   $(srcdir)/psrm.cc
diff --git a/src/devices/grotty/Makefile.sub b/src/devices/grotty/Makefile.sub
index e08d2334..8802674c 100644
--- a/src/devices/grotty/Makefile.sub
+++ b/src/devices/grotty/Makefile.sub
@@ -2,5 +2,5 @@ PROG=grotty$(EXEEXT)
 MAN1=grotty.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
-OBJS=tty.o
+OBJS=tty.$(OBJEXT)
 CCSRCS=$(srcdir)/tty.cc
diff --git a/src/libs/libbib/Makefile.sub b/src/libs/libbib/Makefile.sub
index 482f01ab..6e59d64a 100644
--- a/src/libs/libbib/Makefile.sub
+++ b/src/libs/libbib/Makefile.sub
@@ -1,10 +1,10 @@
 LIB=bib
 OBJS=\
-  common.o \
-  index.o \
-  linear.o \
-  search.o \
-  map.o
+  common.$(OBJEXT) \
+  index.$(OBJEXT) \
+  linear.$(OBJEXT) \
+  search.$(OBJEXT) \
+  map.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/common.cc \
   $(srcdir)/index.cc \
diff --git a/src/libs/libdriver/Makefile.sub b/src/libs/libdriver/Makefile.sub
index d50f060b..547b8c09 100644
--- a/src/libs/libdriver/Makefile.sub
+++ b/src/libs/libdriver/Makefile.sub
@@ -1,7 +1,7 @@
 LIB=driver
 OBJS=\
-  input.o \
-  printer.o
+  input.$(OBJEXT) \
+  printer.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/input.cc \
   $(srcdir)/printer.cc
diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub
index a8c773c8..ff6bd007 100644
--- a/src/libs/libgroff/Makefile.sub
+++ b/src/libs/libgroff/Makefile.sub
@@ -1,42 +1,42 @@
 LIB=groff
 OBJS=\
-  assert.o \
-  change_lf.o \
-  cmap.o \
-  color.o \
-  cset.o \
-  device.o \
-  errarg.o \
-  error.o \
-  fatal.o \
-  filename.o \
-  font.o \
-  fontfile.o \
-  geometry.o \
-  getopt.o \
-  getopt1.o \
-  htmlhint.o \
-  invalid.o \
-  lf.o \
-  lineno.o \
-  macropath.o \
-  maxfilename.o \
-  mksdir.o \
-  nametoindex.o \
-  new.o \
-  paper.o \
-  prime.o \
-  progname.o \
-  ptable.o \
-  searchpath.o \
-  string.o \
-  strsave.o \
-  tmpfile.o \
-  tmpname.o \
-  iftoa.o \
-  itoa.o \
-  matherr.o \
-  version.o \
+  assert.$(OBJEXT) \
+  change_lf.$(OBJEXT) \
+  cmap.$(OBJEXT) \
+  color.$(OBJEXT) \
+  cset.$(OBJEXT) \
+  device.$(OBJEXT) \
+  errarg.$(OBJEXT) \
+  error.$(OBJEXT) \
+  fatal.$(OBJEXT) \
+  filename.$(OBJEXT) \
+  font.$(OBJEXT) \
+  fontfile.$(OBJEXT) \
+  geometry.$(OBJEXT) \
+  getopt.$(OBJEXT) \
+  getopt1.$(OBJEXT) \
+  htmlhint.$(OBJEXT) \
+  invalid.$(OBJEXT) \
+  lf.$(OBJEXT) \
+  lineno.$(OBJEXT) \
+  macropath.$(OBJEXT) \
+  maxfilename.$(OBJEXT) \
+  mksdir.$(OBJEXT) \
+  nametoindex.$(OBJEXT) \
+  new.$(OBJEXT) \
+  paper.$(OBJEXT) \
+  prime.$(OBJEXT) \
+  progname.$(OBJEXT) \
+  ptable.$(OBJEXT) \
+  searchpath.$(OBJEXT) \
+  string.$(OBJEXT) \
+  strsave.$(OBJEXT) \
+  tmpfile.$(OBJEXT) \
+  tmpname.$(OBJEXT) \
+  iftoa.$(OBJEXT) \
+  itoa.$(OBJEXT) \
+  matherr.$(OBJEXT) \
+  version.$(OBJEXT) \
   $(LIBOBJS)
 CCSRCS=\
   $(srcdir)/assert.cc \
@@ -98,6 +98,6 @@ version.cc: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
 	  sed -e 's/\.0\"/\"/' >>$@
 
 # We have to avoid $(COMPILE.c) since we must not use groff's `assert.h'
-snprintf.o: $(srcdir)/../snprintf/snprintf.c
+snprintf.$(OBJEXT): $(srcdir)/../snprintf/snprintf.c
 	$(CC) -c $(CDEFINES) $(CFLAGS) $(CPPFLAGS) \
 	  $(srcdir)/../snprintf/snprintf.c
diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub
index 759d47bd..69972904 100644
--- a/src/preproc/eqn/Makefile.sub
+++ b/src/preproc/eqn/Makefile.sub
@@ -2,21 +2,21 @@ PROG=eqn$(EXEEXT)
 MAN1=eqn.n neqn.n
 XLIBS=$(LIBGROFF)
 OBJS=\
-  eqn.o \
-  main.o \
-  lex.o \
-  box.o \
-  limit.o \
-  list.o \
-  over.o \
-  text.o \
-  script.o \
-  mark.o \
-  other.o \
-  delim.o \
-  sqrt.o \
-  pile.o \
-  special.o
+  eqn.$(OBJEXT) \
+  main.$(OBJEXT) \
+  lex.$(OBJEXT) \
+  box.$(OBJEXT) \
+  limit.$(OBJEXT) \
+  list.$(OBJEXT) \
+  over.$(OBJEXT) \
+  text.$(OBJEXT) \
+  script.$(OBJEXT) \
+  mark.$(OBJEXT) \
+  other.$(OBJEXT) \
+  delim.$(OBJEXT) \
+  sqrt.$(OBJEXT) \
+  pile.$(OBJEXT) \
+  special.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/main.cc \
   $(srcdir)/lex.cc \
diff --git a/src/preproc/grn/Makefile.sub b/src/preproc/grn/Makefile.sub
index 97e34136..d180803e 100644
--- a/src/preproc/grn/Makefile.sub
+++ b/src/preproc/grn/Makefile.sub
@@ -3,10 +3,10 @@ MAN1=grn.n
 MLIB=$(LIBM)
 XLIBS=$(LIBGROFF)
 OBJS=\
-  hdb.o \
-  hpoint.o \
-  hgraph.o \
-  main.o
+  hdb.$(OBJEXT) \
+  hpoint.$(OBJEXT) \
+  hgraph.$(OBJEXT) \
+  main.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/hdb.cc \
   $(srcdir)/hpoint.cc \
diff --git a/src/preproc/html/Makefile.sub b/src/preproc/html/Makefile.sub
index 41f3c372..5da6d43b 100644
--- a/src/preproc/html/Makefile.sub
+++ b/src/preproc/html/Makefile.sub
@@ -2,5 +2,5 @@ PROG=pre-grohtml$(EXEEXT)
 # MAN1=pre-grohtml.n
 MAN1=
 XLIBS=$(LIBGROFF)
-OBJS=pre-html.o pushback.o
+OBJS=pre-html.$(OBJEXT) pushback.$(OBJEXT)
 CCSRCS=$(srcdir)/pre-html.cc $(srcdir)/pushback.cc
diff --git a/src/preproc/pic/Makefile.sub b/src/preproc/pic/Makefile.sub
index 72bad744..05c47a17 100644
--- a/src/preproc/pic/Makefile.sub
+++ b/src/preproc/pic/Makefile.sub
@@ -3,14 +3,14 @@ MAN1=pic.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=\
-  pic.o \
-  lex.o \
-  main.o \
-  object.o \
-  common.o \
-  troff.o \
-  tex.o
-  # fig.o 
+  pic.$(OBJEXT) \
+  lex.$(OBJEXT) \
+  main.$(OBJEXT) \
+  object.$(OBJEXT) \
+  common.$(OBJEXT) \
+  troff.$(OBJEXT) \
+  tex.$(OBJEXT)
+  # fig.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/lex.cc \
   $(srcdir)/main.cc \
diff --git a/src/preproc/refer/Makefile.sub b/src/preproc/refer/Makefile.sub
index 440eb0c6..9f4a53be 100644
--- a/src/preproc/refer/Makefile.sub
+++ b/src/preproc/refer/Makefile.sub
@@ -3,11 +3,11 @@ MAN1=refer.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=\
-  command.o \
-  label.o \
-  ref.o \
-  refer.o \
-  token.o
+  command.$(OBJEXT) \
+  label.$(OBJEXT) \
+  ref.$(OBJEXT) \
+  refer.$(OBJEXT) \
+  token.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/command.cc \
   $(srcdir)/ref.cc \
diff --git a/src/preproc/soelim/Makefile.sub b/src/preproc/soelim/Makefile.sub
index cf50df18..4b59ab60 100644
--- a/src/preproc/soelim/Makefile.sub
+++ b/src/preproc/soelim/Makefile.sub
@@ -1,6 +1,6 @@
 PROG=soelim$(EXEEXT)
 MAN1=soelim.n
 XLIBS=$(LIBGROFF)
-OBJS=soelim.o
+OBJS=soelim.$(OBJEXT)
 CCSRCS=$(srcdir)/soelim.cc
 NAMEPREFIX=$(g)
diff --git a/src/preproc/tbl/Makefile.sub b/src/preproc/tbl/Makefile.sub
index d4c0d994..fb148186 100644
--- a/src/preproc/tbl/Makefile.sub
+++ b/src/preproc/tbl/Makefile.sub
@@ -2,8 +2,8 @@ PROG=tbl$(EXEEXT)
 MAN1=tbl.n
 XLIBS=$(LIBGROFF)
 OBJS=\
-  main.o \
-  table.o
+  main.$(OBJEXT) \
+  table.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/main.cc \
   $(srcdir)/table.cc
diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
index db2464c9..3b26caac 100644
--- a/src/roff/groff/Makefile.sub
+++ b/src/roff/groff/Makefile.sub
@@ -2,7 +2,7 @@ PROG=groff$(EXEEXT)
 MAN1=groff.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
-OBJS=groff.o pipeline.o
+OBJS=groff.$(OBJEXT) pipeline.$(OBJEXT)
 CCSRCS=$(srcdir)/groff.cc
 CSRCS=$(srcdir)/pipeline.c
 HDRS=$(srcdir)/pipeline.h
diff --git a/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub
index 47e1b56e..e889cdd5 100644
--- a/src/roff/troff/Makefile.sub
+++ b/src/roff/troff/Makefile.sub
@@ -3,15 +3,15 @@ MAN1=troff.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=\
-  env.o \
-  node.o \
-  input.o \
-  div.o \
-  symbol.o \
-  dictionary.o \
-  reg.o \
-  number.o \
-  majorminor.o
+  env.$(OBJEXT) \
+  node.$(OBJEXT) \
+  input.$(OBJEXT) \
+  div.$(OBJEXT) \
+  symbol.$(OBJEXT) \
+  dictionary.$(OBJEXT) \
+  reg.$(OBJEXT) \
+  number.$(OBJEXT) \
+  majorminor.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/env.cc \
   $(srcdir)/node.cc \
diff --git a/src/utils/addftinfo/Makefile.sub b/src/utils/addftinfo/Makefile.sub
index 6892a812..af5bf708 100644
--- a/src/utils/addftinfo/Makefile.sub
+++ b/src/utils/addftinfo/Makefile.sub
@@ -2,8 +2,8 @@ PROG=addftinfo$(EXEEXT)
 MAN1=addftinfo.n
 XLIBS=$(LIBGROFF)
 OBJS=\
-  addftinfo.o \
-  guess.o
+  addftinfo.$(OBJEXT) \
+  guess.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/addftinfo.cc \
   $(srcdir)/guess.cc
diff --git a/src/utils/hpftodit/Makefile.sub b/src/utils/hpftodit/Makefile.sub
index ea6d0b59..7a165311 100644
--- a/src/utils/hpftodit/Makefile.sub
+++ b/src/utils/hpftodit/Makefile.sub
@@ -2,5 +2,5 @@ PROG=hpftodit$(EXEEXT)
 MAN1=hpftodit.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
-OBJS=hpftodit.o
+OBJS=hpftodit.$(OBJEXT)
 CCSRCS=$(srcdir)/hpftodit.cc
diff --git a/src/utils/indxbib/Makefile.sub b/src/utils/indxbib/Makefile.sub
index 057556e1..01e43b22 100644
--- a/src/utils/indxbib/Makefile.sub
+++ b/src/utils/indxbib/Makefile.sub
@@ -3,8 +3,8 @@ MAN1=indxbib.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=\
-  indxbib.o \
-  signal.o
+  indxbib.$(OBJEXT) \
+  signal.$(OBJEXT)
 CCSRCS=\
   $(srcdir)/indxbib.cc
 CSRCS=\
diff --git a/src/utils/lkbib/Makefile.sub b/src/utils/lkbib/Makefile.sub
index d9aadb75..899236ab 100644
--- a/src/utils/lkbib/Makefile.sub
+++ b/src/utils/lkbib/Makefile.sub
@@ -2,5 +2,5 @@ PROG=lkbib$(EXEEXT)
 MAN1=lkbib.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
-OBJS=lkbib.o
+OBJS=lkbib.$(OBJEXT)
 CCSRCS=$(srcdir)/lkbib.cc
diff --git a/src/utils/lookbib/Makefile.sub b/src/utils/lookbib/Makefile.sub
index ae2d4716..7a08f0ae 100644
--- a/src/utils/lookbib/Makefile.sub
+++ b/src/utils/lookbib/Makefile.sub
@@ -2,6 +2,6 @@ PROG=lookbib$(EXEEXT)
 MAN1=lookbib.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
-OBJS=lookbib.o
+OBJS=lookbib.$(OBJEXT)
 CCSRCS=$(srcdir)/lookbib.cc
 NAMEPREFIX=$(g)
diff --git a/src/utils/pfbtops/Makefile.sub b/src/utils/pfbtops/Makefile.sub
index f6fa93de..a8ed92a5 100644
--- a/src/utils/pfbtops/Makefile.sub
+++ b/src/utils/pfbtops/Makefile.sub
@@ -1,6 +1,6 @@
 PROG=pfbtops$(EXEEXT)
 MAN1=pfbtops.n
-OBJS=pfbtops.o
+OBJS=pfbtops.$(OBJEXT)
 CSRCS=$(srcdir)/pfbtops.c
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
diff --git a/src/utils/tfmtodit/Makefile.sub b/src/utils/tfmtodit/Makefile.sub
index c2e09ae1..ee56ce6e 100644
--- a/src/utils/tfmtodit/Makefile.sub
+++ b/src/utils/tfmtodit/Makefile.sub
@@ -2,5 +2,5 @@ PROG=tfmtodit$(EXEEXT)
 MAN1=tfmtodit.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
-OBJS=tfmtodit.o
+OBJS=tfmtodit.$(OBJEXT)
 CCSRCS=$(srcdir)/tfmtodit.cc