Changeset 512f2f5 in freewrt

Timestamp:

Mar 21, 2007, 7:59:09 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

0af9d4d

Parents:

b65ac45

Message:

revert to use gmake 3.81 features

dnehring@: gmake 3.81 is delivered with FreeWRT now,
and I'll integrate it _even_ better tonight.

ok wbx@ austriancoder@

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2221 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

mk

Files:

• buildhlp.mk (modified) (2 diffs)
• pkg-bottom.mk (modified) (3 diffs)
• uname.mk (modified) (1 diff)

mk/buildhlp.mk

@@ -57 +57 @@
 
 __use_generic_patch_target:=42
-else
-ifeq ($(strip ${NO_DISTFILES}),1)
+else ifeq ($(strip ${NO_DISTFILES}),1)
 ${WRKDIST}/.extract_done:
         rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD}
@@ -69 +68 @@
 
 __use_generic_patch_target:=42
-else
-ifeq ($(strip ${_IN_PACKAGE}),1)
+else ifeq ($(strip ${_IN_PACKAGE}),1)
 $(warning This package does not use the generic extraction and patch target; it's most likely to fail.)
-endif
-endif
 endif
 

mk/pkg-bottom.mk

@@ -45 +45 @@
             --disable-debug \
             ${CONFIGURE_ARGS}
-else
-ifeq ($(filter-out manual,${CONFIGURE_STYLE}),)
+else ifeq ($(filter-out manual,${CONFIGURE_STYLE}),)
         env ${CONFIGURE_ENV} ${MAKE} do-configure
 else
         @echo "Invalid CONFIGURE_STYLE '${CONFIGURE_STYLE}'" >&2
         @exit 1
-endif
 endif
         @${MAKE} post-configure
@@ -65 +63 @@
         cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
             ${MAKE_FLAGS} ${ALL_TARGET}
-else
-ifeq ($(filter-out manual,${BUILD_STYLE}),)
+else ifeq ($(filter-out manual,${BUILD_STYLE}),)
         env ${MAKE_ENV} ${MAKE} do-build
 else
         @echo "Invalid BUILD_STYLE '${BUILD_STYLE}'" >&2
         @exit 1
-endif
 endif
         @env ${MAKE_ENV} ${MAKE} post-build
@@ -88 +84 @@
         cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
             DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET}
-else
-ifeq ($(filter-out manual,${INSTALL_STYLE}),)
+else ifeq ($(filter-out manual,${INSTALL_STYLE}),)
         env ${MAKE_ENV} ${MAKE} do-install
 else
         @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
         @exit 1
-endif
 endif
         @env ${MAKE_ENV} ${MAKE} post-install

mk/uname.mk

@@ -7 +7 @@
 ifeq ($(strip ${FWRT_LINUX_2_4_BRCM}),y)
 UNAME_R:=               2.4.34
-else
-ifeq ($(strip ${FWRT_LINUX_2_6_BRCM}),y)
+else ifeq ($(strip ${FWRT_LINUX_2_6_BRCM}),y)
 UNAME_R:=               2.6.19.1
-else
-ifeq ($(strip ${FWRT_LINUX_2_4_RB}),y)
+else ifeq ($(strip ${FWRT_LINUX_2_4_RB}),y)
 UNAME_R:=               2.4.34
-else
-ifeq ($(strip ${FWRT_LINUX_2_6_RB}),y)
+else ifeq ($(strip ${FWRT_LINUX_2_6_RB}),y)
 UNAME_R:=               2.6.19.1
-else
-ifeq ($(strip ${FWRT_LINUX_2_6_X86}),y)
+else ifeq ($(strip ${FWRT_LINUX_2_6_X86}),y)
 UNAME_R:=               2.6.19.1
 else
 $(error Cannot determine target "uname -r" output)
 endif
-endif
-endif
-endif
-endif
 
 ifeq ($(strip ${FWRT_mipsel}),y)
 UNAME_M:=               mips
-else
-ifeq ($(strip ${FWRT_i386}),y)
+else ifeq ($(strip ${FWRT_i386}),y)
 UNAME_M:=               i386
 else
 $(error Cannot determine target "uname -m" output)
 endif
-endif