diff options
Diffstat (limited to 'partx')
| -rw-r--r-- | partx/Makefile | 15 | ||||
| -rw-r--r-- | partx/Makefile.am | 8 | ||||
| -rw-r--r-- | partx/Makefile.in | 569 | ||||
| -rw-r--r-- | partx/addpart.c | 3 | ||||
| -rw-r--r-- | partx/delpart.c | 3 | ||||
| -rw-r--r-- | partx/gpt.h | 2 | ||||
| -rw-r--r-- | partx/partx.c | 5 |
7 files changed, 588 insertions, 17 deletions
diff --git a/partx/Makefile b/partx/Makefile deleted file mode 100644 index 9f9a9dbe..00000000 --- a/partx/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -OBJ = bsd.o dos.o partx.o solaris.o unixware.o gpt.o crc32.o -CFLAGS += -Wall - -all: addpart delpart partx - -partx: $(OBJ) - -addpart: addpart.o - -delpart: delpart.o - -clean: - rm -f $(OBJ) addpart.o delpart.o addpart delpart partx *~ - -$(OBJ): partx.h diff --git a/partx/Makefile.am b/partx/Makefile.am new file mode 100644 index 00000000..6c452a29 --- /dev/null +++ b/partx/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/config/include-Makefile.am + +if BUILD_PARTX + +usrsbin_PROGRAMS = addpart delpart partx +partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c + +endif diff --git a/partx/Makefile.in b/partx/Makefile.in new file mode 100644 index 00000000..9ab9edc4 --- /dev/null +++ b/partx/Makefile.in @@ -0,0 +1,569 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/config/include-Makefile.am +@BUILD_PARTX_TRUE@usrsbin_PROGRAMS = addpart$(EXEEXT) delpart$(EXEEXT) \ +@BUILD_PARTX_TRUE@ partx$(EXEEXT) +subdir = partx +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(usrsbindir)" +usrsbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(usrsbin_PROGRAMS) +addpart_SOURCES = addpart.c +addpart_OBJECTS = addpart.$(OBJEXT) +addpart_LDADD = $(LDADD) +delpart_SOURCES = delpart.c +delpart_OBJECTS = delpart.$(OBJEXT) +delpart_LDADD = $(LDADD) +am__partx_SOURCES_DIST = bsd.c dos.c partx.c solaris.c unixware.c \ + gpt.c crc32.c +@BUILD_PARTX_TRUE@am_partx_OBJECTS = bsd.$(OBJEXT) dos.$(OBJEXT) \ +@BUILD_PARTX_TRUE@ partx.$(OBJEXT) solaris.$(OBJEXT) \ +@BUILD_PARTX_TRUE@ unixware.$(OBJEXT) gpt.$(OBJEXT) \ +@BUILD_PARTX_TRUE@ crc32.$(OBJEXT) +partx_OBJECTS = $(am_partx_OBJECTS) +partx_LDADD = $(LDADD) +depcomp = $(SHELL) $(top_srcdir)/config/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = addpart.c delpart.c $(partx_SOURCES) +DIST_SOURCES = addpart.c delpart.c $(am__partx_SOURCES_DIST) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ +BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ +BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ +BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ +BUILD_INIT_TRUE = @BUILD_INIT_TRUE@ +BUILD_KILL_FALSE = @BUILD_KILL_FALSE@ +BUILD_KILL_TRUE = @BUILD_KILL_TRUE@ +BUILD_LAST_FALSE = @BUILD_LAST_FALSE@ +BUILD_LAST_TRUE = @BUILD_LAST_TRUE@ +BUILD_LOGIN_UTILS_FALSE = @BUILD_LOGIN_UTILS_FALSE@ +BUILD_LOGIN_UTILS_TRUE = @BUILD_LOGIN_UTILS_TRUE@ +BUILD_MESG_FALSE = @BUILD_MESG_FALSE@ +BUILD_MESG_TRUE = @BUILD_MESG_TRUE@ +BUILD_PARTX_FALSE = @BUILD_PARTX_FALSE@ +BUILD_PARTX_TRUE = @BUILD_PARTX_TRUE@ +BUILD_RAW_FALSE = @BUILD_RAW_FALSE@ +BUILD_RAW_TRUE = @BUILD_RAW_TRUE@ +BUILD_RDEV_FALSE = @BUILD_RDEV_FALSE@ +BUILD_RDEV_TRUE = @BUILD_RDEV_TRUE@ +BUILD_RENAME_FALSE = @BUILD_RENAME_FALSE@ +BUILD_RENAME_TRUE = @BUILD_RENAME_TRUE@ +BUILD_RESET_FALSE = @BUILD_RESET_FALSE@ +BUILD_RESET_TRUE = @BUILD_RESET_TRUE@ +BUILD_SCHEDUTILS_FALSE = @BUILD_SCHEDUTILS_FALSE@ +BUILD_SCHEDUTILS_TRUE = @BUILD_SCHEDUTILS_TRUE@ +BUILD_WALL_FALSE = @BUILD_WALL_FALSE@ +BUILD_WALL_TRUE = @BUILD_WALL_TRUE@ +BUILD_WRITE_FALSE = @BUILD_WRITE_FALSE@ +BUILD_WRITE_TRUE = @BUILD_WRITE_TRUE@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GMSGFMT = @GMSGFMT@ +HAVE_BLKID_FALSE = @HAVE_BLKID_FALSE@ +HAVE_BLKID_TRUE = @HAVE_BLKID_TRUE@ +HAVE_LIBUTIL_FALSE = @HAVE_LIBUTIL_FALSE@ +HAVE_LIBUTIL_TRUE = @HAVE_LIBUTIL_TRUE@ +HAVE_NCURSES_FALSE = @HAVE_NCURSES_FALSE@ +HAVE_NCURSES_TRUE = @HAVE_NCURSES_TRUE@ +HAVE_PAM_FALSE = @HAVE_PAM_FALSE@ +HAVE_PAM_TRUE = @HAVE_PAM_TRUE@ +HAVE_PIVOT_ROOT_FALSE = @HAVE_PIVOT_ROOT_FALSE@ +HAVE_PIVOT_ROOT_TRUE = @HAVE_PIVOT_ROOT_TRUE@ +HAVE_RAW_FALSE = @HAVE_RAW_FALSE@ +HAVE_RAW_TRUE = @HAVE_RAW_TRUE@ +HAVE_SELINUX_FALSE = @HAVE_SELINUX_FALSE@ +HAVE_SELINUX_TRUE = @HAVE_SELINUX_TRUE@ +HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ +HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ +HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ +HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ +HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ +HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTEL_FALSE = @INTEL_FALSE@ +INTEL_TRUE = @INTEL_TRUE@ +INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NEED_LIBCRYPT_FALSE = @NEED_LIBCRYPT_FALSE@ +NEED_LIBCRYPT_TRUE = @NEED_LIBCRYPT_TRUE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SPARC_FALSE = @SPARC_FALSE@ +SPARC_TRUE = @SPARC_TRUE@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +USE_SLANG_FALSE = @USE_SLANG_FALSE@ +USE_SLANG_TRUE = @USE_SLANG_TRUE@ +USE_TTY_GROUP_FALSE = @USE_TTY_GROUP_FALSE@ +USE_TTY_GROUP_TRUE = @USE_TTY_GROUP_TRUE@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = $(prefix)/usr/share +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = $(datadir)/info +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = $(datadir)/man +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +usrbindir = $(prefix)/usr/bin +usrsbindir = $(prefix)/usr/sbin +AM_CPPFLAGS = -include ../config.h -I$(top_srcdir)/include +DEFAULT_INCLUDES = +@BUILD_PARTX_TRUE@partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/config/include-Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign partx/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign partx/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-usrsbinPROGRAMS: $(usrsbin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(usrsbindir)" || $(mkdir_p) "$(DESTDIR)$(usrsbindir)" + @list='$(usrsbin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrsbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(usrsbindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usrsbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(usrsbindir)/$$f" || exit 1; \ + else :; fi; \ + done + +uninstall-usrsbinPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(usrsbin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f '$(DESTDIR)$(usrsbindir)/$$f'"; \ + rm -f "$(DESTDIR)$(usrsbindir)/$$f"; \ + done + +clean-usrsbinPROGRAMS: + @list='$(usrsbin_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done + +installcheck-usrsbinPROGRAMS: $(usrsbin_PROGRAMS) + bad=0; pid=$$$$; list="$(usrsbin_PROGRAMS)"; for p in $$list; do \ + case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ + *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ + esac; \ + f=`echo "$$p" | \ + sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for opt in --help --version; do \ + if "$(DESTDIR)$(usrsbindir)/$$f" $$opt >c$${pid}_.out \ + 2>c$${pid}_.err </dev/null \ + && test -n "`cat c$${pid}_.out`" \ + && test -z "`cat c$${pid}_.err`"; then :; \ + else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ + done; \ + done; rm -f c$${pid}_.???; exit $$bad +addpart$(EXEEXT): $(addpart_OBJECTS) $(addpart_DEPENDENCIES) + @rm -f addpart$(EXEEXT) + $(LINK) $(addpart_LDFLAGS) $(addpart_OBJECTS) $(addpart_LDADD) $(LIBS) +delpart$(EXEEXT): $(delpart_OBJECTS) $(delpart_DEPENDENCIES) + @rm -f delpart$(EXEEXT) + $(LINK) $(delpart_LDFLAGS) $(delpart_OBJECTS) $(delpart_LDADD) $(LIBS) +partx$(EXEEXT): $(partx_OBJECTS) $(partx_DEPENDENCIES) + @rm -f partx$(EXEEXT) + $(LINK) $(partx_LDFLAGS) $(partx_OBJECTS) $(partx_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addpart.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/delpart.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dos.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpt.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/partx.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solaris.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unixware.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/../config + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(usrsbindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-usrsbinPROGRAMS \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-usrsbinPROGRAMS + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: installcheck-usrsbinPROGRAMS + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-usrsbinPROGRAMS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-usrsbinPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip install-usrsbinPROGRAMS installcheck \ + installcheck-am installcheck-usrsbinPROGRAMS installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-info-am uninstall-usrsbinPROGRAMS + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/partx/addpart.c b/partx/addpart.c index 11d4305b..004fee53 100644 --- a/partx/addpart.c +++ b/partx/addpart.c @@ -3,6 +3,9 @@ #include <fcntl.h> #include <stdlib.h> #include <sys/ioctl.h> +#ifdef HAVE_LINUX_COMPILER_H +#include <linux/compiler.h> +#endif #include <linux/blkpg.h> int diff --git a/partx/delpart.c b/partx/delpart.c index 8504c022..9dca7467 100644 --- a/partx/delpart.c +++ b/partx/delpart.c @@ -3,6 +3,9 @@ #include <fcntl.h> #include <stdlib.h> #include <sys/ioctl.h> +#ifdef HAVE_LINUX_COMPILER_H +#include <linux/compiler.h> +#endif #include <linux/blkpg.h> int diff --git a/partx/gpt.h b/partx/gpt.h index d0a81f5f..39814b5d 100644 --- a/partx/gpt.h +++ b/partx/gpt.h @@ -36,7 +36,7 @@ #define MSDOS_MBR_SIGNATURE 0xaa55 #define GPT_BLOCK_SIZE 512 -#define GPT_HEADER_SIGNATURE 0x5452415020494645 +#define GPT_HEADER_SIGNATURE 0x5452415020494645ULL #define GPT_HEADER_REVISION_V1_02 0x00010200 #define GPT_HEADER_REVISION_V1_00 0x00010000 #define GPT_HEADER_REVISION_V0_99 0x00009900 diff --git a/partx/partx.c b/partx/partx.c index 5fb56f33..6448e8c6 100644 --- a/partx/partx.c +++ b/partx/partx.c @@ -38,6 +38,9 @@ #include <unistd.h> #include <sys/ioctl.h> #include <linux/hdreg.h> /* HDIO_GETGEO */ +#ifdef HAVE_LINUX_COMPILER_H +#include <linux/compiler.h> +#endif #include <linux/blkpg.h> #define BLKGETSIZE _IO(0x12,96) /* return device size */ @@ -316,7 +319,7 @@ main(int argc, char **argv){ return 0; } -void * +static void * xmalloc (size_t size) { void *t; |