diff options
author | Jeremy Kerr <jeremy.kerr@canonical.com> | 2012-08-13 14:54:12 +0800 |
---|---|---|
committer | Jeremy Kerr <jeremy.kerr@canonical.com> | 2012-08-13 15:10:21 +0800 |
commit | c7ee5854393f599d755b4f560f1aaf1e3626f4aa (patch) | |
tree | 101b7038b67a0b1c0858f5ed1756f85095505849 | |
parent | 5466f381ddf04f407fcf1996a9c26642abd9f2fa (diff) | |
download | sbsigntools-c7ee5854393f599d755b4f560f1aaf1e3626f4aa.tar.gz |
Move sources to src/ subdirectory
We have a number of source files now, so move them from the top level to
src/
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
-rw-r--r-- | Makefile.am | 44 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | docs/Makefile.am | 10 | ||||
-rw-r--r-- | src/Makefile.am | 32 | ||||
-rw-r--r-- | src/coff/external.h (renamed from coff/external.h) | 0 | ||||
-rw-r--r-- | src/coff/pe.h (renamed from coff/pe.h) | 0 | ||||
-rw-r--r-- | src/efivars.h (renamed from efivars.h) | 0 | ||||
-rw-r--r-- | src/fileio.c (renamed from fileio.c) | 0 | ||||
-rw-r--r-- | src/fileio.h (renamed from fileio.h) | 0 | ||||
-rw-r--r-- | src/gen-keyfiles.c (renamed from gen-keyfiles.c) | 0 | ||||
-rw-r--r-- | src/idc.c (renamed from idc.c) | 0 | ||||
-rw-r--r-- | src/idc.h (renamed from idc.h) | 0 | ||||
-rw-r--r-- | src/image.c (renamed from image.c) | 0 | ||||
-rw-r--r-- | src/image.h (renamed from image.h) | 0 | ||||
-rw-r--r-- | src/libcoff.h (renamed from libcoff.h) | 0 | ||||
-rw-r--r-- | src/sbattach.c (renamed from sbattach.c) | 0 | ||||
-rw-r--r-- | src/sbsiglist.c (renamed from sbsiglist.c) | 0 | ||||
-rw-r--r-- | src/sbsign.c (renamed from sbsign.c) | 0 | ||||
-rw-r--r-- | src/sbvarsign.c (renamed from sbvarsign.c) | 0 | ||||
-rw-r--r-- | src/sbverify.c (renamed from sbverify.c) | 0 | ||||
-rw-r--r-- | src/verify.c (renamed from verify.c) | 0 | ||||
-rwxr-xr-x | tests/test-wrapper.sh | 2 |
22 files changed, 47 insertions, 46 deletions
diff --git a/Makefile.am b/Makefile.am index b6eee7e..d347e9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,44 +1,2 @@ -AM_CFLAGS = -Wall -Wextra --std=gnu99 - -bin_PROGRAMS = sbsign sbverify sbattach sbvarsign sbsiglist - -coff_headers = coff/external.h coff/pe.h - -common_SOURCES = idc.c idc.h image.c image.h fileio.c fileio.h \ - efivars.h $(coff_headers) -common_LDADD = lib/ccan/libccan.a $(libcrypto_LIBS) -common_CFLAGS = -I$(srcdir)/lib/ccan/ - -sbsign_SOURCES = sbsign.c $(common_SOURCES) -sbsign_LDADD = $(common_LDADD) -sbsign_CFLAGS = $(AM_CFLAGS) $(common_CFLAGS) - -sbverify_SOURCES = sbverify.c $(common_SOURCES) -sbverify_LDADD = $(common_LDADD) -sbverify_CFLAGS = $(AM_CFLAGS) $(common_CFLAGS) - -sbattach_SOURCES = sbattach.c $(common_SOURCES) -sbattach_LDADD = $(common_LDADD) -sbattach_CFLAGS = $(AM_CFLAGS) $(common_CFLAGS) - -sbvarsign_SOURCES = sbvarsign.c $(common_SOURCES) -sbvarsign_LDADD = $(common_LDADD) $(uuid_LIBS) -sbvarsign_CPPFLAGS = $(EFI_CPPFLAGS) -sbvarsign_CFLAGS = $(AM_CFLAGS) $(uuid_CFLAGS) $(common_CFLAGS) - -sbsiglist_SOURCES = sbsiglist.c $(common_SOURCES) -sbsiglist_LDADD = $(common_LDADD) $(uuid_LIBS) -sbsiglist_CPPFLAGS = $(EFI_CPPFLAGS) -sbsiglist_CFLAGS = $(AM_CFLAGS) $(common_CFLAGS) - -man1_MANS = docs/sbsign.1 docs/sbverify.1 docs/sbattach.1 - -EXTRA_DIST = docs/sbsign.1.in docs/sbverify.1.in docs/sbattach.1.in -CLEANFILES = $(man1_MANS) - -$(top_builddir)/docs/%.1: $(srcdir)/docs/%.1.in $(top_builddir)/% - $(MKDIR_P) $(@D) - $(HELP2MAN) --no-info -i $< -o $@ $(top_builddir)/$* - -SUBDIRS = lib/ccan . tests +SUBDIRS = lib/ccan src docs tests diff --git a/configure.ac b/configure.ac index 0a7f2db..6ca60d3 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AM_INIT_AUTOMAKE() AC_PREREQ(2.60) AC_CONFIG_HEADERS(config.h) -AC_CONFIG_SRCDIR(sbsign.c) +AC_CONFIG_SRCDIR(src/sbsign.c) AM_PROG_AS AC_PROG_CC @@ -73,5 +73,6 @@ AC_CHECK_HEADERS([efi.h], [], [], $EFI_INCLUDES) CPPFLAGS="$CPPFLAGS_save" AC_SUBST(EFI_CPPFLAGS, $EFI_CPPFLAGS) -AC_CONFIG_FILES([Makefile lib/ccan/Makefile tests/Makefile]) +AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile] + [docs/Makefile tests/Makefile]) AC_OUTPUT diff --git a/docs/Makefile.am b/docs/Makefile.am new file mode 100644 index 0000000..f6207f2 --- /dev/null +++ b/docs/Makefile.am @@ -0,0 +1,10 @@ + +man1_MANS = sbsign.1 sbverify.1 sbattach.1 + +EXTRA_DIST = sbsign.1.in sbverify.1.in sbattach.1.in +CLEANFILES = $(man1_MANS) + +$(builddir)/%.1: $(srcdir)/%.1.in $(top_builddir)/src/% + $(MKDIR_P) $(@D) + $(HELP2MAN) --no-info -i $< -o $@ $(top_builddir)/src/$* + diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..da7a6b9 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,32 @@ + +bin_PROGRAMS = sbsign sbverify sbattach sbvarsign sbsiglist + +coff_headers = coff/external.h coff/pe.h +AM_CFLAGS = -Wall -Wextra --std=gnu99 + +common_SOURCES = idc.c idc.h image.c image.h fileio.c fileio.h \ + efivars.h $(coff_headers) +common_LDADD = ../lib/ccan/libccan.a $(libcrypto_LIBS) +common_CFLAGS = -I$(top_srcdir)/lib/ccan/ + +sbsign_SOURCES = sbsign.c $(common_SOURCES) +sbsign_LDADD = $(common_LDADD) +sbsign_CFLAGS = $(AM_CFLAGS) $(common_CFLAGS) + +sbverify_SOURCES = sbverify.c $(common_SOURCES) +sbverify_LDADD = $(common_LDADD) +sbverify_CFLAGS = $(AM_CFLAGS) $(common_CFLAGS) + +sbattach_SOURCES = sbattach.c $(common_SOURCES) +sbattach_LDADD = $(common_LDADD) +sbattach_CFLAGS = $(AM_CFLAGS) $(common_CFLAGS) + +sbvarsign_SOURCES = sbvarsign.c $(common_SOURCES) +sbvarsign_LDADD = $(common_LDADD) $(uuid_LIBS) +sbvarsign_CPPFLAGS = $(EFI_CPPFLAGS) +sbvarsign_CFLAGS = $(AM_CFLAGS) $(uuid_CFLAGS) $(common_CFLAGS) + +sbsiglist_SOURCES = sbsiglist.c $(common_SOURCES) +sbsiglist_LDADD = $(common_LDADD) $(uuid_LIBS) +sbsiglist_CPPFLAGS = $(EFI_CPPFLAGS) +sbsiglist_CFLAGS = $(AM_CFLAGS) $(common_CFLAGS) diff --git a/coff/external.h b/src/coff/external.h index 4bf594d..4bf594d 100644 --- a/coff/external.h +++ b/src/coff/external.h diff --git a/coff/pe.h b/src/coff/pe.h index 601a68e..601a68e 100644 --- a/coff/pe.h +++ b/src/coff/pe.h diff --git a/efivars.h b/src/efivars.h index 8782714..8782714 100644 --- a/efivars.h +++ b/src/efivars.h diff --git a/gen-keyfiles.c b/src/gen-keyfiles.c index beb2707..beb2707 100644 --- a/gen-keyfiles.c +++ b/src/gen-keyfiles.c diff --git a/libcoff.h b/src/libcoff.h index bd58c82..bd58c82 100644 --- a/libcoff.h +++ b/src/libcoff.h diff --git a/sbattach.c b/src/sbattach.c index a363d83..a363d83 100644 --- a/sbattach.c +++ b/src/sbattach.c diff --git a/sbsiglist.c b/src/sbsiglist.c index ab52914..ab52914 100644 --- a/sbsiglist.c +++ b/src/sbsiglist.c diff --git a/sbvarsign.c b/src/sbvarsign.c index 5017203..5017203 100644 --- a/sbvarsign.c +++ b/src/sbvarsign.c diff --git a/sbverify.c b/src/sbverify.c index eeac4f1..eeac4f1 100644 --- a/sbverify.c +++ b/src/sbverify.c diff --git a/tests/test-wrapper.sh b/tests/test-wrapper.sh index bccd05a..d8d78e2 100755 --- a/tests/test-wrapper.sh +++ b/tests/test-wrapper.sh @@ -3,7 +3,7 @@ # set a few global variables that may be used by the test basedir=$(cd $srcdir && pwd) datadir=$(pwd) -bindir="$datadir/.." +bindir="$datadir/../src" sbsign=$bindir/sbsign sbverify=$bindir/sbverify |