From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 16 Dec 2014 02:55:53 +0000 (-0600)
Subject: Makefile.am cleanup
X-Git-Tag: v1.7.4~20
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=20ca25765c07d23e82357dc29a52eefdd06a2382

Makefile.am cleanup
---

diff --git a/Makefile.am b/Makefile.am
index 56ff24f7..cc91d176 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,34 @@
+##############################################################################
+#				General					     #
+##############################################################################
+
+
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS	= -I$(top_srcdir)/include $(WINDOWS_CPPFLAGS) \
+AM_CPPFLAGS	= -I$(top_srcdir)/include $(PLATFORM_CPPFLAGS)	\
 		  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
-AM_CFLAGS	= -std=c99 -Wmissing-prototypes -Wstrict-prototypes	\
-		  -Werror-implicit-function-declaration			\
-		  -fno-common -Wundef -Wno-pointer-sign
+AM_CFLAGS	= -std=c99 $(PLATFORM_CFLAGS) -fno-common	\
+		  -Wmissing-prototypes -Wstrict-prototypes	\
+		  -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
+AM_LDFLAGS	= $(PLATFORM_LDFLAGS)
+
+EXTRA_DIST	= README README.WINDOWS				\
+		  COPYING COPYING.GPLv3	COPYING.LGPLv3		\
+		  examples					\
+		  archlinux debian rpm
+
+##############################################################################
+#				Library					     #
+##############################################################################
 
 lib_LTLIBRARIES = libwim.la
+include_HEADERS = include/wimlib.h
 
-libwim_la_LDFLAGS = -version-info 18:0:3 $(WINDOWS_LDFLAGS)
+pkgconfigdir	= @pkgconfigdir@
+pkgconfig_DATA	= wimlib.pc
+wimlib.pc: config.status
 
 libwim_la_SOURCES =		\
 	src/add_image.c		\
@@ -160,18 +173,26 @@ libwim_la_SOURCES += src/unix_apply.c		\
 		     src/unix_capture.c
 endif
 
-
-
 EXTRA_libwim_la_SOURCES = src/sha1-ssse3.asm
 libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
+EXTRA_DIST += build-aux/nasm_lt.sh
 
 src/sha1-ssse3.lo:src/sha1-ssse3.asm
 	$(LIBTOOL) --mode=compile --tag NASM $(srcdir)/build-aux/nasm_lt.sh \
-	$(NASM) $(NAFLAGS) $(NASM_WINDOWS_FLAGS)			    \
+	$(NASM) $(NAFLAGS) $(NASM_PLATFORM_FLAGS)			    \
 	-DINTEL_SHA1_UPDATE_FUNCNAME=$(NASM_SYMBOL_PREFIX)sha1_transform_blocks_ssse3	    \
 	-DINTEL_SHA1_UPDATE_DEFAULT_DISPATCH=$(NASM_SYMBOL_PREFIX)sha1_transform_blocks_default  \
 	$< -o $@
 
+libwim_la_CFLAGS =		\
+	$(AM_CFLAGS)		\
+	$(LIBXML2_CFLAGS)	\
+	$(LIBFUSE_CFLAGS)	\
+	$(LIBNTFS_3G_CFLAGS)	\
+	$(LIBCRYPTO_CFLAGS)
+
+libwim_la_LDFLAGS = $(AM_LDFLAGS) -version-info 18:0:3
+
 libwim_la_LIBADD =		\
 	$(LIBXML2_LIBS)		\
 	$(LIBFUSE_LIBS)		\
@@ -182,22 +203,17 @@ libwim_la_LIBADD =		\
 	$(SSSE3_SHA1_OBJ)	\
 	$(PTHREAD_LDADD)
 
-libwim_la_CFLAGS =		\
-	$(AM_CFLAGS)		\
-	$(VISIBILITY_CFLAGS)	\
-	$(LIBXML2_CFLAGS)	\
-	$(LIBFUSE_CFLAGS)	\
-	$(LIBNTFS_3G_CFLAGS)	\
-	$(LIBCRYPTO_CFLAGS)
-
+##############################################################################
+#				Programs				     #
+##############################################################################
 
 bin_PROGRAMS = wimlib-imagex
