diff options
| author | Sascha Schumann <sas@php.net> | 2001-09-10 17:15:03 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-09-10 17:15:03 +0000 |
| commit | 2547f86060a602b0efaf3b883ea0e7ccd1a2c9b4 (patch) | |
| tree | 98c16f732777b55b2fa1cbcf0d305f2c0eafaca0 | |
| parent | a4f9a162252f7a09a3e745f735bce1c645190d50 (diff) | |
| download | php-git-2547f86060a602b0efaf3b883ea0e7ccd1a2c9b4.tar.gz | |
Use $(LINK) for libraries, but $(LINK_CLEAN) for creating programs.
Also pass only $(CFLAGS_CLEAN) into thttpd's Makefile.
| -rw-r--r-- | build/library.mk | 2 | ||||
| -rw-r--r-- | sapi/thttpd/config.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/library.mk b/build/library.mk index 06b885b2bf..8cb86760e4 100644 --- a/build/library.mk +++ b/build/library.mk @@ -20,4 +20,4 @@ LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X) $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES) - $(LINK_CLEAN) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) + $(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4 index e7252332c2..a96c5299fc 100644 --- a/sapi/thttpd/config.m4 +++ b/sapi/thttpd/config.m4 @@ -7,7 +7,7 @@ AC_ARG_WITH(thttpd, INSTALL_IT="\ echo 'PHP_LIBS = -L. -lphp4 \$(PHP_LIBS) \$(EXTRA_LIBS)' > $THTTPD/php_makefile; \ echo 'PHP_LDFLAGS = \$(NATIVE_RPATHS) \$(PHP_LDFLAGS)' >> $THTTPD/php_makefile; \ - echo 'PHP_CFLAGS = \$(COMMON_FLAGS) \$(CFLAGS) \$(CPPFLAGS) \$(EXTRA_CFLAGS)' >> $THTTPD/php_makefile; \ + echo 'PHP_CFLAGS = \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(CPPFLAGS) \$(EXTRA_CFLAGS)' >> $THTTPD/php_makefile; \ \$(LN_S) $abs_srcdir/sapi/thttpd/thttpd.c $THTTPD/php_thttpd.c; \ \$(LN_S) $abs_srcdir/sapi/thttpd/php_thttpd.h $abs_builddir/$SAPI_STATIC $THTTPD/;\ test -f $THTTPD/php_patched || \ |