commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r835297 - in /commons/sandbox/runtime/trunk/src/main/native: Makefile.in Makefile.msc.in modules/sqlite/ modules/util/ modules/util/sqlite/
Date Thu, 12 Nov 2009 08:25:54 GMT
Author: mturk
Date: Thu Nov 12 08:25:53 2009
New Revision: 835297

URL: http://svn.apache.org/viewvc?rev=835297&view=rev
Log:
Use proper sqlite module location

Added:
    commons/sandbox/runtime/trunk/src/main/native/modules/util/
    commons/sandbox/runtime/trunk/src/main/native/modules/util/sqlite/
      - copied from r835278, commons/sandbox/runtime/trunk/src/main/native/modules/sqlite/
Removed:
    commons/sandbox/runtime/trunk/src/main/native/modules/sqlite/
Modified:
    commons/sandbox/runtime/trunk/src/main/native/Makefile.in
    commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.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=835297&r1=835296&r2=835297&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.in Thu Nov 12 08:25:53 2009
@@ -77,9 +77,9 @@
 	$(SRCDIR)/os/unix \
 	$(SRCDIR)/os/win32 \
 	$(SRCDIR)/modules/network/ssl \
+	$(SRCDIR)/modules/util/sqlite \
 	$(SRCDIR)/srclib/bzip2 \
 	$(SRCDIR)/srclib/regex \
-	$(SRCDIR)/srclib/sqlite \
 	$(SRCDIR)/srclib/zlib \
 	$(SRCDIR)/test
 
@@ -317,10 +317,10 @@
 	$(SRCDIR)/modules/network/ssl/openssl.$(OBJ)
 
 SQLITE_SRCS= \
-	$(SRCDIR)/modules/sqlite/sqlite3.$(OBJ)
+	$(SRCDIR)/modules/util/sqlite/sqlite3.$(OBJ)
 
 SQLITE_OBJS= \
-	$(SRCDIR)/modules/sqlite/sqliteapi.$(OBJ)
+	$(SRCDIR)/modules/util/sqlite/sqliteapi.$(OBJ)
 
 TEST_OBJS= \
 	$(SRCDIR)/test/testcase.$(OBJ)
@@ -352,7 +352,7 @@
 $(SRCDIR)/srclib/zlib/%.$(OBJ) : $(SRCDIR)/srclib/zlib/%.c
 	$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) $(INCLUDES) -c -o $@ $<
 
-$(SRCDIR)/modules/sqlite/%.$(OBJ) : $(SRCDIR)/modules/sqlite/%.c
+$(SRCDIR)/modules/util/sqlite/%.$(OBJ) : $(SRCDIR)/modules/util/sqlite/%.c
 	$(CC) $(CFLAGS) $(CSFLAGS) -D_HAVE_SQLITE_CONFIG_H $(CPPFLAGS) $(INCLUDES) -c -o $@ $<
 
 $(SRCDIR)/modules/network/ssl/%.$(OBJ) : $(SRCDIR)/modules/network/ssl/%.c

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=835297&r1=835296&r2=835297&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Thu Nov 12 08:25:53 2009
@@ -205,10 +205,10 @@
 	$(SRCDIR)/modules/network/ssl/openssl.$(OBJ)
 
 SQLITE_SRCS= \
-	$(SRCDIR)/modules/sqlite/sqlite3.$(OBJ)
+	$(SRCDIR)/modules/util/sqlite/sqlite3.$(OBJ)
 
 SQLITE_OBJS= \
-	$(SRCDIR)/modules/sqlite/sqliteapi.$(OBJ)
+	$(SRCDIR)/modules/util/sqlite/sqliteapi.$(OBJ)
 
 TEST_OBJS= \
 	$(SRCDIR)/test/testcase.$(OBJ)
@@ -242,7 +242,7 @@
 {$(SRCDIR)\modules\network\ssl}.c{$(SRCDIR)\modules\network\ssl}.$(OBJ):
 	$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) $(INCLUDES) -c -Fo$@ -Fd$(SSLNAME)-src $<
 
-{$(SRCDIR)\modules\sqlite}.c{$(SRCDIR)\modules\sqlite}.$(OBJ):
+{$(SRCDIR)\modules\util\sqlite}.c{$(SRCDIR)\modules\util\sqlite}.$(OBJ):
 	$(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -D_HAVE_SQLITE_CONFIG_H $(INCLUDES) -c -Fo$@ -Fd$(LIBNAME)-src
$<
 
 
@@ -289,9 +289,9 @@
 	-@del /Q $(SRCDIR)\os\win32\*.$(OBJ) 2>NUL
 	-@del /Q $(SRCDIR)\os\win32\*.res 2>NUL
 	-@del /Q $(SRCDIR)\modules\network\ssl\*.$(OBJ) 2>NUL
+	-@del /Q $(SRCDIR)\modules\util\sqlite\*.$(OBJ) 2>NUL
 	-@del /Q $(SRCDIR)\srclib\bzip2\*.$(OBJ) 2>NUL
 	-@del /Q $(SRCDIR)\srclib\regex\*.$(OBJ) 2>NUL
-	-@del /Q $(SRCDIR)\srclib\sqlite\*.$(OBJ) 2>NUL
 	-@del /Q $(SRCDIR)\srclib\zlib\*.$(OBJ) 2>NUL
 	-@del /Q *.dll  2>NUL
 	-@del /Q *.lib  2>NUL



Mime
View raw message