+dist_bin_SCRIPTS = programs/mkwinpeimg
+
 wimlib_imagex_SOURCES =		\
 	programs/imagex.c	\
 	include/wimlib.h	\
 	include/wimlib_tchar.h
-wimlib_imagex_LDADD = $(top_builddir)/libwim.la
-wimlib_imagex_CFLAGS = $(AM_CFLAGS) $(WINDOWS_CFLAGS) -Wno-deprecated-declarations
 
 if WINDOWS_NATIVE_BUILD
 wimlib_imagex_SOURCES +=	\
@@ -207,6 +223,10 @@ wimlib_imagex_SOURCES +=	\
 	programs/wgetopt.h
 endif
 
+wimlib_imagex_CFLAGS = $(AM_CFLAGS) -Wno-deprecated-declarations
+
+wimlib_imagex_LDADD = $(top_builddir)/libwim.la
+
 wimlib_imagex_cmds =	\
 	append		\
 	apply		\
@@ -225,6 +245,10 @@ wimlib_imagex_cmds =	\
 	update		\
 	verify
 
+##############################################################################
+#				  Hooks					     #
+##############################################################################
+
 install-exec-hook:
 	for cmd in $(wimlib_imagex_cmds); do				\
 		cd $(DESTDIR)$(bindir) &&				\
@@ -240,36 +264,12 @@ install-data-hook:
 uninstall-hook:
 	for cmd in $(wimlib_imagex_cmds); do				\
 		rm -f $(DESTDIR)$(bindir)/wim$${cmd};			\
-		rm -f $(DESTDIR)$(mandir)/man1/wim$${cmd}.1; 		\
+		rm -f $(DESTDIR)$(mandir)/man1/wim$${cmd}.1;		\
 	done
 
-dist_bin_SCRIPTS = programs/mkwinpeimg
-
-include_HEADERS = include/wimlib.h
-
-EXTRA_DIST =					\
-	$(man1_MANS)				\
-	build-aux/nasm_lt.sh			\
-	archlinux				\
-	debian					\
-	rpm					\
-	examples				\
-	COPYING					\
-	COPYING.GPLv3				\
-	COPYING.LGPLv3				\
-	README					\
-	README.WINDOWS				\
-	tests/common_tests.sh			\
-	tests/tests-common.sh			\
-	tests/security_descriptor_1.base64	\
-	tests/security_descriptor_1.bin		\
-	tests/security_descriptor_2.base64	\
-	tests/security_descriptor_2.bin
-
-pkgconfigdir	= @pkgconfigdir@
-pkgconfig_DATA	= wimlib.pc
-
-$(pkgconfig_DATA): config.status
+##############################################################################
+#				Documentation				     #
+##############################################################################
 
 man1_MANS =					\
 	doc/man1/wimlib-imagex.1		\
@@ -291,6 +291,12 @@ man1_MANS =					\
 	doc/man1/wimlib-imagex-verify.1		\
 	doc/man1/mkwinpeimg.1
 
+EXTRA_DIST += $(man1_MANS)
+
+##############################################################################
+#				  Tests					     #
+##############################################################################
+
 check_PROGRAMS = tests/tree-cmp
 tests_tree_cmp_SOURCES = tests/tree-cmp.c
 
@@ -306,6 +312,14 @@ if WITH_NTFS_3G
 dist_check_SCRIPTS += tests/test-imagex-ntfs
 endif
 
+EXTRA_DIST +=					\
+	tests/common_tests.sh			\
+	tests/tests-common.sh			\
+	tests/security_descriptor_1.base64	\
+	tests/security_descriptor_1.bin		\
+	tests/security_descriptor_2.base64	\
+	tests/security_descriptor_2.bin
+
 if WINDOWS_NATIVE_BUILD
 # Tests are run manually for Windows builds.
 TESTS =
