diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 20:12:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 20:12:57 +0100 |
| commit | 2bbfadac526c7880720e518e0fdd84ac0ca601bd (patch) | |
| tree | 5d7ca7982b47e2fe7ea4ef6ed5f461f3ffce83d7 /package/nand/Makefile | |
| parent | 6daa792eab1488d013fefc5eb7e4d01f40f38687 (diff) | |
| parent | 2e44499238125dbecbbf17222496ebba315cc90c (diff) | |
resolve conflicts
Diffstat (limited to 'package/nand/Makefile')
| -rw-r--r-- | package/nand/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/package/nand/Makefile b/package/nand/Makefile index 0f24fab25..1e54d3387 100644 --- a/package/nand/Makefile +++ b/package/nand/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nand PKG_VERSION:= 1.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 3 PKG_DESCR:= NAND utility PKG_SECTION:= base @@ -25,15 +25,11 @@ INSTALL_STYLE:= manual do-build: mkdir -p ${WRKBUILD} - ${CP} ./src/* ${WRKBUILD} - ${TARGET_CC} ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/nandwrite \ - ${WRKBUILD}/nandwrite.c - ${TARGET_CC} ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/nanddump \ - ${WRKBUILD}/nanddump.c + ${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/nand \ + ./src/nand.c do-install: ${INSTALL_DIR} ${IDIR_NAND}/sbin - ${INSTALL_BIN} ${WRKBUILD}/nandwrite ${IDIR_NAND}/sbin - ${INSTALL_BIN} ${WRKBUILD}/nanddump ${IDIR_NAND}/sbin + ${INSTALL_BIN} ${WRKBUILD}/nand ${IDIR_NAND}/sbin include ${TOPDIR}/mk/pkg-bottom.mk |