From a9b51e6d85e077f8e18c35ac3606d80b343927e0 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sat, 6 Jun 2009 15:58:29 -0400 Subject: [PATCH] Move stuff into a separate source directory. --- Makefile.am | 10 +--------- configure.ac | 3 ++- src/Makefile.am | 9 +++++++++ libupkg.c => src/libupkg.c | 0 pack.c => src/pack.c | 0 pack.h => src/pack.h | 0 upkg.c => src/upkg.c | 0 upkg.h => src/upkg.h | 10 ++++++++++ 8 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 src/Makefile.am rename libupkg.c => src/libupkg.c (100%) rename pack.c => src/pack.c (100%) rename pack.h => src/pack.h (100%) rename upkg.c => src/upkg.c (100%) rename upkg.h => src/upkg.h (59%) diff --git a/Makefile.am b/Makefile.am index b89ed90..f8238b2 100644 --- 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 58638b4..debf262 100644 --- 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 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 f20f18e..514e122 100644 --- 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 -- 2.43.2