diff options
| author | Marko Karppinen <markonen@php.net> | 2002-08-06 17:51:24 +0000 |
|---|---|---|
| committer | Marko Karppinen <markonen@php.net> | 2002-08-06 17:51:24 +0000 |
| commit | 6d80c191bb99377f0c8ea3f63c31a1a3c6495d04 (patch) | |
| tree | 8ac3ac8ff5a38b002b8fcede55269373f52640cd /Makefile.global | |
| parent | d5ec9a9886f5b7e867f0bbadee0ff2f026004d95 (diff) | |
| download | php-git-6d80c191bb99377f0c8ea3f63c31a1a3c6495d04.tar.gz | |
The link lines don't need any of $DEFS, $INCLUDES, $EXTRA_INCLUDES or
$CPPFLAGS, right? Removed them. Added frameworks to $COMMON_FLAGS.
Diffstat (limited to 'Makefile.global')
| -rw-r--r-- | Makefile.global | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global index f159e3e2cd..ecdbb474c4 100644 --- a/Makefile.global +++ b/Makefile.global @@ -3,7 +3,7 @@ INSTALL = $(top_srcdir)/build/shtool install -c INSTALL_DATA = $(INSTALL) -m 644 DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir) -COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) +COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKS) all: $(all_targets) @@ -11,7 +11,7 @@ all: $(all_targets) build-modules: $(PHP_MODULES) libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) - $(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so |