httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/build rules.mk
Date Thu, 05 Oct 2000 17:28:48 GMT
rbb         00/10/05 10:28:47

  Modified:    src/main Makefile.in
               src/build rules.mk
  Log:
  Back out the build changes I added last night.  This was causing libtool
  commands to be sent to gcc.  It worked on some platforms, but not all of
  them.
  
  Revision  Changes    Path
  1.20      +0 -2      apache-2.0/src/main/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/Makefile.in,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Makefile.in	2000/10/05 05:42:06	1.19
  +++ Makefile.in	2000/10/05 17:28:43	1.20
  @@ -15,12 +15,10 @@
   
   gen_uri_delims_OBJECTS = gen_uri_delims.lo
   gen_uri_delims: $(gen_uri_delims_OBJECTS)
  -	$(BUILD_LINK) $(EXTRA_LDFLAGS) $(foreach f,$(gen_uri_delims_OBJECTS),build-$(f:.lo=.o))
$(EXTRA_LIBS)
   	$(LINK) $(EXTRA_LDFLAGS) $(gen_uri_delims_OBJECTS) $(EXTRA_LIBS)
   
   gen_test_char_OBJECTS = gen_test_char.lo util_debug.lo
   gen_test_char: $(gen_test_char_OBJECTS)
  -	$(BUILD_LINK) $(EXTRA_LDFLAGS) $(foreach f,$(gen_test_char_OBJECTS),build-$(f:.lo=.o))
$(EXTRA_LIBS)
   	$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
   
   $(gen_uri_delims_OBJECTS) $(gen_test_char_OBJECTS): %.lo: %.c
  
  
  
  1.27      +0 -8      apache-2.0/src/build/rules.mk
  
  Index: rules.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/rules.mk,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- rules.mk	2000/10/05 05:42:04	1.26
  +++ rules.mk	2000/10/05 17:28:45	1.27
  @@ -75,14 +75,6 @@
   
   # Cross compile commands
   
  -ifeq (,$(CC_FOR_BUILD))
  -CC_FOR_BUILD  = $(CC)
  -endif
  -
  -BUILD_COMPILE    = $(CC_FOR_BUILD) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
  -BUILD_LT_COMPILE = $(BUILD_COMPILE) -c $< -o build-$(@:.lo=.o)
  -BUILD_LINK       = $(BUILD_COMPILE) $(LTFLAGS) $(LDFLAGS) -o build-$@
  -
   # Helper programs
   
   SH_LIBTOOL = $(SHELL) $(top_builddir)/shlibtool --silent
  
  
  

Mime
View raw message