Rename src/ to opkg-opk/

22 files changed, 12 insertions, 13 deletions

diff --git a/Makefile.am b/Makefile.am
index af93eb3..3a68526 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,24 +40,24 @@ endif
 #   * Our release target
 PACKAGE_STRING = $(PACKAGE_NAME) $(PACKAGE_VERSION)$(PACKAGE_VERSION_GIT)
 
-bin_PROGRAMS = src/opkg-opk
+bin_PROGRAMS = opkg-opk/opkg-opk
 
 if WITH_HELPERS
 helpers_PROGRAMS = helpers/mknod
 endif
 
-src_opkg_opk_SOURCES =
-src_opkg_opk_CFLAGS = \
+opkg_opk_opkg_opk_SOURCES =
+opkg_opk_opkg_opk_CFLAGS = \
 	$(WARN_CFLAGS) \
 	$(ASAN_CFLAGS)
-src_opkg_opk_CPPFLAGS = \
+opkg_opk_opkg_opk_CPPFLAGS = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	$(ZLIB_CFLAGS)
-src_opkg_opk_LDADD = \
+opkg_opk_opkg_opk_LDADD = \
 	$(ASAN_CFLAGS) \
 	$(ZLIB_LIBS)
-src_opkg_opk_LINK = $(LINK) version.c
-EXTRA_src_opkg_opk_DEPENDENCIES = version.c
+opkg_opk_opkg_opk_LINK = $(LINK) version.c
+EXTRA_opkg_opk_opkg_opk_DEPENDENCIES = version.c
 
 helpers_mknod_CFLAGS = \
 	$(WARN_CFLAGS) \
@@ -71,7 +71,7 @@ CLEANFILES = version.c
 CONFIG_CLEAN_FILES =
 EXTRA_DIST = build-aux/config.rpath autogen.sh
 
-version.c: $(src_opkg_opk_OBJECTS) $(src_opkg_opk_DEPENDENCIES)
+version.c: $(opkg_opk_opkg_opk_OBJECTS) $(opkg_opk_opkg_opk_DEPENDENCIES)
 	$(AM_V_GEN)printf 'const char *PACKAGE_VERSION_GIT = "%s";\n' \
 		"$(PACKAGE_VERSION_GIT)" >version.c
 
@@ -116,7 +116,7 @@ release:
 	'$(srcdir)/scripts/announce-release.sh' \
 		$(PACKAGE) $(VERSION) '$(PACKAGE_NAME)'
 
-include $(top_srcdir)/src/local.mk
+include $(top_srcdir)/opkg-opk/local.mk
 include $(top_srcdir)/helpers/local.mk
 include $(top_srcdir)/tests/local.mk
 
diff --git a/TODO b/TODO
index 2bc75f0..f55be81 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
-`git mv src/ opkg-opk/` and update build system
 `mkdir common/ && git mv src/defs.h helpers/mode.[ch] common/ && \
 	git rm helpers/defs.h` and update build system and sources
 Write `common/error.[ch]`:
diff --git a/configure.ac b/configure.ac
index c7dbab8..dfa7dcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_INIT([opkg-opk], [1.0.0], [mailto:proteanos-dev@lists.proteanos.com],
 	[opkg-opk])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_SRCDIR([opkg-opk/main.c])
 
 AM_INIT_AUTOMAKE([gnu check-news dist-bzip2 dist-xz subdir-objects])
 AM_SILENT_RULES([yes])
diff --git a/src/.gitignore b/opkg-opk/.gitignore
index e0f5f90..e0f5f90 100644
--- a/src/.gitignore
+++ b/opkg-opk/.gitignore
diff --git a/src/defs.h b/opkg-opk/defs.h
index 24e9776..24e9776 100644
--- a/src/defs.h
+++ b/opkg-opk/defs.h
diff --git a/src/dirent.c b/opkg-opk/dirent.c
index 575e834..575e834 100644
--- a/src/dirent.c
+++ b/opkg-opk/dirent.c
diff --git a/src/dirent.h b/opkg-opk/dirent.h
index 959ca1b..959ca1b 100644
--- a/src/dirent.h
+++ b/opkg-opk/dirent.h
diff --git a/src/gzip.c b/opkg-opk/gzip.c
index 819a4e9..819a4e9 100644
--- a/src/gzip.c
+++ b/opkg-opk/gzip.c
diff --git a/src/gzip.h b/opkg-opk/gzip.h
index 2f91000..2f91000 100644
--- a/src/gzip.h
+++ b/opkg-opk/gzip.h
diff --git a/src/i18n.h b/opkg-opk/i18n.h
index 4d8ee76..4d8ee76 100644
--- a/src/i18n.h
+++ b/opkg-opk/i18n.h
diff --git a/src/local.mk b/opkg-opk/local.mk
index 72f6ef4..5fbfd8e 100644
--- a/src/local.mk
+++ b/opkg-opk/local.mk
@@ -1,4 +1,4 @@
-src_opkg_opk_SOURCES += \
+opkg_opk_opkg_opk_SOURCES += \
 	%reldir%/defs.h \
 	%reldir%/dirent.c \
 	%reldir%/dirent.h \
diff --git a/src/main.c b/opkg-opk/main.c
index b33c268..b33c268 100644
--- a/src/main.c
+++ b/opkg-opk/main.c
diff --git a/src/opk.c b/opkg-opk/opk.c
index 457f7fa..457f7fa 100644
--- a/src/opk.c
+++ b/opkg-opk/opk.c
diff --git a/src/opk.h b/opkg-opk/opk.h
index c987431..c987431 100644
--- a/src/opk.h
+++ b/opkg-opk/opk.h
diff --git a/src/opk/local.mk b/opkg-opk/opk/local.mk
index 9335153..42fa62a 100644
--- a/src/opk/local.mk
+++ b/opkg-opk/opk/local.mk
@@ -1,4 +1,4 @@
-src_opkg_opk_SOURCES += \
+opkg_opk_opkg_opk_SOURCES += \
 	%reldir%/opk.h \
 	%reldir%/read.c \
 	%reldir%/write.c
diff --git a/src/opk/opk.h b/opkg-opk/opk/opk.h
index 93f9dfe..93f9dfe 100644
--- a/src/opk/opk.h
+++ b/opkg-opk/opk/opk.h
diff --git a/src/opk/read.c b/opkg-opk/opk/read.c
index 21fbc66..21fbc66 100644
--- a/src/opk/read.c
+++ b/opkg-opk/opk/read.c
diff --git a/src/opk/write.c b/opkg-opk/opk/write.c
index 284b625..284b625 100644
--- a/src/opk/write.c
+++ b/opkg-opk/opk/write.c
diff --git a/src/specials.c b/opkg-opk/specials.c
index b13ff86..b13ff86 100644
--- a/src/specials.c
+++ b/opkg-opk/specials.c
diff --git a/src/specials.h b/opkg-opk/specials.h
index f69ae51..f69ae51 100644
--- a/src/specials.h
+++ b/opkg-opk/specials.h
diff --git a/src/ustar.c b/opkg-opk/ustar.c
index 2b26ed1..2b26ed1 100644
--- a/src/ustar.c
+++ b/opkg-opk/ustar.c
diff --git a/src/ustar.h b/opkg-opk/ustar.h
index 4a3dc1a..4a3dc1a 100644
--- a/src/ustar.h
+++ b/opkg-opk/ustar.h