cvs commit: apache-1.3/src Makefile.tmpl
coar99/05/12 13:00:09 Modified:src Makefile.tmpl Log: .def isn't a universally-recognised suffix; versions of make that don't know about it will think .def.a is a target rather than a rule. Revision ChangesPath 1.112 +1 -0 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- Makefile.tmpl 1999/05/04 11:21:08 1.111 +++ Makefile.tmpl 1999/05/12 20:00:07 1.112 @@ -15,6 +15,7 @@ $(CC) -c $(INCLUDES) $(CFLAGS) $ # Used to generate import library for OS/2 +.SUFFIXES: .def .def.a: emximp -o $@ $
cvs commit: apache-1.3/src Makefile.tmpl
martin 99/03/16 13:37:03 Modified:src Makefile.tmpl Log: For the SHARED_CORE variant, it is recommended to add $(LIBS) to the linker line because since recently we reference libap.a which in turn might depend on other libraries. Revision ChangesPath 1.110 +2 -1 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- Makefile.tmpl 1999/03/10 11:06:07 1.109 +++ Makefile.tmpl 1999/03/16 21:37:02 1.110 @@ -35,7 +35,8 @@ target_shared: lib$(TARGET).ep $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \ - -o $(TARGET) -DSHARED_CORE_BOOTSTRAP main/http_main.c ap/libap.a + -o $(TARGET) -DSHARED_CORE_BOOTSTRAP main/http_main.c \ + ap/libap.a $(LIBS) lib$(TARGET).ep: lib$(TARGET).$(SHLIB_SUFFIX_NAME) $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
cvs commit: apache-1.3/src Makefile.tmpl
dgaudet 98/07/20 09:27:59 Modified:src Makefile.tmpl Log: fix parallel make, must recurse first Revision ChangesPath 1.102 +1 -1 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- Makefile.tmpl 1998/07/13 11:32:29 1.101 +++ Makefile.tmpl 1998/07/20 16:27:58 1.102 @@ -108,7 +108,7 @@ #Dependencies -$(OBJS): Makefile +$(OBJS): Makefile subdirs # DO NOT REMOVE buildmark.o: buildmark.c include/ap_config.h include/ap_config_auto.h \
cvs commit: apache-1.3/src Makefile.tmpl
rse 98/07/11 04:41:07 Modified:src Makefile.tmpl Log: Ops, we should remove conf_auto.h on make distclean, of course. Revision ChangesPath 1.99 +1 -0 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- Makefile.tmpl 1998/07/09 00:08:43 1.98 +++ Makefile.tmpl 1998/07/11 11:41:06 1.99 @@ -81,6 +81,7 @@ echo === $(SDP)$$i; \ done -rm -f include/ap_config.h + -rm -f include/conf_auto.h -rm -f modules.c -rm -f modules/Makefile -rm -f regex/Makefile
cvs commit: apache-1.3/src Makefile.tmpl
rse 98/05/21 23:56:57 Modified:src Makefile.tmpl Log: Add a dummy install target to the src/Makefile to give the user a hint when he tries to run make install at this level. Additionally do some cosmetics on the Configuration is older then Configuration.tmpl message. Revision ChangesPath 1.96 +8 -4 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- Makefile.tmpl 1998/05/12 12:13:51 1.95 +++ Makefile.tmpl 1998/05/22 06:56:56 1.96 @@ -17,10 +17,10 @@ all: @@Configuration@@ $(TARGET) @@Configuration@@: Configuration.tmpl - @echo @@Configuration@@ older than Configuration.tmpl, or doesn't exist. - @echo Consider copying Configuration.tmpl to @@Configuration@@, editing and rerunning - @echo Configure. - @echo If not, you will at least have to touch @@Configuration@@. + @echo ++ File '@@Configuration@@' older than 'Configuration.tmpl', + @echo ++ or still doesn't exist. Please consider copying 'Configuration.tmpl' + @echo ++ to '@@Configuration@@', editing and rerunning 'Configure'. + @echo ++ If not, you will at least have to touch '@@Configuration@@'. @false $(TARGET): $(SUBTARGET) @@ -86,6 +86,10 @@ -rm -f regex/Makefile -rm -f Makefile.config -rm -f Makefile + +install: + @echo ++ Sorry, no installation procedure available at this level. + @echo ++ Go to the parent directory for an 'install' target. # We really don't expect end users to use this rule. It works only with # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
cvs commit: apache-1.3/src Makefile.tmpl
rse 98/03/25 03:40:46 Modified:src Makefile.tmpl Log: Remove just some not needed whitespaces I've seen... Revision ChangesPath 1.86 +3 -3 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- Makefile.tmpl 1998/03/17 15:42:24 1.85 +++ Makefile.tmpl 1998/03/25 11:40:46 1.86 @@ -23,7 +23,7 @@ @echo If not, you will at least have to touch @@Configuration@@. @false -$(TARGET): subdirs modules.o +$(TARGET): subdirs modules.o $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) buildmark.c $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) -o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(LIBS) @@ -67,7 +67,7 @@ # httpd binary with all modules built in and then updates the # $(INCDIR)/hide.h file according to the exported symbols of this # binary. So run this target once after a new function was added -# to the source. But never trust this operation. You really +# to the source. But never trust this operation. You really # have to review the changes manually afterwards. updatehide: cat Configuration.tmpl |\ @@ -77,7 +77,7 @@ ./Configure -file Configuration.for-hide $(MAKE) clean httpd ./helpers/UpdateHide httpd $(INCDIR)/hide.h `helpers/GuessOS` - $(MAKE) clean + $(MAKE) clean rm -f Configuration.for-hide #Dependencies
cvs commit: apache-1.3/src Makefile.tmpl
rse 98/03/03 05:47:44 Modified:src/include hide.h src/helpers UpdateHide src Makefile.tmpl Log: Made the generation of src/include/hide.h more robust and complete and commit an updated version of this header file. Revision ChangesPath 1.2 +3 -11 apache-1.3/src/include/hide.h Index: hide.h === RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hide.h1998/02/28 15:39:32 1.1 +++ hide.h1998/03/03 13:47:41 1.2 @@ -76,8 +76,6 @@ #define daemons_max_free AP_daemons_max_free #define daemons_min_free AP_daemons_min_free #define daemons_to_start AP_daemons_to_start -#define endAP_end -#define environAP_environ #define excess_requests_per_child AP_excess_requests_per_child #define group_id AP_group_id #define jmpbuffer AP_jmpbuffer @@ -129,7 +127,6 @@ #define digest_module AP_digest_module #define dir_module AP_dir_module #define dummy_mutexAP_dummy_mutex -#define edata AP_edata #define env_module AP_env_module #define example_cmds AP_example_cmds #define example_handlers AP_example_handlers @@ -231,7 +228,6 @@ #define check_alarmAP_check_alarm #define check_auth AP_check_auth #define check_cmd_context AP_check_cmd_context -#define check_fulluri AP_check_fulluri #define check_serverpath AP_check_serverpath #define check_symlinks AP_check_symlinks #define check_user_id AP_check_user_id @@ -265,6 +261,7 @@ #define create_request_config AP_create_request_config #define create_server_config AP_create_server_config #define default_handlerAP_default_handler +#define default_port_for_request AP_default_port_for_request #define default_port_for_schemeAP_default_port_for_scheme #define default_type AP_default_type #define destroy_pool AP_destroy_pool @@ -274,10 +271,6 @@ #define directory_walk AP_directory_walk #define dirsection AP_dirsection #define discard_request_body AP_discard_request_body -#define dlcloseAP_dlclose -#define dlerrorAP_dlerror -#define dlopen AP_dlopen -#define dlsym AP_dlsym #define do_nothing AP_do_nothing #define document_root AP_document_root #define each_byterange AP_each_byterange @@ -287,7 +280,6 @@ #define escape_htmlAP_escape_html #define escape_path_segmentAP_escape_path_segment #define escape_shell_cmd AP_escape_shell_cmd -#define etext AP_etext #define exists_scoreboard_imageAP_exists_scoreboard_image #define file_walk AP_file_walk #define filesectionAP_filesection @@ -379,6 +371,7 @@ #define make_sub_request AP_make_sub_request #define make_table AP_make_table #define malloc_block AP_malloc_block +#define matches_request_vhost AP_matches_request_vhost #define meets_conditions AP_meets_conditions #define merge_core_dir_configs AP_merge_core_dir_configs #define merge_core_server_configs AP_merge_core_server_configs @@ -407,7 +400,6 @@ #define parse_htaccess AP_parse_htaccess #define parse_uri AP_parse_uri #define parse_uri_components AP_parse_uri_components -#define parse_uri_components_regex AP_parse_uri_components_regex #define parse_vhost_addrs AP_parse_vhost_addrs #define pcallocAP_pcalloc #define pcfg_open_custom AP_pcfg_open_custom @@ -554,6 +546,7 @@ #define set_pidfileAP_set_pidfile #define set_scoreboard AP_set_scoreboard #define set_send_buffer_size AP_set_send_buffer_size +#define set_server_alias AP_set_server_alias #define set_server_limit AP_set_server_limit #define set_server_rootAP_set_server_root #define set_server_string_slot AP_set_server_string_slot @@ -580,7 +573,6 @@ #define spawn_child_err_buff AP_spawn_child_err_buff #define
cvs commit: apache-1.3/src Makefile.tmpl
dgaudet 98/03/01 23:07:17 Modified:src Makefile.tmpl Log: some garbage that crept in Revision ChangesPath 1.82 +0 -2 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- Makefile.tmpl 1998/03/02 07:05:53 1.81 +++ Makefile.tmpl 1998/03/02 07:07:16 1.82 @@ -87,5 +87,3 @@ modules.o: modules.c $(INCDIR)/httpd.h $(INCDIR)/conf.h os/unix/os.h \ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h -t.o: t.c -tt.o: tt.c
cvs commit: apache-1.3/src Makefile.tmpl
rse 98/02/18 00:50:59 Modified:src Makefile.tmpl Log: - also remove backup files (*.bak) on clean target - remove the (for a long-time) obsolete dist.tar target because we already use the step-by-step document for building releases and this particular dist.tar target is at least broken because of the changed subdir/files tree Revision ChangesPath 1.77 +1 -8 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- Makefile.tmpl 1998/02/12 10:15:16 1.76 +++ Makefile.tmpl 1998/02/18 08:50:58 1.77 @@ -42,17 +42,10 @@ cd support; $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' clean: - rm -f $(TARGET) *.o + rm -f $(TARGET) *.o *.bak for i in $(SUBDIRS); do \ ( cd $$i $(MAKE) $@ ) || exit 1; \ done - -dist.tar: - # Assure a semi-sensible configuration going out... - cp Makefile.orig Makefile - cp modules.c.orig modules.c - tar cvf dist.tar README INSTALL CHANGES TODO API.html \ - Configuration Configure Makefile.tmpl Makefile *.h *.c # We really don't expect end users to use this rule. It works only with # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
cvs commit: apache-1.3/src Makefile.tmpl
pcs 98/02/04 05:32:27 Modified:src Makefile.tmpl Log: Forgot to commit this part of the patch to add SharedModule support to Configure. This updates the top-level Makefile to add any link flags required to export global (API) functions. Revision ChangesPath 1.75 +1 -1 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- Makefile.tmpl 1998/02/01 15:56:14 1.74 +++ Makefile.tmpl 1998/02/04 13:32:26 1.75 @@ -29,7 +29,7 @@ $(TARGET): subdirs modules.o $(CC) -c $(CFLAGS) buildmark.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) -o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(LIBS) subdirs: for i in $(SUBDIRS); do \
