rse         98/03/13 04:44:47

  Modified:    src/main Makefile.tmpl
               src/ap   Makefile.tmpl
  Log:
  Make sure definitions are not in the middle of the target section (which
  confuses some Make variants) and slightly sort the objects file list for
  cosmetic issues.
  
  Revision  Changes    Path
  1.17      +7 -6      apache-1.3/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Makefile.tmpl     1998/03/02 07:05:55     1.16
  +++ Makefile.tmpl     1998/03/13 12:44:46     1.17
  @@ -9,15 +9,16 @@
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
   INCDIR=../include
   
  -OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
  -  http_log.o http_protocol.o rfc1413.o util.o util_script.o buff.o \
  -  md5c.o util_md5.o http_bprintf.o util_date.o util_uri.o \
  -  fnmatch.o http_vhost.o
  +LIB=  libmain.a
  +
  +OBJS= alloc.o buff.o \
  +      http_bprintf.o http_config.o http_core.o http_log.o \
  +      http_main.o http_protocol.o http_request.o http_vhost.o \
  +      util.o util_date.o util_script.o util_uri.o util_md5.o \
  +      md5c.o rfc1413.o fnmatch.o
   
   .c.o:
        $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
  -
  -LIB= libmain.a
   
   all: $(LIB)
   
  
  
  
  1.15      +2 -2      apache-1.3/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Makefile.tmpl     1998/02/28 10:31:54     1.14
  +++ Makefile.tmpl     1998/03/13 12:44:47     1.15
  @@ -6,8 +6,8 @@
   
   LIB=libap.a
   
  -OBJS=ap_signal.o ap_slack.o ap_snprintf.o ap_strings.o ap_cpystrn.o \
  -     ap_execve.o
  +OBJS=ap_execve.o ap_cpystrn.o ap_signal.o \
  +     ap_slack.o ap_snprintf.o ap_strings.o
   
   .c.o:
        $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
  
  
  

Reply via email to