Move stuff into a separate source directory.

diff --git a/Makefile.am b/Makefile.am
index b89ed90c00c24b85777c2548046b22018e8444cf..f8238b2370ae0a82a37bb0d8fc82e579bd9f2811 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,3 @@
 ACLOCAL_AMFLAGS = -I m4
 
-lib_LTLIBRARIES = libupkg.la
-bin_PROGRAMS = upkg
-
-libupkg_la_SOURCES = libupkg.c pack.c
-include_HEADERS = upkg.h
-noinst_HEADERS = pack.h
-
-upkg_SOURCES = upkg.c
-upkg_LDADD = libupkg.la
+SUBDIRS = src

diff --git a/configure.ac b/configure.ac
index 58638b4b42e7caa7f76e05e67c8fb64ddfd1ed5e..debf262d9d3f17ed199054266d429148981a5fbd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.62)
 AC_INIT([upkg],[0.1],[nbowler@draconx.ca])
-AC_CONFIG_SRCDIR([pack.c])
+AC_CONFIG_SRCDIR([src/libupkg.c])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -12,5 +12,6 @@ LT_INIT
 
 AC_CONFIG_FILES([
        Makefile
+       src/Makefile
 ])
 AC_OUTPUT

diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644 (file)
index 0000000..2002c43
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,9 @@
+lib_LTLIBRARIES = libupkg.la
+bin_PROGRAMS = upkg
+
+libupkg_la_SOURCES = libupkg.c pack.c
+include_HEADERS = upkg.h
+noinst_HEADERS = pack.h
+
+upkg_SOURCES = upkg.c
+upkg_LDADD = libupkg.la

diff --git a/libupkg.c b/src/libupkg.c
similarity index 100%
rename from libupkg.c
rename to src/libupkg.c

diff --git a/pack.c b/src/pack.c
similarity index 100%
rename from pack.c
rename to src/pack.c

diff --git a/pack.h b/src/pack.h
similarity index 100%
rename from pack.h
rename to src/pack.h

diff --git a/upkg.c b/src/upkg.c
similarity index 100%
rename from upkg.c
rename to src/upkg.c

diff --git a/upkg.h b/src/upkg.h
similarity index 59%
rename from upkg.h
rename to src/upkg.h
index f20f18e9f015392ce47451b6a9c16cc143978e76..514e1220f53b61e5789192b8cebcf8ec6dcdf45a 100644 (file)
--- a/upkg.h
+++ b/src/upkg.h
@@ -8,6 +8,16 @@
 #define UPKG_FLAG_INSECURE        0x0010
 #define UPKG_FLAG_REQUIRED        0x8000
 
+#define UPKG_OBJ_FLAG_TRANSACTIONAL   0x00000001
+#define UPKG_OBJ_FLAG_UNREACHABLE     0x00000002
+#define UPKG_OBJ_FLAG_PUBLIC          0x00000004
+#define UPKG_OBJ_FLAG_TAG_IMPORT      0x00000008
+#define UPKG_OBJ_FLAG_TAG_EXPORT      0x00000010
+#define UPKG_OBJ_FLAG_SOURCE_MODIFIED 0x00000020
+#define UPKG_OBJ_FLAG_TAG_GARBAGE     0x00000040
+#define UPKG_OBJ_FLAG_NEED_LOAD       0x00000200
+#define UPKG_OBJ_FLAG_HIGHLIGHT_NAME  0x00000400
+
 #define UPKG_HDR_MAGIC 0x9e2a83c1
 #define UPKG_HDR_SIZE  36