imagex-capture.1.in: Clarify --update-of slightly

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a5cd05408b704c741f8931e79d277aee00ffe159..d2e80a2f4826c15db6e969d4599d7684b3dc54e2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,20 @@ ACLOCAL_AMFLAGS = -I m4
 
 AM_CPPFLAGS    = -I$(top_srcdir)/include $(WINDOWS_CPPFLAGS) \
                  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-AM_CFLAGS      = -std=gnu99 -fno-strict-aliasing \
-                 -Wmissing-prototypes -Wstrict-prototypes
+
+AM_CFLAGS      = -std=gnu99 -Wmissing-prototypes -Wstrict-prototypes   \
+                 -Werror-implicit-function-declaration                 \
+                 -fno-common -Wundef -Wno-pointer-sign
+
+if WINDOWS_NATIVE_BUILD
+# This option is needed to make packed structures work as expected
+# with gcc 4.7+ (mingw) on Windows.
+AM_CFLAGS += -mno-ms-bitfields
+endif
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 7:0:0 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 9:0:0 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =            \
        src/add_image.c         \
@@ -37,7 +45,6 @@ libwim_la_SOURCES =           \
        src/security.c          \
        src/sha1.c              \
        src/split.c             \
-       src/swm.c               \
        src/reparse.c           \
        src/timestamp.c         \
        src/update_image.c      \
@@ -50,7 +57,6 @@ libwim_la_SOURCES =           \
        src/xpress-decompress.c \
        include/wimlib/apply.h          \
        include/wimlib/assert.h         \
-       include/wimlib/buffer_io.h      \
        include/wimlib/callback.h       \
        include/wimlib/capture.h        \
        include/wimlib/compiler.h       \
@@ -61,6 +67,7 @@ libwim_la_SOURCES =           \
        include/wimlib/endianness.h     \
        include/wimlib/error.h          \
        include/wimlib/file_io.h        \
+       include/wimlib/glob.h           \
        include/wimlib/header.h         \
        include/wimlib/integrity.h      \
        include/wimlib/list.h           \
@@ -73,7 +80,6 @@ libwim_la_SOURCES =           \
        include/wimlib/resource.h       \
        include/wimlib/security.h       \
        include/wimlib/sha1.h           \
-       include/wimlib/swm.h            \
        include/wimlib/timestamp.h      \
        include/wimlib/types.h          \
        include/wimlib/util.h           \
@@ -113,11 +119,12 @@ sha1-ssse3.lo:src/sha1-ssse3.asm
        $<
 
 libwim_la_LIBADD =             \
-       $(LIBXML2_LDADD)        \
-       $(LIBFUSE_LDADD)        \
-       $(LIBNTFS_3G_LDADD)     \
+       $(LIBXML2_LIBS)         \
+       $(LIBFUSE_LIBS)         \
+       $(LIBRT_LIBS)           \
+       $(LIBNTFS_3G_LIBS)      \
        $(LTLIBICONV)           \
-       $(LIBCRYPTO_LDADD)      \
+       $(LIBCRYPTO_LIBS)       \
        $(SSSE3_SHA1_OBJ)       \
        $(PTHREAD_LDADD)        \
        $(WINDOWS_LDADD)
@@ -136,7 +143,7 @@ imagex_SOURCES   = programs/imagex.c        \
                   include/wimlib.h     \
                   include/wimlib_tchar.h
 imagex_LDADD    = $(top_builddir)/libwim.la
-imagex_CFLAGS    = $(AM_CFLAGS) $(WINDOWS_CFLAGS)
+imagex_CFLAGS    = $(AM_CFLAGS) $(WINDOWS_CFLAGS) -Wno-deprecated-declarations
 
 if WINDOWS_NATIVE_BUILD
 imagex_SOURCES += programs/imagex-win32.c      \
@@ -145,15 +152,49 @@ imagex_SOURCES += programs/imagex-win32.c \
                  programs/wgetopt.h
 endif
 
+imagex_cmds =  append  \
+               apply   \
+               capture \
+               delete  \
+               dir     \
+               export  \
+               extract \
+               info    \
+               join    \
+               mount   \
+               mountrw \
+               optimize\
+               split   \
+               unmount \
+               update
+
 install-exec-hook:
-       if [ "@IMAGEX_PROGNAME@" != imagex ]; then \
+       if [ "@IMAGEX_PROGNAME@" != imagex ]; then                          \
                cd $(DESTDIR)$(bindir) && mv -f imagex "@IMAGEX_PROGNAME@"; \
        fi
+       for cmd in $(imagex_cmds); do                           \
+               cd $(DESTDIR)$(bindir) &&                       \
+                       ln -f "@IMAGEX_PROGNAME@" wim$${cmd};   \
+       done
+
+install-data-hook:
+       for cmd in $(imagex_cmds); do                                       \
+               cd $(DESTDIR)$(mandir)/man1 &&                              \
+                       ln -sf "@IMAGEX_PROGNAME@-$${cmd}.1" wim$${cmd}.1;  \
+       done
 
 uninstall-hook:
-       if [ "@IMAGEX_PROGNAME@" != imagex ]; then \
-               cd $(DESTDIR)$(bindir) && rm -f "@IMAGEX_PROGNAME@"; \
+       if [ "@IMAGEX_PROGNAME@" != imagex ]; then              \
+               rm -f $(DESTDIR)$(bindir)/"@IMAGEX_PROGNAME@";  \
+               rm -f $(DESTDIR)$(bindir)/imagex;               \
        fi
+       for cmd in $(imagex_cmds); do                           \
+               rm -f $(DESTDIR)$(bindir)/wim$${cmd};           \
+       done
+       for cmd in $(imagex_cmds); do                           \
+               rm -f $(DESTDIR)$(mandir)/man1/wim$${cmd}.1;    \
+       done
+
 
 dist_bin_SCRIPTS = programs/mkwinpeimg
 
@@ -164,6 +205,7 @@ EXTRA_DIST =                                        \
        archlinux                               \
        debian                                  \
        rpm                                     \
+       examples                                \
        README.WINDOWS                          \
        programs/install.cmd                    \
        programs/wimapply.c                     \