include: move swapheader.h to include

[kzak@redhat.com: add ifndef _SWAPHEADER_H]

Signed-off-by: Matthias Koenig <mkoenig@suse.de>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index f2d62452788396f61adc9e73c8feb73924ed9977..c005ed5903932294288b4192748e27ff4e712d0e 100644 (file)
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -12,7 +12,7 @@ sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs
 fsck_minix_SOURCES = fsck.minix.c bitops.h minix.h
 mkfs_minix_SOURCES = mkfs.minix.c bitops.h minix.h $(utils_common)
 mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common)
-mkswap_SOURCES = mkswap.c swapheader.h $(utils_common)
+mkswap_SOURCES = mkswap.c $(utils_common)
 
 usrbinexec_PROGRAMS = isosize
 usrsbinexec_PROGRAMS =

diff --git a/disk-utils/swapheader.h b/include/swapheader.h
similarity index 87%
rename from disk-utils/swapheader.h
rename to include/swapheader.h
index 9411e3d2d39f3ab6d7a6d66310895f71ccafd776..6ff5390f5b0b218fcdbc4f95b701a2430fc81b67 100644 (file)
--- a/disk-utils/swapheader.h
+++ b/include/swapheader.h
@@ -1,3 +1,6 @@
+#ifndef _SWAPHEADER_H
+#define _SWAPHEADER_H
+
 struct swap_header_v1 {
         char         bootbits[1024];    /* Space for disklabel etc. */
        unsigned int version;
@@ -17,3 +20,5 @@ struct swap_header_v1_2 {
        unsigned int  padding[117];
        unsigned int  badpages[1];
 };
+
+#endif /* _SWAPHEADER_H */