add user sms to system:administrators before attempting to do lists

[moira.git] / util / imake.includes / Imake.rules

diff --git a/util/imake.includes/Imake.rules b/util/imake.includes/Imake.rules
index d54f4a3df728877879572d7663066ad594a2e3c8..da30aa774b3a78a3f26afbdcfe85f3bc72362308 100644 (file)
--- a/util/imake.includes/Imake.rules
+++ b/util/imake.includes/Imake.rules
@@ -58,17 +58,21 @@ all:: concat3(lib,libname,.a) concat3(lib,libname,_p.a)                     @@\
 all:: concat3(llib-l,libname,.ln)                                      @@\
                                                                        @@\
 concat3(lib,libname,.a): objs                                          @@\
+       $(RM) $@.bak                                                    @@\
+       -$(MV) $@ $@.bak                                                @@\
        $(ARCHIVE) $@ objs                                              @@\
        $(RANLIB) $@                                                    @@\
                                                                        @@\
 concat3(lib,libname,_p.a): objs                                                @@\
+       $(RM) $@.bak                                                    @@\
+       -$(MV) $@ $@.bak                                                @@\
        cd profiled; $(ARCHIVE) ../$@ objs                              @@\
        $(RANLIB) $@                                                    @@\
                                                                        @@\
 lint:: concat3(llib-l,libname,.ln)                                     @@\
                                                                        @@\
 concat3(llib-l,libname,.ln): srcs                                      @@\
-       $(LINT) concat(-C,libname) $(LINTFLAGS) srcs lintlibs           @@\
+       $(LINT) concat($(LINTLIBFLAG),libname) $(LINTFLAGS) srcs lintlibs               @@\
                                                                        @@\
 clean::                                                                @@\
        $(RM) concat3(lib,libname,.a) concat3(lib,libname,_p.a)         @@\
@@ -90,11 +94,18 @@ install::                                                           @@\
  * Rule for building objects in libraries.
  */
 
+#ifdef DEBUG_LIBS
+/* When debugging, leave symbols alone (don't do LD) */
+#define library_obj_rule()                                             @@\
+.c.o:                                                                  @@\
+       $(CC) -c $(CFLAGS) $*.c
+#else
 #define library_obj_rule()                                             @@\
 .c.o:                                                                  @@\
        $(CC) -c $(CFLAGS) $*.c                                         @@\
        -$(LD) -x -r -o a.out $*.o                                      @@\
        $(MV) a.out $*.o
+#endif
 
 #define library_ro_object(cfile)                                       @@\
 concat(cfile,.o): concat(cfile,.c)                                     @@\
@@ -114,13 +125,15 @@ all:: concat3(lib,libname,.a)                                             @@\
 all:: concat3(llib-l,libname,.ln)                                      @@\
                                                                        @@\
 concat3(lib,libname,.a): objs                                          @@\
+       $(RM) $@.bak                                                    @@\
+       -$(MV) $@ $@.bak                                                @@\
        $(ARCHIVE) $@ objs                                              @@\
        $(RANLIB) $@                                                    @@\
                                                                        @@\
 lint:: concat3(llib-l,libname,.ln)                                     @@\
                                                                        @@\
 concat3(llib-l,libname,.ln): srcs                                      @@\
-       $(LINT) concat(-C,libname) $(LINTFLAGS) srcs lintlibs           @@\
+       $(LINT) concat($(LINTLIBFLAG),libname) $(LINTFLAGS) srcs lintlibs               @@\
                                                                        @@\
 clean::                                                                @@\
        $(RM) concat3(lib,libname,.a)                                   @@\
@@ -360,7 +373,7 @@ install:: page                                                              @@\
 #define        depend_target()                                                 @@\
 depend:: $(SRCS)                                                       @@\
        @echo "### Now computing dependencies"                          @@\
-       @$(DEPEND) -s "# DO NOT DELETE" $(CFLAGS) $(SRCS)               @@\
+       @$(DEPEND) -s "# DO NOT DELETE" -- $(CFLAGS) -- $(SRCS)         @@\
 
 #define clean_target()                                                 @@\
 clean::                                                                        @@\