From 4b0b7ca249bfa4ecc099c2ca56527eb91776f198 Mon Sep 17 00:00:00 2001
From: ticktock35 <ticktock35@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Date: Mon, 15 Dec 2008 04:25:08 +0000
Subject: [PATCH] opkg: re-arrange source code into sub-directories

git-svn-id: http://opkg.googlecode.com/svn/trunk@33 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
---
 Makefile.am                                   | 92 +------------------
 configure.ac                                  | 18 +++-
 libopkg/Makefile.am                           | 76 +++++++++++++++
 args.c => libopkg/args.c                      |  0
 args.h => libopkg/args.h                      |  0
 conffile.c => libopkg/conffile.c              |  0
 conffile.h => libopkg/conffile.h              |  0
 conffile_list.c => libopkg/conffile_list.c    |  0
 conffile_list.h => libopkg/conffile_list.h    |  0
 file_util.c => libopkg/file_util.c            |  0
 file_util.h => libopkg/file_util.h            |  0
 hash_table.c => libopkg/hash_table.c          |  0
 hash_table.h => libopkg/hash_table.h          |  0
 includes.h => libopkg/includes.h              |  0
 libopkg.c => libopkg/libopkg.c                |  0
 libopkg.h => libopkg/libopkg.h                |  0
 md5.c => libopkg/md5.c                        |  0
 md5.h => libopkg/md5.h                        |  0
 nv_pair.c => libopkg/nv_pair.c                |  0
 nv_pair.h => libopkg/nv_pair.h                |  0
 nv_pair_list.c => libopkg/nv_pair_list.c      |  0
 nv_pair_list.h => libopkg/nv_pair_list.h      |  0
 opkg.c => libopkg/opkg.c                      |  0
 opkg.h => libopkg/opkg.h                      |  0
 opkg_cmd.c => libopkg/opkg_cmd.c              |  0
 opkg_cmd.h => libopkg/opkg_cmd.h              |  0
 opkg_conf.c => libopkg/opkg_conf.c            |  0
 opkg_conf.h => libopkg/opkg_conf.h            |  0
 opkg_configure.c => libopkg/opkg_configure.c  |  0
 opkg_configure.h => libopkg/opkg_configure.h  |  0
 opkg_download.c => libopkg/opkg_download.c    |  0
 opkg_download.h => libopkg/opkg_download.h    |  0
 .../opkg_extract_test.c                       |  0
 opkg_hash_test.c => libopkg/opkg_hash_test.c  |  0
 opkg_install.c => libopkg/opkg_install.c      |  0
 opkg_install.h => libopkg/opkg_install.h      |  0
 opkg_message.c => libopkg/opkg_message.c      |  0
 opkg_message.h => libopkg/opkg_message.h      |  0
 opkg_remove.c => libopkg/opkg_remove.c        |  0
 opkg_remove.h => libopkg/opkg_remove.h        |  0
 opkg_state.c => libopkg/opkg_state.c          |  0
 opkg_state.h => libopkg/opkg_state.h          |  0
 opkg_upgrade.c => libopkg/opkg_upgrade.c      |  0
 opkg_upgrade.h => libopkg/opkg_upgrade.h      |  0
 opkg_utils.c => libopkg/opkg_utils.c          |  0
 opkg_utils.h => libopkg/opkg_utils.h          |  0
 pkg.c => libopkg/pkg.c                        |  0
 pkg.h => libopkg/pkg.h                        |  0
 pkg_depends.c => libopkg/pkg_depends.c        |  0
 pkg_depends.h => libopkg/pkg_depends.h        |  0
 pkg_dest.c => libopkg/pkg_dest.c              |  0
 pkg_dest.h => libopkg/pkg_dest.h              |  0
 pkg_dest_list.c => libopkg/pkg_dest_list.c    |  0
 pkg_dest_list.h => libopkg/pkg_dest_list.h    |  0
 pkg_extract.c => libopkg/pkg_extract.c        |  0
 pkg_extract.h => libopkg/pkg_extract.h        |  0
 pkg_hash.c => libopkg/pkg_hash.c              |  0
 pkg_hash.h => libopkg/pkg_hash.h              |  0
 pkg_parse.c => libopkg/pkg_parse.c            |  0
 pkg_parse.h => libopkg/pkg_parse.h            |  0
 pkg_src.c => libopkg/pkg_src.c                |  0
 pkg_src.h => libopkg/pkg_src.h                |  0
 pkg_src_list.c => libopkg/pkg_src_list.c      |  0
 pkg_src_list.h => libopkg/pkg_src_list.h      |  0
 pkg_vec.c => libopkg/pkg_vec.c                |  0
 pkg_vec.h => libopkg/pkg_vec.h                |  0
 sprintf_alloc.c => libopkg/sprintf_alloc.c    |  0
 sprintf_alloc.h => libopkg/sprintf_alloc.h    |  0
 str_list.c => libopkg/str_list.c              |  0
 str_list.h => libopkg/str_list.h              |  0
 str_util.c => libopkg/str_util.c              |  0
 str_util.h => libopkg/str_util.h              |  0
 user.c => libopkg/user.c                      |  0
 user.h => libopkg/user.h                      |  0
 void_list.c => libopkg/void_list.c            |  0
 void_list.h => libopkg/void_list.h            |  0
 xregex.c => libopkg/xregex.c                  |  0
 xregex.h => libopkg/xregex.h                  |  0
 xsystem.c => libopkg/xsystem.c                |  0
 xsystem.h => libopkg/xsystem.h                |  0
 src/Makefile.am                               | 10 ++
 opkg-frontend.c => src/opkg-frontend.c        |  0
 82 files changed, 103 insertions(+), 93 deletions(-)
 create mode 100644 libopkg/Makefile.am
 rename args.c => libopkg/args.c (100%)
 rename args.h => libopkg/args.h (100%)
 rename conffile.c => libopkg/conffile.c (100%)
 rename conffile.h => libopkg/conffile.h (100%)
 rename conffile_list.c => libopkg/conffile_list.c (100%)
 rename conffile_list.h => libopkg/conffile_list.h (100%)
 rename file_util.c => libopkg/file_util.c (100%)
 rename file_util.h => libopkg/file_util.h (100%)
 rename hash_table.c => libopkg/hash_table.c (100%)
 rename hash_table.h => libopkg/hash_table.h (100%)
 rename includes.h => libopkg/includes.h (100%)
 rename libopkg.c => libopkg/libopkg.c (100%)
 rename libopkg.h => libopkg/libopkg.h (100%)
 rename md5.c => libopkg/md5.c (100%)
 rename md5.h => libopkg/md5.h (100%)
 rename nv_pair.c => libopkg/nv_pair.c (100%)
 rename nv_pair.h => libopkg/nv_pair.h (100%)
 rename nv_pair_list.c => libopkg/nv_pair_list.c (100%)
 rename nv_pair_list.h => libopkg/nv_pair_list.h (100%)
 rename opkg.c => libopkg/opkg.c (100%)
 rename opkg.h => libopkg/opkg.h (100%)
 rename opkg_cmd.c => libopkg/opkg_cmd.c (100%)
 rename opkg_cmd.h => libopkg/opkg_cmd.h (100%)
 rename opkg_conf.c => libopkg/opkg_conf.c (100%)
 rename opkg_conf.h => libopkg/opkg_conf.h (100%)
 rename opkg_configure.c => libopkg/opkg_configure.c (100%)
 rename opkg_configure.h => libopkg/opkg_configure.h (100%)
 rename opkg_download.c => libopkg/opkg_download.c (100%)
 rename opkg_download.h => libopkg/opkg_download.h (100%)
 rename opkg_extract_test.c => libopkg/opkg_extract_test.c (100%)
 rename opkg_hash_test.c => libopkg/opkg_hash_test.c (100%)
 rename opkg_install.c => libopkg/opkg_install.c (100%)
 rename opkg_install.h => libopkg/opkg_install.h (100%)
 rename opkg_message.c => libopkg/opkg_message.c (100%)
 rename opkg_message.h => libopkg/opkg_message.h (100%)
 rename opkg_remove.c => libopkg/opkg_remove.c (100%)
 rename opkg_remove.h => libopkg/opkg_remove.h (100%)
 rename opkg_state.c => libopkg/opkg_state.c (100%)
 rename opkg_state.h => libopkg/opkg_state.h (100%)
 rename opkg_upgrade.c => libopkg/opkg_upgrade.c (100%)
 rename opkg_upgrade.h => libopkg/opkg_upgrade.h (100%)
 rename opkg_utils.c => libopkg/opkg_utils.c (100%)
 rename opkg_utils.h => libopkg/opkg_utils.h (100%)
 rename pkg.c => libopkg/pkg.c (100%)
 rename pkg.h => libopkg/pkg.h (100%)
 rename pkg_depends.c => libopkg/pkg_depends.c (100%)
 rename pkg_depends.h => libopkg/pkg_depends.h (100%)
 rename pkg_dest.c => libopkg/pkg_dest.c (100%)
 rename pkg_dest.h => libopkg/pkg_dest.h (100%)
 rename pkg_dest_list.c => libopkg/pkg_dest_list.c (100%)
 rename pkg_dest_list.h => libopkg/pkg_dest_list.h (100%)
 rename pkg_extract.c => libopkg/pkg_extract.c (100%)
 rename pkg_extract.h => libopkg/pkg_extract.h (100%)
 rename pkg_hash.c => libopkg/pkg_hash.c (100%)
 rename pkg_hash.h => libopkg/pkg_hash.h (100%)
 rename pkg_parse.c => libopkg/pkg_parse.c (100%)
 rename pkg_parse.h => libopkg/pkg_parse.h (100%)
 rename pkg_src.c => libopkg/pkg_src.c (100%)
 rename pkg_src.h => libopkg/pkg_src.h (100%)
 rename pkg_src_list.c => libopkg/pkg_src_list.c (100%)
 rename pkg_src_list.h => libopkg/pkg_src_list.h (100%)
 rename pkg_vec.c => libopkg/pkg_vec.c (100%)
 rename pkg_vec.h => libopkg/pkg_vec.h (100%)
 rename sprintf_alloc.c => libopkg/sprintf_alloc.c (100%)
 rename sprintf_alloc.h => libopkg/sprintf_alloc.h (100%)
 rename str_list.c => libopkg/str_list.c (100%)
 rename str_list.h => libopkg/str_list.h (100%)
 rename str_util.c => libopkg/str_util.c (100%)
 rename str_util.h => libopkg/str_util.h (100%)
 rename user.c => libopkg/user.c (100%)
 rename user.h => libopkg/user.h (100%)
 rename void_list.c => libopkg/void_list.c (100%)
 rename void_list.h => libopkg/void_list.h (100%)
 rename xregex.c => libopkg/xregex.c (100%)
 rename xregex.h => libopkg/xregex.h (100%)
 rename xsystem.c => libopkg/xsystem.c (100%)
 rename xsystem.h => libopkg/xsystem.h (100%)
 create mode 100644 src/Makefile.am
 rename opkg-frontend.c => src/opkg-frontend.c (100%)

