Replace all += constructs with equivalent ones

diff --git a/ext/snmp/Makefile.in b/ext/snmp/Makefile.in
index ae21bdf7fe09c743b27790b5d92cd5da3ba675bf..e51acef889e9e5a194d3c4b817f7d7e47710be06 100644 (file)
--- a/ext/snmp/Makefile.in
+++ b/ext/snmp/Makefile.in
@@ -8,6 +8,6 @@ LTLIBRARY_NAME    = libsnmp.la
 LTLIBRARY_SOURCES = snmp.c
 LTLIBRARY_SHARED_LIBADD = $(SNMP_LIBDIR) -lsnmp $(KSTAT_LIBS)
 
+EXTRA_INCLUDES = $(SNMP_INCLUDE)
+       
 include $(topsrcdir)/build/ltlib.mk
-
-INCLUDES += $(SNMP_INCLUDE)

diff --git a/sapi/apache/Makefile.in b/sapi/apache/Makefile.in
index e591d4a8bb0e98a1eedef976c68a636856904042..5a72f36b96909178a15c1a663fcfc8c6ea0e14bd 100644 (file)
--- a/sapi/apache/Makefile.in
+++ b/sapi/apache/Makefile.in
@@ -7,6 +7,6 @@ VPATH     = @srcdir@
 LTLIBRARY_NAME    = libsapi.la
 LTLIBRARY_SOURCES = sapi_apache.c mod_php4.c
 
-include $(topsrcdir)/build/ltlib.mk
+EXTRA_INCLUDES = $(APACHE_INCLUDE)
 
-INCLUDES += $(APACHE_INCLUDE)
+include $(topsrcdir)/build/ltlib.mk

diff --git a/sapi/servlet/Makefile.in b/sapi/servlet/Makefile.in
index d0fd7a29b231c5700dc5c59cb52b2f9df18d7153..62b3ef51810d8c9aab438ed109478cf16e08adce 100644 (file)
--- a/sapi/servlet/Makefile.in
+++ b/sapi/servlet/Makefile.in
@@ -7,10 +7,10 @@ VPATH     = @srcdir@
 LTLIBRARY_NAME    = libsapi.la
 LTLIBRARY_SOURCES = servlet.c java.c
 
-include $(topsrcdir)/build/ltlib.mk
+EXTRA_CFLAGS = $(JAVA_CFLAGS)
+EXTRA_INCLUDES = $(JAVE_INCLUDE)
 
-CFLAGS += $(JAVA_CFLAGS)
-INCLUDES += $(JAVA_INCLUDE)
+include $(topsrcdir)/build/ltlib.mk
 
 java.c : ../../ext/java/java.c
        @cp ../../ext/java/java.c .