Author: mturk
Date: Mon Mar 29 15:54:31 2010
New Revision: 928810
URL: http://svn.apache.org/viewvc?rev=928810&view=rev
Log:
Use common inference rule instead specific targets
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.in
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.in
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.in?rev=928810&r1=928809&r2=928810&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.in Mon Mar 29
15:54:31 2010
@@ -358,33 +358,12 @@ TEST_OBJS= \
all: $(STATICLIB) $(SHAREDLIB) @modules@
-$(SRCDIR)/port/%.$(OBJ) : $(SRCDIR)/port/%.c
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -o $@ $<
-
-$(SRCDIR)/shared/%.$(OBJ) : $(SRCDIR)/shared/%.c
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -o $@ $<
-
-$(SRCDIR)/os/unix/%.$(OBJ) : $(SRCDIR)/os/unix/%.c
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -o $@ $<
-
-$(SRCDIR)/os/$(HOST)/%.$(OBJ) : $(SRCDIR)/os/$(HOST)/%.c
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -o $@ $<
-
$(SRCDIR)/os/$(HOST)/%.$(OBJ) : $(SRCDIR)/os/$(HOST)/%.S
$(AS) $(ASFLAGS) -o $@ $<
-$(SRCDIR)/srclib/bzip2/%.$(OBJ) : $(SRCDIR)/srclib/bzip2/%.c
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -o $@ $<
-
$(SRCDIR)/srclib/expat/%.$(OBJ) : $(SRCDIR)/srclib/expat/%.c
$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT
-DHAVE_EXPAT_CONFIG_H $(INCLUDES) -I$(TOPDIR)/srclib/expat -c -o $@ $<
-$(SRCDIR)/srclib/regex/%.$(OBJ) : $(SRCDIR)/srclib/regex/%.c
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -o $@ $<
-
-$(SRCDIR)/srclib/zlib/%.$(OBJ) : $(SRCDIR)/srclib/zlib/%.c
- $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -o $@ $<
-
$(SRCDIR)/modules/util/sqlite/%.$(OBJ) : $(SRCDIR)/modules/util/sqlite/%.c
$(CC) $(CFLAGS) $(CSFLAGS) -D_HAVE_SQLITE_CONFIG_H $(CPPFLAGS)
$(INCLUDES) -c -o $@ $<
@@ -397,8 +376,11 @@ $(SRCDIR)/support/%.$(OBJ) : $(SRCDIR)/s
$(SRCDIR)/test/%.$(OBJ) : $(SRCDIR)/test/%.c
$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) $(INCLUDES) -c -o $@ $<
+.c.$(OBJ):
+ $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES)
-c -o $@ $<
+
.cpp.$(OBJ):
- $(CXX) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c -o
$@ $<
+ $(CXX) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT
$(CXXFLAGS) $(INCLUDES) -c -o $@ $<
$(STATICLIB): $(PPORT_OBJS) $(COMMON_OBJS) $(@platf...@_objs) $(REGEX_OBJS)
$(BZIP2_OBJS) $(EXPAT_OBJS) $(ZLIB_OBJS) @testobjs@
$(AR) $(ARFLAGS) $@ $(PPORT_OBJS) $(COMMON_OBJS) $(@platf...@_objs)
$(REGEX_OBJS) $(BZIP2_OBJS) $(EXPAT_OBJS) $(ZLIB_OBJS) @testobjs@