@@ -313,3 +327,4 @@ else
 TESTS = $(dist_check_SCRIPTS)
 endif
 
+##############################################################################
diff --git a/configure.ac b/configure.ac
index 6a07d1ea..6ce4740b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,19 +134,17 @@ AC_SUBST([PTHREAD_LDADD], [$PTHREAD_LDADD])
 WITH_NTFS_3G_DEFAULT="no"
 WITH_FUSE_DEFAULT="no"
 WINDOWS_NATIVE_BUILD="no"
-VISIBILITY_CFLAGS="-fvisibility=hidden"
-WINDOWS_CFLAGS=""
-WINDOWS_CPPFLAGS=""
-WINDOWS_LDFLAGS=""
+PLATFORM_CPPFLAGS=""
+PLATFORM_CFLAGS="-fvisibility=hidden"
+PLATFORM_LDFLAGS=""
 
 case "$host_os" in
 	mingw*)
 		# Native Windows
 		WINDOWS_NATIVE_BUILD="yes"
-		VISIBILITY_CFLAGS=""
-		WINDOWS_CFLAGS="-municode"
-		WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
-		WINDOWS_LDFLAGS="-no-undefined"
+		PLATFORM_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
+		PLATFORM_CFLAGS="-municode -mno-ms-bitfields"
+		PLATFORM_LDFLAGS="-no-undefined"
 		;;
 	linux*)
 		# Linux
@@ -159,10 +157,9 @@ case "$host_os" in
 		;;
 esac
 
-AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
-AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS])
-AC_SUBST([WINDOWS_CPPFLAGS], [$WINDOWS_CPPFLAGS])
-AC_SUBST([WINDOWS_CFLAGS], [$WINDOWS_CFLAGS])
+AC_SUBST([PLATFORM_CPPFLAGS], [$PLATFORM_CPPFLAGS])
+AC_SUBST([PLATFORM_CFLAGS], [$PLATFORM_CFLAGS])
+AC_SUBST([PLATFORM_LDFLAGS], [$PLATFORM_LDFLAGS])
 AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "x$WINDOWS_NATIVE_BUILD" = "xyes"])
 
 
@@ -264,16 +261,16 @@ if test "x$ENABLE_SSSE3_SHA1" = "xyes"; then
 	SSSE3_SHA1_OBJ=src/sha1-ssse3.lo
 	AC_PROG_NASM
 	NASM_SYMBOL_PREFIX=""
-	NASM_WINDOWS_FLAGS=
+	NASM_PLATFORM_FLAGS=""
 	if test "x$WINDOWS_NATIVE_BUILD" = "xyes"; then
-		NASM_WINDOWS_FLAGS="-DWIN_ABI"
+		NASM_PLATFORM_FLAGS="-DWIN_ABI"
 	fi
 	case "$host_os" in
 		darwin* | rhapsody* | nextstep* | openstep* | macos*)
 			NASM_SYMBOL_PREFIX="_"
 			;;
 	esac
-	AC_SUBST([NASM_WINDOWS_FLAGS], $NASM_WINDOWS_FLAGS)
+	AC_SUBST([NASM_PLATFORM_FLAGS], $NASM_PLATFORM_FLAGS)
 	AC_SUBST([NASM_SYMBOL_PREFIX], $NASM_SYMBOL_PREFIX)
 else
 	SSSE3_SHA1_OBJ=
diff --git a/make-windows-release b/make-windows-release
index 298b37cb..be897d18 100755
--- a/make-windows-release
+++ b/make-windows-release
@@ -34,7 +34,7 @@ rm -f $DESTDIR/{libwim-*.dll,doc/*,wim*.bat,wim*.cmd}
 
 TEXTFILES=(NEWS README* COPYING*)
 
-cp .libs/imagex.exe $DESTDIR/wimlib-imagex.exe
+cp .libs/wimlib-imagex.exe $DESTDIR/wimlib-imagex.exe
 cp .libs/libwim-*.dll $DESTDIR
 cp "${TEXTFILES[@]}" $DESTDIR