diff options
| author | Sascha Schumann <sas@php.net> | 1999-09-26 20:17:28 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-09-26 20:17:28 +0000 |
| commit | 96b6bdff278628821151f16f6f4e8ecec3cea228 (patch) | |
| tree | d0dc5102f70f2bfdffd47f0c6ad533751a9e5d56 /Makefile.in | |
| parent | 0ac169b4748deeedb8efa456f99df6869890540f (diff) | |
| download | php-git-96b6bdff278628821151f16f6f4e8ecec3cea228.tar.gz | |
Now thread safe version builds out of the box. libzend/TSRM
contain extra config scripts which pass the necessary libs back
to our Makefile.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 6991a8e8aa..4996baa3ec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,7 +36,8 @@ bindir = @bindir@ top_builddir = . ZEND_DIR = $(srcdir)/libzend -SUBDIRS=libzend ext @TSRM_DIR@ +TSRM_DIR = @TSRM_DIR@ +SUBDIRS=libzend ext $(TSRM_DIR) PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -92,8 +93,8 @@ maintainer-clean-depend-recursive: done && test -z "$$fail" # CGI binary or fhttpd module -php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ @TSRM_LIB@ - $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(LIBS) @TSRM_LIBS@ +php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ + $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(LIBS) # Apache modules libphp4.a libmodphp4.a: all-recursive $(OBJS) @REGEX_LIB@ @@ -115,8 +116,8 @@ libphp4.so: $(srcdir)/mod_php4.c libmodphp4-so.a @REGEX_LIB@ -@test -f ./mod_php4.c || test -h ./mod_php4.c || $(LN_S) $(srcdir)/mod_php4.c ./mod_php4.c $(APXS) $(INCLUDE) -c -o libphp4.so @VERSION_SCRIPT@ @RPATHS@ ./mod_php4.c libmodphp4-so.a $(APXS_LDFLAGS) $(APXS_EXP) -php4_aol.so: libmodphp4-so.a @TSRM_LIB@ - g++ $(LDFLAGS) -shared aolserver.o -o php4_aol.la libmodphp4-so.a $(LIBS) @TSRM_LIBS@ +php4_aol.so: libmodphp4-so.a + g++ $(LDFLAGS) -shared aolserver.o -o $@ libmodphp4-so.a $(LIBS) regex/libregex.a: (cd regex; $(MAKE) lib) |