diff options
| author | foobar <sniper@php.net> | 2002-04-23 02:58:54 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-04-23 02:58:54 +0000 |
| commit | eb18c5c38c9335f48a30aa856aa97ff285dd6aef (patch) | |
| tree | 40f0af33266a4fcb38ac62ec6fe10f4aa869eac2 /sapi/apache/apMakefile.tmpl | |
| parent | 50f91c18fb2002e66d3e1fb603320a0ce1d43ade (diff) | |
| download | php-git-eb18c5c38c9335f48a30aa856aa97ff285dd6aef.tar.gz | |
Part 3 of static apache build fixes:
- Use the PHP_CFLAGS when compiling the php4 module in apache tree.
- Use the apache include dir only when compiling sapi/apache
o Fixes the fnmatch.h issue Wez complained about :)
Diffstat (limited to 'sapi/apache/apMakefile.tmpl')
| -rw-r--r-- | sapi/apache/apMakefile.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/apache/apMakefile.tmpl b/sapi/apache/apMakefile.tmpl index f77b9975ba..80fe346561 100644 --- a/sapi/apache/apMakefile.tmpl +++ b/sapi/apache/apMakefile.tmpl @@ -34,7 +34,7 @@ libphp4.: $(OBJS) $(OBJS_LIB) # build the shared object library by linking the object files libphp4.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB) rm -f $@ - $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(SHLIB_OBJS) $(SHLIB_OBJS_LIB) $(LIBS) + $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(SHLIB_OBJS) $(SHLIB_OBJS_LIB) $(LIBS) $(PHP_LIBS) # 1. extension .o for shared objects cannot be used here because # first these files aren't still shared objects and second we @@ -45,9 +45,9 @@ libphp4.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB) # extension .so-o .SUFFIXES: .o .so-o .c.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(SPACER) $< + $(CC) -c $(INCLUDES) $(CFLAGS) $(PHP_CFLAGS) $(CPPFLAGS) $(SPACER) $< .c.so-o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(CPPFLAGS) $(SPACER) $< && mv $*.o $*.so-o + $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(PHP_CFLAGS) $(CPPFLAGS) $(SPACER) $< && mv $*.o $*.so-o # cleanup clean: @@ -59,7 +59,7 @@ clean: depend: cp Makefile.tmpl Makefile.tmpl.bak \ && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \ - && gcc -MM $(INCLUDES) $(CFLAGS) $(CPPFLAGS) *.c >> Makefile.new \ + && gcc -MM $(INCLUDES) $(CFLAGS) $(PHP_CFLAGS) $(CPPFLAGS) *.c >> Makefile.new \ && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \ > Makefile.tmpl \ && rm Makefile.new |