use new SpecialCObjectRule

7 files changed, 22 insertions, 32 deletions

diff --git a/xc/programs/Xserver/dix/Imakefile b/xc/programs/Xserver/dix/Imakefile
index a4cc8ea17..5431c9c9f 100644
--- a/xc/programs/Xserver/dix/Imakefile
+++ b/xc/programs/Xserver/dix/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.37 91/07/16 22:54:10 gildea Exp $
 #include <Server.tmpl>
 
 SRCS = atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c events.c \
@@ -48,11 +48,6 @@ NormalLibraryTarget(dix,$(OBJS))
 LintLibraryTarget(dix,$(SRCS))
 NormalLintTarget($(SRCS))
 
-SpecialObjectRule(globals.o, $(ICONFIGFILES), $(SITE_DEFINES))
-
-#if HasSaberC
-saber_src:
-	XCOMM load $(CFLAGS) $(SITE_DEFINES) $(SRCS)
-#endif
+SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES))
 
 DependTarget()
diff --git a/xc/programs/Xserver/mi/Imakefile b/xc/programs/Xserver/mi/Imakefile
index da2ec4e12..234c2ed7f 100644
--- a/xc/programs/Xserver/mi/Imakefile
+++ b/xc/programs/Xserver/mi/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 5.15 91/07/16 22:51:30 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 5.16 91/07/23 15:19:39 keith Exp $
 #include <Server.tmpl>
 
 SRCS =  mivaltree.c mipolyseg.c mipolyrect.c \
@@ -31,11 +31,6 @@ NormalLintTarget($(SRCS))
 
 all:: cbrt.o
 
-SpecialObjectRule(miinitext.o, $(ICONFIGFILES), NullParameter)
-
-#if HasSaberC
-saber_src:
-	XCOMM load $(CFLAGS) $(SRCS)
-#endif
+SpecialCObjectRule(miinitext,$(ICONFIGFILES),NullParameter)
 
 DependTarget()
diff --git a/xc/programs/Xserver/os/Imakefile b/xc/programs/Xserver/os/Imakefile
index c954215d9..aae13dec4 100644
--- a/xc/programs/Xserver/os/Imakefile
+++ b/xc/programs/Xserver/os/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.51 92/03/13 16:07:24 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.52 92/05/22 11:51:32 rws Exp $
 #include <Server.tmpl>
 
 #if (SystemV || SystemV4) && !HasSockets
@@ -135,16 +135,16 @@ alloca.o:  $(PWLIB)
 	ar x $(PWLIB) alloca.o
 #endif /* NEED_ALLOCA_FROM_LIBPW */
 
-SpecialObjectRule(osinit.o,$(ICONFIGFILES),$(ADM_DEFINES))
-SpecialObjectRule(WaitFor.o,$(ICONFIGFILES),$(EXT_DEFINES))
-SpecialObjectRule(fonttype.o,$(ICONFIGFILES),$(FONT_DEFINES))
-SpecialObjectRule(utils.o,$(ICONFIGFILES),$(TIME_DEFINES))
+SpecialCObjectRule(osinit,$(ICONFIGFILES),$(ADM_DEFINES))
+SpecialCObjectRule(WaitFor,$(ICONFIGFILES),$(EXT_DEFINES))
+SpecialCObjectRule(fonttype,$(ICONFIGFILES),$(FONT_DEFINES))
+SpecialCObjectRule(utils,$(ICONFIGFILES),$(TIME_DEFINES))
 #if defined(SparcArchitecture) && HasGcc && !HasGcc2
 oscolor.o: $(ICONFIGFILES)
 	$(RM) $@
 	cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
 #else
-SpecialObjectRule(oscolor.o,$(ICONFIGFILES),$(DBM_DEFINES))
+SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
 #endif
 
 #if HasSaberC
diff --git a/xc/programs/rgb/Imakefile b/xc/programs/rgb/Imakefile
index b458290d5..e58cc8b0d 100644
--- a/xc/programs/rgb/Imakefile
+++ b/xc/programs/rgb/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.23 91/09/09 16:09:09 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.24 92/05/22 11:50:50 rws Exp $
         RGB_DB = DefaultRGBDatabase
    SITE_RGB_DB = -DRGB_DB=\"$(RGB_DB)\"
       DEPLIBS = 
