Improve use of pkg-config

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 45a85af82597b50324234a3618e21ecc16d1c9b5..8f6dc96bb38ed3ad9b211fe4ca686a04740ed84d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ endif
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 7:0:0 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 8:0:1 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =            \
        src/add_image.c         \
@@ -120,11 +120,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)
@@ -143,7 +144,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      \
@@ -155,11 +156,13 @@ endif
 install-exec-hook:
        if [ "@IMAGEX_PROGNAME@" != imagex ]; then \
                cd $(DESTDIR)$(bindir) && mv -f imagex "@IMAGEX_PROGNAME@"; \
+               cd $(DESTDIR)$(bindir) && ln -s "@IMAGEX_PROGNAME@" imagex; \
        fi
 
 uninstall-hook:
        if [ "@IMAGEX_PROGNAME@" != imagex ]; then \
                cd $(DESTDIR)$(bindir) && rm -f "@IMAGEX_PROGNAME@"; \
+               cd $(DESTDIR)$(bindir) && rm -f imagex; \
        fi
 
 dist_bin_SCRIPTS = programs/mkwinpeimg