From 789fa3c096195ca5c8a337ba2393b62923d74cf0 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Mon, 8 Jun 2015 07:59:01 +0800 Subject: [PATCH] hdf4: Fix indentation and simplify conditionals --- src/hdf4.mk | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/hdf4.mk b/src/hdf4.mk index 81ac2771..c8a361a6 100644 --- a/src/hdf4.mk +++ b/src/hdf4.mk @@ -24,19 +24,18 @@ define $(PKG)_BUILD $(MXE_CONFIGURE_OPTS) \ --disable-fortran \ --disable-netcdf \ - $(if $(BUILD_STATIC), \ - CPPFLAGS="-DH4_F77_FUNC\(name,NAME\)=NAME -DH4_BUILT_AS_STATIC_LIB=1") \ AR='$(TARGET)-ar' \ - $(if $(BUILD_SHARED), \ - LIBS="-lportablexdr -lws2_32" CPPFLAGS="-DH4_F77_FUNC\(name,NAME\)=NAME -DH4_BUILT_AS_DYNAMIC_LIB=1 -DBIG_LONGS") + $(if $(BUILD_SHARED), \ + LIBS="-lportablexdr -lws2_32" CPPFLAGS="-DH4_F77_FUNC\(name,NAME\)=NAME -DH4_BUILT_AS_DYNAMIC_LIB=1 -DBIG_LONGS", \ + CPPFLAGS="-DH4_F77_FUNC\(name,NAME\)=NAME -DH4_BUILT_AS_STATIC_LIB=1") $(MAKE) -C '$(1)'/mfhdf/xdr -j '$(JOBS)' \ - LDFLAGS=-no-undefined + LDFLAGS=-no-undefined $(MAKE) -C '$(1)'/hdf/src -j '$(JOBS)' \ - LDFLAGS=-no-undefined + LDFLAGS=-no-undefined $(MAKE) -C '$(1)'/hdf/src -j 1 install $(MAKE) -C '$(1)'/mfhdf/libsrc -j '$(JOBS)' \ - LDFLAGS="-no-undefined -ldf" + LDFLAGS="-no-undefined -ldf" $(MAKE) -C '$(1)'/mfhdf/libsrc -j 1 install endef