cvs commit: apache-2.0/src Makefile.am
manoj 99/12/19 21:54:35 Modified:src Makefile.am Log: Add a comment to explain what the build-buildmark target is all about. Revision ChangesPath 1.5 +1 -1 apache-2.0/src/Makefile.am Index: Makefile.am === RCS file: /home/cvs/apache-2.0/src/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -u -r1.4 -r1.5 --- Makefile.am 1999/12/20 04:43:28 1.4 +++ Makefile.am 1999/12/20 05:54:35 1.5 @@ -14,6 +14,6 @@ apache_LDADD = $(apache_DEPENDENCIES) $(EXTRA_LIBS) +# Force buildmark to be rebuilt for every compile buildmark.o: build-buildmark - build-buildmark:
cvs commit: apache-2.0/src Makefile.am
manoj 99/12/19 20:43:29 Modified:src Makefile.am Log: buildmark.o was getting built twice; I used the wrong solution for forcing it to be built for every compile. This works better. Revision ChangesPath 1.4 +2 -4 apache-2.0/src/Makefile.am Index: Makefile.am === RCS file: /home/cvs/apache-2.0/src/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -u -r1.3 -r1.4 --- Makefile.am 1999/12/20 04:15:07 1.3 +++ Makefile.am 1999/12/20 04:43:28 1.4 @@ -2,7 +2,7 @@ SUBDIRS=ap lib main modules os $(REGEX_DIR) bin_PROGRAMS = apache -apache_SOURCES = modules.c +apache_SOURCES = modules.c buildmark.c apache_DEPENDENCIES = \ $(MOD_LTLIBS) \ $(MPM_LIB) \ @@ -10,12 +10,10 @@ $(OS_DIR)/libos.la \ ap/libap.la \ lib/apr/libapr.a \ - $(REGEX_LIB) \ - buildmark.o + $(REGEX_LIB) apache_LDADD = $(apache_DEPENDENCIES) $(EXTRA_LIBS) buildmark.o: build-buildmark build-buildmark: - $(COMPILE) -c buildmark.c
cvs commit: apache-2.0/src Makefile.am configure.in
manoj 99/12/19 20:15:10 Modified:src Makefile.am configure.in Log: Make building a little easier by not requiring a separate make of APR. Revision ChangesPath 1.3 +1 -1 apache-2.0/src/Makefile.am Index: Makefile.am === RCS file: /home/cvs/apache-2.0/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -u -r1.2 -r1.3 --- Makefile.am 1999/12/01 05:39:16 1.2 +++ Makefile.am 1999/12/20 04:15:07 1.3 @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS=ap main modules os $(REGEX_DIR) +SUBDIRS=ap lib main modules os $(REGEX_DIR) bin_PROGRAMS = apache apache_SOURCES = modules.c 1.12 +1 -1 apache-2.0/src/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -u -r1.11 -r1.12 --- configure.in 1999/12/20 03:09:43 1.11 +++ configure.in 1999/12/20 04:15:08 1.12 @@ -127,5 +127,5 @@ dnl ## Build modules.c rm -f $srcdir/modules.c echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $srcdir/modules.c -AC_OUTPUT([Makefile ap/Makefile main/Makefile modules/Makefile +AC_OUTPUT([Makefile ap/Makefile lib/Makefile main/Makefile modules/Makefile modules/standard/Makefile os/Makefile $APACHE_OUTPUT_FILES])
cvs commit: apache-2.0/src Makefile.am
manoj 99/11/30 21:39:16 Modified:src Makefile.am Log: Force buildmark.c to be rebuilt for every Apache compile, as is done with the 1.3 configuration system. Revision ChangesPath 1.2 +7 -2 apache-2.0/src/Makefile.am Index: Makefile.am === RCS file: /home/cvs/apache-2.0/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -u -r1.1 -r1.2 --- Makefile.am 1999/11/29 23:44:35 1.1 +++ Makefile.am 1999/12/01 05:39:16 1.2 @@ -2,7 +2,7 @@ SUBDIRS=ap main modules os $(REGEX_DIR) bin_PROGRAMS = apache -apache_SOURCES = modules.c buildmark.c +apache_SOURCES = modules.c apache_DEPENDENCIES = \ $(MOD_LTLIBS) \ $(MPM_LIB) \ @@ -10,7 +10,12 @@ $(OS_DIR)/libos.la \ ap/libap.la \ lib/apr/libapr.a \ - $(REGEX_LIB) + $(REGEX_LIB) \ + buildmark.o apache_LDADD = $(apache_DEPENDENCIES) $(EXTRA_LIBS) +buildmark.o: build-buildmark + +build-buildmark: + $(COMPILE) -c buildmark.c
