commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r918890 - /commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
Date Thu, 04 Mar 2010 08:29:48 GMT
Author: mturk
Date: Thu Mar  4 08:29:48 2010
New Revision: 918890

URL: http://svn.apache.org/viewvc?rev=918890&view=rev
Log:
Use macro for dependency

Modified:
    commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in

Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=918890&r1=918889&r2=918890&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Thu Mar  4 08:29:48 2010
@@ -225,6 +225,9 @@
 SQLITE_OBJS= \
 	$(SRCDIR)/modules/util/sqlite/sqliteapi.$(OBJ)
 
+SUEXEC_OBJS= \
+	$(SRCDIR)/support/win32/suexec.$(OBJ)
+
 TEST_OBJS= \
 	$(SRCDIR)/test/testcase.$(OBJ)
 
@@ -273,7 +276,7 @@
 	IF EXIST $(SQLMODLIB).manifest \
 		mt -nologo -manifest $@.manifest -outputresource:$@;2
 
-$(SUEXECBIN):  $(SRCDIR)/support/win32/suexec.$(OBJ)
+$(SUEXECBIN):  $(SUEXEC_OBJS)
 	$(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="\"Apache Commons Runtime suEXEC\"" /d STR_INTNAME="\"suEXEC\""
/d STR_ICONAME="\"suexec.ico\"" /i "$(SRCDIR)\support\win32" /i "$(SRCDIR)\os\win32" /i "$(SRCDIR)\include"
/fo $@.res $(SRCDIR)/support/win32/support.rc
 	$(LINK) $(SHFLAGS) /SUBSYSTEM:WINDOWS $(LDFLAGS) /pdb:suexec.pdb /out:$@ @<<
 	$(SRCDIR)/support/win32/suexec.$(OBJ) $@.res
@@ -312,8 +315,9 @@
 	-@del /Q *.manifest  2>NUL
 
 distclean: clean
-	-@del /Q $(TOPDIR)\Makefile 2>NUL
-	-@del /Q $(SRCDIR)\include\ccconfig.h 2>NUL
+	-@del /Q $(TOPDIR)\Makefile.msc.* 2>NUL
+	-@del /Q $(SRCDIR)\include\acr_cc32.h 2>NUL
+	-@del /Q $(SRCDIR)\include\acr_cc64.h 2>NUL
 
 install: all
 	@if not exist "$(DESTDIR)\include\$(NULL)" mkdir "$(DESTDIR)\include"



Mime
View raw message