sqlite: move under database submenu

diff --git a/package/Config.in b/package/Config.in
index c953493fafb444bc470feec0b987800c5e23ce93..2515b04b800d28130f2d4595e5ae9baf968643d5 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -108,7 +108,6 @@ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/rpm/Config.in"
 endif
 source "package/screen/Config.in"
-source "package/sqlite/Config.in"
 source "package/startup-notification/Config.in"
 source "package/strace/Config.in"
 source "package/sudo/Config.in"

diff --git a/package/database/Config.in b/package/database/Config.in
index a1938cb123d342a895e985f3e84fc3ac23f32d3d..71593d7dc471459dc7962cc774f1cc6a7356d74d 100644 (file)
--- a/package/database/Config.in
+++ b/package/database/Config.in
@@ -4,4 +4,5 @@ menuconfig BR2_DATABASE_SUPPORT
 
 if BR2_DATABASE_SUPPORT
 source "package/database/mysql_client/Config.in"
+source "package/database/sqlite/Config.in"
 endif

diff --git a/package/database/sqlite/Config.in b/package/database/sqlite/Config.in
new file mode 100644 (file)
index 0000000..bc6dce9
--- /dev/null
+++ b/package/database/sqlite/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SQLITE
+       bool "sqlite"
+       default n
+       select BR2_PACKAGE_NCURSES
+       select BR2_READLINE
+       help
+         SQLite is a small C library that implements a self-contained,
+         embeddable, zero-configuration SQL database engine.
+
+         http://www.sqlite.org/

diff --git a/package/database/sqlite/sqlite.mk b/package/database/sqlite/sqlite.mk
new file mode 100644 (file)
index 0000000..80d9395
--- /dev/null
+++ b/package/database/sqlite/sqlite.mk
@@ -0,0 +1,78 @@
+#############################################################
+#
+# sqlite
+#
+#############################################################
+
+SQLITE_VERSION:=3.5.9
+SQLITE_SOURCE:=sqlite-$(SQLITE_VERSION).tar.gz
+SQLITE_SITE:=http://www.sqlite.org
+SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
+SQLITE_CAT:=$(ZCAT)
+
+$(DL_DIR)/$(SQLITE_SOURCE):
+       $(WGET) -P $(DL_DIR) $(SQLITE_SITE)/$(SQLITE_SOURCE)
+
+$(SQLITE_DIR)/.unpacked: $(DL_DIR)/$(SQLITE_SOURCE)
+       $(SQLITE_CAT) $(DL_DIR)/$(SQLITE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       touch $(SQLITE_DIR)/.unpacked
+
+$(SQLITE_DIR)/.configured: $(SQLITE_DIR)/.unpacked
+       (cd $(SQLITE_DIR); rm -rf config.cache; \
+               $(TARGET_CONFIGURE_OPTS) \
+               $(TARGET_CONFIGURE_ARGS) \
+               config_BUILD_CC="$(HOSTCC)" \
+               config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
+               config_TARGET_CC="$(TARGET_CC)" \
+               config_TARGET_READLINE_LIBS="-L$(TARGET_DIR)/usr/lib -L$(TARGET_DIR)/lib -lncurses -lreadline" \
+               config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
+               ./configure \
+               --target=$(GNU_TARGET_NAME) \
+               --host=$(GNU_TARGET_NAME) \
+               --build=$(GNU_HOST_NAME) \
+               --prefix=/usr \
+               --sysconfdir=/etc \
+               --localstatedir=/var \
+               --enable-shared \
+               --enable-static \
+               --disable-tcl \
+               --enable-tempstore \
+               --enable-threadsafe \
+               --enable-releasemode \
+       )
+       touch $(SQLITE_DIR)/.configured
+
+$(SQLITE_DIR)/sqlite3: $(SQLITE_DIR)/.configured
+       $(MAKE) -C $(SQLITE_DIR)
+
+$(STAGING_DIR)/usr/bin/sqlite3: $(SQLITE_DIR)/sqlite3
+       $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SQLITE_DIR) install
+       $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libsqlite3.la
+
+$(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3
+       $(INSTALL) -m 0755 -D $^ $@
+       $(STRIPCMD) $(STRIP_STRIP_ALL) $@
+       $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/
+       $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so*
+
+sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3
+
+sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)
+
+sqlite-clean:
+       -$(MAKE) -C $(SQLITE_DIR) clean
+       -rm -rf $(STAGING_DIR)/usr/lib/libsqlite*
+       -rm -rf $(STAGING_DIR)/usr/bin/sqlite3
+       -rm -rf $(TARGET_DIR)/usr/lib/libsqlite*
+       -rm -rf $(TARGET_DIR)/usr/bin/sqlite3
+
+sqlite-dirclean:
+       rm -rf $(SQLITE_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_SQLITE)),y)
+TARGETS+=sqlite
+endif

diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
deleted file mode 100644 (file)
index bc6dce9..0000000
--- a/package/sqlite/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_SQLITE
-       bool "sqlite"
-       default n
-       select BR2_PACKAGE_NCURSES
-       select BR2_READLINE
-       help
-         SQLite is a small C library that implements a self-contained,
-         embeddable, zero-configuration SQL database engine.
-
-         http://www.sqlite.org/

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
deleted file mode 100644 (file)
index 80d9395..0000000
--- a/package/sqlite/sqlite.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#############################################################
-#
-# sqlite
-#
-#############################################################
-
-SQLITE_VERSION:=3.5.9
-SQLITE_SOURCE:=sqlite-$(SQLITE_VERSION).tar.gz
-SQLITE_SITE:=http://www.sqlite.org
-SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
-SQLITE_CAT:=$(ZCAT)
-
-$(DL_DIR)/$(SQLITE_SOURCE):
-       $(WGET) -P $(DL_DIR) $(SQLITE_SITE)/$(SQLITE_SOURCE)
-
-$(SQLITE_DIR)/.unpacked: $(DL_DIR)/$(SQLITE_SOURCE)
-       $(SQLITE_CAT) $(DL_DIR)/$(SQLITE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       touch $(SQLITE_DIR)/.unpacked
-
-$(SQLITE_DIR)/.configured: $(SQLITE_DIR)/.unpacked
-       (cd $(SQLITE_DIR); rm -rf config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               $(TARGET_CONFIGURE_ARGS) \
-               config_BUILD_CC="$(HOSTCC)" \
-               config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
-               config_TARGET_CC="$(TARGET_CC)" \
-               config_TARGET_READLINE_LIBS="-L$(TARGET_DIR)/usr/lib -L$(TARGET_DIR)/lib -lncurses -lreadline" \
-               config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
-               ./configure \
-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --prefix=/usr \
-               --sysconfdir=/etc \
-               --localstatedir=/var \
-               --enable-shared \
-               --enable-static \
-               --disable-tcl \
-               --enable-tempstore \
-               --enable-threadsafe \
-               --enable-releasemode \
-       )
-       touch $(SQLITE_DIR)/.configured
-
-$(SQLITE_DIR)/sqlite3: $(SQLITE_DIR)/.configured
-       $(MAKE) -C $(SQLITE_DIR)
-
-$(STAGING_DIR)/usr/bin/sqlite3: $(SQLITE_DIR)/sqlite3
-       $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SQLITE_DIR) install
-       $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libsqlite3.la
-
-$(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3
-       $(INSTALL) -m 0755 -D $^ $@
-       $(STRIPCMD) $(STRIP_STRIP_ALL) $@
-       $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/
-       $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so*
-
-sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3
-
-sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)
-
-sqlite-clean:
-       -$(MAKE) -C $(SQLITE_DIR) clean
-       -rm -rf $(STAGING_DIR)/usr/lib/libsqlite*
-       -rm -rf $(STAGING_DIR)/usr/bin/sqlite3
-       -rm -rf $(TARGET_DIR)/usr/lib/libsqlite*
-       -rm -rf $(TARGET_DIR)/usr/bin/sqlite3
-
-sqlite-dirclean:
-       rm -rf $(SQLITE_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_SQLITE)),y)
-TARGETS+=sqlite
-endif