X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=Makefile.am;h=6d24bdf1126ad022a72c2e2ed9dd8eb95f8cf1d4;hp=87f8798279327b38de7fe70ec08c774c0af736c8;hb=bb6773105af4072cf0ce7e6c8276632d6110b03b;hpb=f92670dfbf287fdf14df44f5f6e642cb956b4510

diff --git a/Makefile.am b/Makefile.am
index 87f87982..6d24bdf1 100644
--- 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 9:0:0 $(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	\
@@ -152,17 +153,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@"; \
-		cd $(DESTDIR)$(bindir) && ln -s "@IMAGEX_PROGNAME@" imagex; \
 	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@"; \
-		cd $(DESTDIR)$(bindir) && rm -f imagex;	\
+	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