cvs: php4 /build library.mk /sapi/thttpd config.m4
| From: | Sascha Schumann | Date: | Mon, 10 Sep 2001 17:15:03 +0000 |
| Subject: | cvs: php4 /build library.mk /sapi/thttpd config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7380@lists.php.net to get a copy of this message | ||
sas Mon Sep 10 13:15:03 2001 EDT
Modified files:
/php4/build library.mk
/php4/sapi/thttpd config.m4
Log:
Use $(LINK) for libraries, but $(LINK_CLEAN) for creating programs.
Also pass only $(CFLAGS_CLEAN) into thttpd's Makefile.
Index: php4/build/library.mk
diff -u php4/build/library.mk:1.9 php4/build/library.mk:1.10
--- php4/build/library.mk:1.9 Thu Aug 9 00:27:40 2001
+++ php4/build/library.mk Mon Sep 10 13:15:02 2001
@@ -14,10 +14,10 @@
# | Authors: Sascha Schumann <sascha@schumann.cx> |
# +----------------------------------------------------------------------+
#
-# $Id: library.mk,v 1.9 2001/08/09 04:27:40 sas Exp $
+# $Id: library.mk,v 1.10 2001/09/10 17:15:02 sas Exp $
#
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)
Index: php4/sapi/thttpd/config.m4
diff -u php4/sapi/thttpd/config.m4:1.12 php4/sapi/thttpd/config.m4:1.13
--- php4/sapi/thttpd/config.m4:1.12 Tue Aug 14 05:37:25 2001
+++ php4/sapi/thttpd/config.m4 Mon Sep 10 13:15:03 2001
@@ -7,7 +7,7 @@
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 || \