cvs: /php4 .cvsignore Makefile.am /php4/regex .cvsignore regex.h

sas Tue Oct 5 07:01:19 1999 EDT Modified files: /php4 .cvsignore Makefile.am /php4/regex .cvsignore regex.h Log: * Get rid of libphp_util.la * Don't build CGI from convenience library * Add additional checks to regex.h (Apache build broke) Index: php4/.cvsignore diff -u php4/.cvsignore:1.14 php4/.cvsignore:1.15 --- php4/.cvsignore:1.14 Mon Oct 4 11:17:59 1999 +++ php4/.cvsignore Tue Oct 5 07:00:47 1999 @@ -1,4 +1,5 @@ Makefile +Makefile.in acconfig.h aclocal.m4 build-defs.h Index: php4/Makefile.am diff -u php4/Makefile.am:1.2 php4/Makefile.am:1.3 --- php4/Makefile.am:1.2 Mon Oct 4 13:18:17 1999 +++ php4/Makefile.am Tue Oct 5 07:00:47 1999 @@ -7,18 +7,18 @@ BUILDLDFLAGS = $(EXTRA_LDFLAGS) $(LDFLAGS) -noinst_LTLIBRARIES = libphp_util.la -libphp_util_la_SOURCES = \ +phptemp_LTLIBRARIES = libphp4.la +libphp4_la_SOURCES = \ main.c internal_functions.c snprintf.c php3_sprintf.c \ configuration-parser.y configuration-scanner.l request_info.c \ safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \ php_ini.c SAPI.c rfc1867.c dlist.c php_content_types.c strlcpy.c \ strlcat.c -libphp_util_la_LIBADD = libzend/libzend.la \ +libphp4_la_LIBADD = libzend/libzend.la \ sapi/$(PHP_SAPI)/libphpsapi_$(PHP_SAPI).la \ - regex/libregex.la $(EXT_LTLIBS) $(TSRM_LIB) - + regex/libregex.la $(EXT_LTLIBS) $(TSRM_LIB) $(EXTRA_LIBS) +libphp4_la_LDFLAGS = -avoid-version $(BUILDLDFLAGS) $(PHP_RPATHS) configuration-parser.h configuration-parser.c: configuration-parser.y $(YACC) -p cfg -v -d $< -o configuration-parser.c @@ -28,15 +28,10 @@ EXTRA_PROGRAMS = php -phptemp_LTLIBRARIES = libphp4.la -libphp4_la_SOURCES = stub.c -libphp4_la_LIBADD = libphp_util.la $(EXTRA_LIBS) -libphp4_la_LDFLAGS = -module -avoid-version $(BUILDLDFLAGS) $(NATIVE_RPATHS) - noinst_PROGRAMS = $(PHP_PROGRAM) php_SOURCES = stub.c -php_LDADD = libphp_util.la $(EXTRA_LIBS) -php_LDFLAGS = -export-dynamic $(BUILDLDFLAGS) $(PHP_RPATHS) +php_LDADD = libphp4.la +php_LDFLAGS = -export-dynamic install-data-local: $(INSTALL_IT) Index: php4/regex/.cvsignore diff -u php4/regex/.cvsignore:1.1 php4/regex/.cvsignore:1.2 --- php4/regex/.cvsignore:1.1 Wed Apr 7 20:04:44 1999 +++ php4/regex/.cvsignore Tue Oct 5 07:00:48 1999 @@ -1 +1,2 @@ Makefile +Makefile.in Index: php4/regex/regex.h diff -u php4/regex/regex.h:1.3 php4/regex/regex.h:1.4 --- php4/regex/regex.h:1.3 Tue Oct 5 03:00:10 1999 +++ php4/regex/regex.h Tue Oct 5 07:00:48 1999 @@ -1,3 +1,5 @@ +#ifndef _REGEX_H_ +#define _REGEX_H_ #ifndef _REGEX_H #define _REGEX_H /* never again */ /* ========= begin header generated by ././mkh ========= */ @@ -76,4 +78,5 @@ } #endif /* ========= end header generated by ././mkh ========= */ +#endif #endif