@@ -30,8 +30,8 @@ all:: $(PROGRAMS) $(DATADEP)
 
 SingleProgramTarget(rgb,$(OBJS1),NullParameter,$(DBMLIB))
 SingleProgramTarget(showrgb,$(OBJS2),NullParameter,$(DBMLIB))
-SpecialObjectRule(rgb.o,$(ICONFIGFILES),$(_NOOP_))
-SpecialObjectRule(showrgb.o,$(ICONFIGFILES),$(_NOOP_))
+SpecialCObjectRule(rgb,$(ICONFIGFILES),$(_NOOP_))
+SpecialCObjectRule(showrgb,$(ICONFIGFILES),$(_NOOP_))
 InstallMultiple($(DATAFILES) rgb.txt,$(LIBDIR))
 InstallProgramWithFlags(showrgb,$(BINDIR),)
 InstallManPage(showrgb,$(MANDIR))
diff --git a/xc/programs/twm/Imakefile b/xc/programs/twm/Imakefile
index 3ebe6bb78..53597430b 100644
--- a/xc/programs/twm/Imakefile
+++ b/xc/programs/twm/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.33 91/07/17 00:48:06 gildea Exp $
 XCOMM
 XCOMM Here is an Imakefile for twm.  It depends on having TWMDIR defined
 XCOMM in Imake.tmpl.  I like to use Imakefiles for everything, and I am sure
@@ -22,9 +22,9 @@ LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XLIB)
 
 AllTarget(twm)
 
-SpecialObjectRule(parse.o,NullParameter,'-DSYSTEM_INIT_FILE="'$(TWMDIR)'/system.twmrc"')
+SpecialCObjectRule(parse,NullParameter,'-DSYSTEM_INIT_FILE="'$(TWMDIR)'/system.twmrc"')
 #if !HasPutenv
-SpecialObjectRule(util.o,NullParameter,-DNOPUTENV)
+SpecialCObjectRule(util,NullParameter,-DNOPUTENV)
 #endif
 
 depend:: lex.c gram.c deftwmrc.c 
diff --git a/xc/programs/xdm/Imakefile b/xc/programs/xdm/Imakefile
index 62d7d94c3..cfc326b0f 100644
--- a/xc/programs/xdm/Imakefile
+++ b/xc/programs/xdm/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.58 91/08/22 14:24:45 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.59 92/04/15 10:44:36 rws Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
 
@@ -97,7 +97,7 @@ InstallProgram(chooser,$(XDMDIR))
 InstallAppDefaults(Chooser)
 #endif
 
-SpecialObjectRule(resource.o, $(ICONFIGFILES), $(RES_DEFINES))
+SpecialCObjectRule(resource, $(ICONFIGFILES), $(RES_DEFINES))
 
 XCOMM these files depend on HASXDMAUTH
 auth.o policy.o: $(ICONFIGFILES)
diff --git a/xc/programs/xterm/Imakefile b/xc/programs/xterm/Imakefile
index ef373c4cd..746a5c5a7 100644
--- a/xc/programs/xterm/Imakefile
+++ b/xc/programs/xterm/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.55 91/09/22 11:40:47 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.56 92/03/11 17:35:22 gildea Exp $
 XCOMM
 XCOMM                         Attention xterm porters
 XCOMM
@@ -59,9 +59,9 @@ XCOMM
 
 AllTarget($(PROGRAMS))
 
-SpecialObjectRule(main.o,NullParameter,$(MAIN_DEFINES))
-SpecialObjectRule(misc.o,NullParameter,$(MISC_DEFINES))
-SpecialObjectRule(charproc.o,NullParameter,$(MISC_DEFINES))
+SpecialCObjectRule(main,NullParameter,$(MAIN_DEFINES))
+SpecialCObjectRule(misc,NullParameter,$(MISC_DEFINES))
+SpecialCObjectRule(charproc,NullParameter,$(MISC_DEFINES))
 
 #if InstallXtermSetUID
 SetUIDProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),XawClientLibs,$(TERMCAPLIB) $(PTYLIB))