httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/support Makefile.in
Date Mon, 13 May 2002 07:45:16 GMT
jerenkrantz    02/05/13 00:45:16

  Modified:    .        Makefile.in
               support  Makefile.in
  Log:
  Considering the overall goal of making APR and APR-util being used
  out-of-tree, AP_LIBS can not be a PROGRAM_DEPENDENCY, but just a library
  that we link against - therefore, it belongs under PROGRAM_LDADD.
  
  (A program dependency implies that we can build it - that will not
  always be the case with APR and APR-util.)
  
  Revision  Changes    Path
  1.112     +2 -3      httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- Makefile.in	13 May 2002 05:49:50 -0000	1.111
  +++ Makefile.in	13 May 2002 07:45:15 -0000	1.112
  @@ -5,13 +5,12 @@
   PROGRAM_NAME         = $(progname)
   PROGRAM_SOURCES      = modules.c
   PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(HTTPD_LDFLAGS) \
  -                       $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
  +                       $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
   PROGRAM_DEPENDENCIES = \
     $(BUILTIN_LIBS) \
     $(MPM_LIB) \
     server/libmain.la \
  -  os/$(OS_DIR)/libos.la \
  -  $(AP_LIBS)
  +  os/$(OS_DIR)/libos.la
   
   PROGRAMS        = $(PROGRAM_NAME)
   TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
  
  
  
  1.34      +2 -4      httpd-2.0/support/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Makefile.in	25 Mar 2002 09:50:41 -0000	1.33
  +++ Makefile.in	13 May 2002 07:45:16 -0000	1.34
  @@ -4,10 +4,8 @@
   PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm
   TARGETS  = $(PROGRAMS)
   
  -PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
  -PROGRAM_DEPENDENCIES = \
  -	$(top_builddir)/srclib/apr-util/libaprutil.la \
  -	$(top_builddir)/srclib/apr/libapr.la
  +PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
$(AP_LIBS)
  +PROGRAM_DEPENDENCIES = 
   
   include $(top_builddir)/build/rules.mk
   
  
  
  

Mime
View raw message