Author: mturk
Date: Mon Mar 1 13:03:49 2010
New Revision: 917506
URL: http://svn.apache.org/viewvc?rev=917506&view=rev
Log:
Use less rules
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=917506&r1=917505&r2=917506&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Mon Mar 1
13:03:49 2010
@@ -230,36 +230,18 @@
all: $(SHAREDLIB) @modules@
-{$(SRCDIR)\shared}.c{$(SRCDIR)\shared}.$(OBJ):
+.c.$(OBJ):
$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -Fo$@ -Fd$(LIBNAME)-src $<
-{$(SRCDIR)\port}.c{$(SRCDIR)\port}.$(OBJ):
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -Fo$@ -Fd$(LIBNAME)-src $<
-
-{$(SRCDIR)\os\win32}.c{$(SRCDIR)\os\win32}.$(OBJ):
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -Fo$@ -Fd$(LIBNAME)-src $<
-
-{$(SRCDIR)\srclib\bzip2}.c{$(SRCDIR)\srclib\bzip2}.$(OBJ):
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -Fo$@ -Fd$(LIBNAME)-src $<
+.cpp.$(OBJ):
+ $(CXX) $(CFLAGS) $(CXXFLAGS) $(CSFLAGS) $(CPPFLAGS)
-DACR_DECLARE_EXPORT $(INCLUDES) -c -Fo$@ -Fd$(LIBNAME)-src $<
{$(SRCDIR)\srclib\expat}.c{$(SRCDIR)\srclib\expat}.$(OBJ):
$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT
-DCOMPILED_FROM_DSP -DXML_UNICODE_WCHAR_T $(INCLUDES) -I$(TOPDIR)/srclib/expat
-c -Fo$@ -Fd$(LIBNAME)-src $<
-{$(SRCDIR)\srclib\regex}.c{$(SRCDIR)\srclib\regex}.$(OBJ):
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -Fo$@ -Fd$(LIBNAME)-src $<
-
-{$(SRCDIR)\srclib\zlib}.c{$(SRCDIR)\srclib\zlib}.$(OBJ):
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -Fo$@ -Fd$(LIBNAME)-src $<
-
{$(SRCDIR)\support\win32}.c{$(SRCDIR)\support\win32}.$(OBJ):
$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) $(INCLUDES) -c -Fo$@
-Fdsupport-src $<
-{$(SRCDIR)\test}.c{$(SRCDIR)\test}.$(OBJ):
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -Fo$@ -Fd$(LIBNAME)-src $<
-
-{$(SRCDIR)\os\win32}.cpp{$(SRCDIR)\os\win32}.$(OBJ):
- $(CXX) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT
$(CXXFLAGS) $(INCLUDES) -c -Fo$@ -Fd$(LIBNAME)-src $<
-
{$(SRCDIR)\modules\network\ssl}.c{$(SRCDIR)\modules\network\ssl}.$(OBJ):
$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) $(INCLUDES) -c -Fo$@
-Fd$(SSLNAME)-src $<