diff --git a/Makefile.am b/Makefile.am
index 256c254..69b61f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,11 @@
 #SUBDIRS = etc replace familiar libbb
-SUBDIRS = etc familiar libbb
+SUBDIRS =  etc familiar libbb libopkg src
 
 HOST_CPU=@host_cpu@
 BUILD_CPU=@build_cpu@
 OPKGLIBDIR=@opkglibdir@ 
 ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DDATADIR=\"@datadir@\"
 
-bin_PROGRAMS = opkg-cl
-
-lib_LTLIBRARIES = libopkg.la
 
 bin_SCRIPTS = update-alternatives
 
@@ -18,71 +15,7 @@ intercept_DATA = intercept/ldconfig intercept/depmod intercept/update-modules
 install-data-hook:
 	chmod +x $(DESTDIR)$(datadir)/opkg/intercept/*
 
-# opkg_LDADD = libbb/libbb.a replace/libreplace.a
-
-#opkg_cl_LDADD = libopkg.la libbb/libbb.la replace/libreplace.a 
-opkg_cl_LDADD = libopkg.la libbb/libbb.la 
-
-libopkg_includedir=$(includedir)/libopkg
-
-libopkg_include_HEADERS= \
-	args.h \
-	conffile.h \
-	conffile_list.h \
-	config.h \
-	hash_table.h \
-	includes.h \
-	opkg_conf.h \
-	opkg.h \
-	opkg_message.h \
-	opkg_state.h \
-	nv_pair.h \
-	nv_pair_list.h \
-	pkg_depends.h \
-	pkg_dest.h \
-	pkg_dest_list.h \
-	pkg.h \
-	pkg_hash.h \
-	pkg_src.h \
-	pkg_src_list.h \
-	pkg_vec.h \
-	str_list.h \
-	void_list.h \
-	libopkg.h 
-
-#\ replace/replace.h
-
-#libopkg_la_LIBADD = libbb/libbb.la replace/libreplace.a
-libopkg_la_LIBADD = libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS)
-
-opkg_core_sources = args.c args.h opkg.c \
-		    user.c user.h 
-opkg_libcore_sources = args.c args.h libopkg.c libopkg.h opkg.h\
-		    user.c user.h opkg_state.c opkg_state.h
-opkg_cmd_sources = opkg_cmd.c opkg_cmd.h \
-		   opkg_configure.c opkg_configure.h \
-		   opkg_download.c opkg_download.h \
-		   opkg_install.c opkg_install.h \
-		   opkg_upgrade.c opkg_upgrade.h \
-		   opkg_remove.c opkg_remove.h
-opkg_db_sources = opkg_conf.c opkg_conf.h \
-		  opkg_utils.c opkg_utils.h pkg.c pkg.h hash_table.h \
-		  pkg_depends.c pkg_depends.h pkg_extract.c pkg_extract.h \
-		  hash_table.c pkg_hash.c pkg_hash.h pkg_parse.c pkg_parse.h \
-		  pkg_vec.c pkg_vec.h
-opkg_list_sources = conffile.c conffile.h conffile_list.c conffile_list.h \
-		    nv_pair.c nv_pair.h nv_pair_list.c nv_pair_list.h \
-		    pkg_dest.c pkg_dest.h pkg_dest_list.c pkg_dest_list.h \
-		    pkg_src.c pkg_src.h pkg_src_list.c pkg_src_list.h \
-		    str_list.c str_list.h void_list.c void_list.h
-opkg_util_sources = file_util.c file_util.h opkg_message.h opkg_message.c md5.c md5.h \
-		    sprintf_alloc.c sprintf_alloc.h str_util.c str_util.h \
-		    xregex.c xregex.h xsystem.c xsystem.h
-
-# opkg_SOURCES = $(opkg_core_sources) $(opkg_cmd_sources) $(opkg_db_sources) \
-#	       $(opkg_util_sources) $(opkg_list_sources)
-
-EXTRA_DIST = opkg.c update-alternatives $(intercept_DATA)
+EXTRA_DIST = update-alternatives $(intercept_DATA)
 
 MAINTAINERCLEANFILES= \
 	configure \
@@ -93,26 +26,5 @@ MAINTAINERCLEANFILES= \
 	.Makefile.am.swp \
 	aclocal.m4
 
-libopkg_la_SOURCES = $(opkg_libcore_sources) $(opkg_cmd_sources) $(opkg_db_sources) \
-	       $(opkg_util_sources) $(opkg_list_sources)
-
-opkg_cl_SOURCES = opkg-frontend.c
-
-libopkg_la_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS)  $(CURL_CFLAGS) $(GPGME_CFLAGS)
-
-opkg_CFLAGS = $(ALL_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS)
-
-opkg_cl_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS)
-
-noinst_PROGRAMS = opkg_hash_test opkg_extract_test
-
-opkg_hash_test_LDADD = libbb/libbb.la
-opkg_hash_test_SOURCES = opkg_hash_test.c $(opkg_db_sources) $(opkg_util_sources) $(opkg_list_sources)
-opkg_hash_test_CFLAGS = $(ALL_CFLAGS)
-
-opkg_extract_test_LDADD = libbb/libbb.la
-opkg_extract_test_SOURCES = opkg_extract_test.c $(opkg_db_sources) $(opkg_util_sources) $(opkg_list_sources)
-opkg_extract_test_CFLAGS = $(ALL_CFLAGS)
-
 package: all-recursive
 	STRIPPROG=$(STRIP) familiar/rules INSTALL=$$PWD/install-sh  binary-arch
diff --git a/configure.ac b/configure.ac
index 3dd5dd9..c98db77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script
-AC_INIT(opkg.c)
+AC_INIT(libopkg/opkg.c)
 AM_INIT_AUTOMAKE([opkg], [0.99.163])
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(libopkg/config.h)
 
 AC_CANONICAL_HOST
 
@@ -126,4 +126,16 @@ fi
 
 AC_SUBST(opkglibdir)
 
-AC_OUTPUT(Makefile etc/Makefile familiar/Makefile familiar/control familiar/control-unstripped familiar/libopkg-control  familiar/libopkg-dev-control libbb/Makefile libopkg.pc opkg.h)
+AC_OUTPUT(
+    Makefile
+    libopkg/Makefile
+    src/Makefile
+    etc/Makefile
+    familiar/Makefile
+    familiar/control
+    familiar/control-unstripped
+    familiar/libopkg-control
+    familiar/libopkg-dev-control
+    libbb/Makefile
+    libopkg.pc
+    opkg.h)
diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am
new file mode 100644
index 0000000..ad4de4d
--- /dev/null
+++ b/libopkg/Makefile.am
@@ -0,0 +1,76 @@
+
+ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DDATADIR=\"@datadir@\" -I$(top_builddir)
+
+libopkg_includedir=$(includedir)/libopkg
+
+libopkg_include_HEADERS= \
+	args.h \
+	conffile.h \
+	conffile_list.h \
+	config.h \
+	hash_table.h \
+	includes.h \
+	opkg_conf.h \
+	opkg.h \
+	opkg_message.h \
+	opkg_state.h \
+	nv_pair.h \
+	nv_pair_list.h \
+	pkg_depends.h \
+	pkg_dest.h \
+	pkg_dest_list.h \
+	pkg.h \
+	pkg_hash.h \
+	pkg_src.h \
+	pkg_src_list.h \
+	pkg_vec.h \
+	str_list.h \
+	void_list.h \
+	libopkg.h 
+
+libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS)
+
+opkg_core_sources = args.c args.h opkg.c \
+		    user.c user.h 
+opkg_libcore_sources = args.c args.h libopkg.c libopkg.h opkg.h\
+		    user.c user.h opkg_state.c opkg_state.h
+opkg_cmd_sources = opkg_cmd.c opkg_cmd.h \
+		   opkg_configure.c opkg_configure.h \
+		   opkg_download.c opkg_download.h \
+		   opkg_install.c opkg_install.h \
+		   opkg_upgrade.c opkg_upgrade.h \
+		   opkg_remove.c opkg_remove.h
+opkg_db_sources = opkg_conf.c opkg_conf.h \
+		  opkg_utils.c opkg_utils.h pkg.c pkg.h hash_table.h \
+		  pkg_depends.c pkg_depends.h pkg_extract.c pkg_extract.h \
+		  hash_table.c pkg_hash.c pkg_hash.h pkg_parse.c pkg_parse.h \
+		  pkg_vec.c pkg_vec.h
+opkg_list_sources = conffile.c conffile.h conffile_list.c conffile_list.h \
+		    nv_pair.c nv_pair.h nv_pair_list.c nv_pair_list.h \
+		    pkg_dest.c pkg_dest.h pkg_dest_list.c pkg_dest_list.h \
+		    pkg_src.c pkg_src.h pkg_src_list.c pkg_src_list.h \
+		    str_list.c str_list.h void_list.c void_list.h
+opkg_util_sources = file_util.c file_util.h opkg_message.h opkg_message.c md5.c md5.h \
+		    sprintf_alloc.c sprintf_alloc.h str_util.c str_util.h \
+		    xregex.c xregex.h xsystem.c xsystem.h
+
+libopkg_la_SOURCES = \
+	$(opkg_libcore_sources) \
+	$(opkg_cmd_sources) $(opkg_db_sources) \
+	$(opkg_util_sources) $(opkg_list_sources)
+
+libopkg_la_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS)  $(CURL_CFLAGS) $(GPGME_CFLAGS)
+lib_LTLIBRARIES = libopkg.la
+
+
+noinst_PROGRAMS = opkg_hash_test opkg_extract_test
+
+opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la
+opkg_hash_test_SOURCES = opkg_hash_test.c $(opkg_db_sources) $(opkg_util_sources) $(opkg_list_sources)
+opkg_hash_test_CFLAGS = $(ALL_CFLAGS)
+
+opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la
+opkg_extract_test_SOURCES = opkg_extract_test.c $(opkg_db_sources) $(opkg_util_sources) $(opkg_list_sources)
+opkg_extract_test_CFLAGS = $(ALL_CFLAGS)
+
+
diff --git a/args.c b/libopkg/args.c
similarity index 100%
rename from args.c
rename to libopkg/args.c
diff --git a/args.h b/libopkg/args.h
similarity index 100%
rename from args.h
rename to libopkg/args.h
diff --git a/conffile.c b/libopkg/conffile.c
similarity index 100%
rename from conffile.c
rename to libopkg/conffile.c
diff --git a/conffile.h b/libopkg/conffile.h
similarity index 100%
rename from conffile.h
rename to libopkg/conffile.h
diff --git a/conffile_list.c b/libopkg/conffile_list.c
similarity index 100%
rename from conffile_list.c
rename to libopkg/conffile_list.c
diff --git a/conffile_list.h b/libopkg/conffile_list.h
similarity index 100%
rename from conffile_list.h
rename to libopkg/conffile_list.h
diff --git a/file_util.c b/libopkg/file_util.c
similarity index 100%
rename from file_util.c
rename to libopkg/file_util.c
diff --git a/file_util.h b/libopkg/file_util.h
similarity index 100%
rename from file_util.h
rename to libopkg/file_util.h
diff --git a/hash_table.c b/libopkg/hash_table.c
similarity index 100%
rename from hash_table.c
rename to libopkg/hash_table.c
diff --git a/hash_table.h b/libopkg/hash_table.h
similarity index 100%
rename from hash_table.h
rename to libopkg/hash_table.h
diff --git a/includes.h b/libopkg/includes.h
similarity index 100%
rename from includes.h
rename to libopkg/includes.h
diff --git a/libopkg.c b/libopkg/libopkg.c
similarity index 100%
rename from libopkg.c
rename to libopkg/libopkg.c
diff --git a/libopkg.h b/libopkg/libopkg.h
similarity index 100%
rename from libopkg.h
rename to libopkg/libopkg.h
diff --git a/md5.c b/libopkg/md5.c
similarity index 100%
rename from md5.c
rename to libopkg/md5.c
diff --git a/md5.h b/libopkg/md5.h
similarity index 100%
rename from md5.h
rename to libopkg/md5.h
diff --git a/nv_pair.c b/libopkg/nv_pair.c
similarity index 100%
rename from nv_pair.c
rename to libopkg/nv_pair.c
diff --git a/nv_pair.h b/libopkg/nv_pair.h
similarity index 100%
rename from nv_pair.h
rename to libopkg/nv_pair.h
diff --git a/nv_pair_list.c b/libopkg/nv_pair_list.c
similarity index 100%
rename from nv_pair_list.c
rename to libopkg/nv_pair_list.c
diff --git a/nv_pair_list.h b/libopkg/nv_pair_list.h
similarity index 100%
rename from nv_pair_list.h
rename to libopkg/nv_pair_list.h
diff --git a/opkg.c b/libopkg/opkg.c
similarity index 100%
rename from opkg.c
rename to libopkg/opkg.c
diff --git a/opkg.h b/libopkg/opkg.h
similarity index 100%
rename from opkg.h
rename to libopkg/opkg.h
diff --git a/opkg_cmd.c b/libopkg/opkg_cmd.c
similarity index 100%
rename from opkg_cmd.c
rename to libopkg/opkg_cmd.c
diff --git a/opkg_cmd.h b/libopkg/opkg_cmd.h
similarity index 100%
rename from opkg_cmd.h
rename to libopkg/opkg_cmd.h
diff --git a/opkg_conf.c b/libopkg/opkg_conf.c
similarity index 100%
rename from opkg_conf.c
rename to libopkg/opkg_conf.c
diff --git a/opkg_conf.h b/libopkg/opkg_conf.h
similarity index 100%
rename from opkg_conf.h
rename to libopkg/opkg_conf.h
diff --git a/opkg_configure.c b/libopkg/opkg_configure.c
similarity index 100%
rename from opkg_configure.c
rename to libopkg/opkg_configure.c
diff --git a/opkg_configure.h b/libopkg/opkg_configure.h
similarity index 100%
rename from opkg_configure.h
rename to libopkg/opkg_configure.h
diff --git a/opkg_download.c b/libopkg/opkg_download.c
similarity index 100%
rename from opkg_download.c
rename to libopkg/opkg_download.c
diff --git a/opkg_download.h b/libopkg/opkg_download.h
similarity index 100%
rename from opkg_download.h
rename to libopkg/opkg_download.h
diff --git a/opkg_extract_test.c b/libopkg/opkg_extract_test.c
similarity index 100%
rename from opkg_extract_test.c
rename to libopkg/opkg_extract_test.c
diff --git a/opkg_hash_test.c b/libopkg/opkg_hash_test.c
similarity index 100%
rename from opkg_hash_test.c
rename to libopkg/opkg_hash_test.c
diff --git a/opkg_install.c b/libopkg/opkg_install.c
similarity index 100%
rename from opkg_install.c
rename to libopkg/opkg_install.c
diff --git a/opkg_install.h b/libopkg/opkg_install.h
similarity index 100%
rename from opkg_install.h
rename to libopkg/opkg_install.h
diff --git a/opkg_message.c b/libopkg/opkg_message.c
similarity index 100%
rename from opkg_message.c
rename to libopkg/opkg_message.c
diff --git a/opkg_message.h b/libopkg/opkg_message.h
similarity index 100%
rename from opkg_message.h
rename to libopkg/opkg_message.h
diff --git a/opkg_remove.c b/libopkg/opkg_remove.c
similarity index 100%
rename from opkg_remove.c
rename to libopkg/opkg_remove.c
diff --git a/opkg_remove.h b/libopkg/opkg_remove.h
similarity index 100%
rename from opkg_remove.h
rename to libopkg/opkg_remove.h
diff --git a/opkg_state.c b/libopkg/opkg_state.c
similarity index 100%
rename from opkg_state.c
rename to libopkg/opkg_state.c
diff --git a/opkg_state.h b/libopkg/opkg_state.h
similarity index 100%
rename from opkg_state.h
rename to libopkg/opkg_state.h
diff --git a/opkg_upgrade.c b/libopkg/opkg_upgrade.c
similarity index 100%
rename from opkg_upgrade.c
rename to libopkg/opkg_upgrade.c
diff --git a/opkg_upgrade.h b/libopkg/opkg_upgrade.h
similarity index 100%
rename from opkg_upgrade.h
rename to libopkg/opkg_upgrade.h
diff --git a/opkg_utils.c b/libopkg/opkg_utils.c
similarity index 100%
rename from opkg_utils.c
rename to libopkg/opkg_utils.c
diff --git a/opkg_utils.h b/libopkg/opkg_utils.h
similarity index 100%
rename from opkg_utils.h
rename to libopkg/opkg_utils.h
diff --git a/pkg.c b/libopkg/pkg.c
similarity index 100%
rename from pkg.c
rename to libopkg/pkg.c
diff --git a/pkg.h b/libopkg/pkg.h
similarity index 100%
rename from pkg.h
rename to libopkg/pkg.h
diff --git a/pkg_depends.c b/libopkg/pkg_depends.c
similarity index 100%
rename from pkg_depends.c
rename to libopkg/pkg_depends.c
diff --git a/pkg_depends.h b/libopkg/pkg_depends.h
similarity index 100%
rename from pkg_depends.h
rename to libopkg/pkg_depends.h
diff --git a/pkg_dest.c b/libopkg/pkg_dest.c
similarity index 100%
rename from pkg_dest.c
rename to libopkg/pkg_dest.c
diff --git a/pkg_dest.h b/libopkg/pkg_dest.h
similarity index 100%
rename from pkg_dest.h
rename to libopkg/pkg_dest.h
diff --git a/pkg_dest_list.c b/libopkg/pkg_dest_list.c
similarity index 100%
rename from pkg_dest_list.c
rename to libopkg/pkg_dest_list.c
diff --git a/pkg_dest_list.h b/libopkg/pkg_dest_list.h
similarity index 100%
rename from pkg_dest_list.h
rename to libopkg/pkg_dest_list.h
diff --git a/pkg_extract.c b/libopkg/pkg_extract.c
similarity index 100%
rename from pkg_extract.c
rename to libopkg/pkg_extract.c
diff --git a/pkg_extract.h b/libopkg/pkg_extract.h
similarity index 100%
rename from pkg_extract.h
rename to libopkg/pkg_extract.h
diff --git a/pkg_hash.c b/libopkg/pkg_hash.c
similarity index 100%
rename from pkg_hash.c
rename to libopkg/pkg_hash.c
diff --git a/pkg_hash.h b/libopkg/pkg_hash.h
similarity index 100%
rename from pkg_hash.h
rename to libopkg/pkg_hash.h
diff --git a/pkg_parse.c b/libopkg/pkg_parse.c
similarity index 100%
rename from pkg_parse.c
rename to libopkg/pkg_parse.c
diff --git a/pkg_parse.h b/libopkg/pkg_parse.h
similarity index 100%
rename from pkg_parse.h
rename to libopkg/pkg_parse.h
diff --git a/pkg_src.c b/libopkg/pkg_src.c
similarity index 100%
rename from pkg_src.c
rename to libopkg/pkg_src.c
diff --git a/pkg_src.h b/libopkg/pkg_src.h
similarity index 100%
rename from pkg_src.h
rename to libopkg/pkg_src.h
diff --git a/pkg_src_list.c b/libopkg/pkg_src_list.c
similarity index 100%
rename from pkg_src_list.c
rename to libopkg/pkg_src_list.c
diff --git a/pkg_src_list.h b/libopkg/pkg_src_list.h
similarity index 100%
rename from pkg_src_list.h
rename to libopkg/pkg_src_list.h
diff --git a/pkg_vec.c b/libopkg/pkg_vec.c
similarity index 100%
rename from pkg_vec.c
rename to libopkg/pkg_vec.c
diff --git a/pkg_vec.h b/libopkg/pkg_vec.h
similarity index 100%
rename from pkg_vec.h
rename to libopkg/pkg_vec.h
diff --git a/sprintf_alloc.c b/libopkg/sprintf_alloc.c
similarity index 100%
rename from sprintf_alloc.c
rename to libopkg/sprintf_alloc.c
diff --git a/sprintf_alloc.h b/libopkg/sprintf_alloc.h
similarity index 100%
rename from sprintf_alloc.h
rename to libopkg/sprintf_alloc.h
diff --git a/str_list.c b/libopkg/str_list.c
similarity index 100%
rename from str_list.c
rename to libopkg/str_list.c
diff --git a/str_list.h b/libopkg/str_list.h
similarity index 100%
rename from str_list.h
rename to libopkg/str_list.h
diff --git a/str_util.c b/libopkg/str_util.c
similarity index 100%
rename from str_util.c
rename to libopkg/str_util.c
diff --git a/str_util.h b/libopkg/str_util.h
similarity index 100%
rename from str_util.h
rename to libopkg/str_util.h
diff --git a/user.c b/libopkg/user.c
similarity index 100%
rename from user.c
rename to libopkg/user.c
diff --git a/user.h b/libopkg/user.h
similarity index 100%
rename from user.h
rename to libopkg/user.h
diff --git a/void_list.c b/libopkg/void_list.c
similarity index 100%
rename from void_list.c
rename to libopkg/void_list.c
diff --git a/void_list.h b/libopkg/void_list.h
similarity index 100%
rename from void_list.h
rename to libopkg/void_list.h
diff --git a/xregex.c b/libopkg/xregex.c
similarity index 100%
rename from xregex.c
rename to libopkg/xregex.c
diff --git a/xregex.h b/libopkg/xregex.h
similarity index 100%
rename from xregex.h
rename to libopkg/xregex.h
diff --git a/xsystem.c b/libopkg/xsystem.c
similarity index 100%
rename from xsystem.c
rename to libopkg/xsystem.c
diff --git a/xsystem.h b/libopkg/xsystem.h
similarity index 100%
rename from xsystem.h
rename to libopkg/xsystem.h
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..dbb3869
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,10 @@
+
+bin_PROGRAMS = opkg-cl
+
+#lib_LTLIBRARIES = libopkg.la
+opkg_cl_SOURCES = opkg-frontend.c
+opkg_cl_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS)
+opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \
+                $(top_builddir)/libbb/libbb.la 
+
+
diff --git a/opkg-frontend.c b/src/opkg-frontend.c
similarity index 100%
rename from opkg-frontend.c
rename to src/opkg-frontend.c
-- 
2.25.1