diff options
| author | Kurt Miller <kurt@cvs.openbsd.org> | 2005-09-18 12:17:30 +0000 |
|---|---|---|
| committer | Kurt Miller <kurt@cvs.openbsd.org> | 2005-09-18 12:17:30 +0000 |
| commit | f13f7c00610d1a2078ebd963531c0387a9b73ca9 (patch) | |
| tree | 4b8c8ba8c12d9b6e089166026c69698d6ff2bb65 | |
| parent | 44d4b86ac7e32f5269f43c6adc142deb062510b0 (diff) | |
move CC_{DIR|OBJDIR} to Makefile.inc in prep for prog4
| -rw-r--r-- | regress/libexec/ld.so/dlsym/test2/Makefile.inc | 10 | ||||
| -rw-r--r-- | regress/libexec/ld.so/dlsym/test2/libbb/Makefile | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/regress/libexec/ld.so/dlsym/test2/Makefile.inc b/regress/libexec/ld.so/dlsym/test2/Makefile.inc index 3fc1aadb855..a2d2fa92a67 100644 --- a/regress/libexec/ld.so/dlsym/test2/Makefile.inc +++ b/regress/libexec/ld.so/dlsym/test2/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.2 2005/09/18 11:56:34 kurt Exp $ +# $OpenBSD: Makefile.inc,v 1.3 2005/09/18 12:17:29 kurt Exp $ .include <bsd.obj.mk> @@ -17,3 +17,11 @@ BB_OBJDIR!= if [ -d $(BB_DIR)/${__objdir} ]; then \ else \ echo "$(BB_DIR)"; \ fi + +CC_DIR=${.CURDIR}/../libcc + +CC_OBJDIR!= if [ -d $(CC_DIR)/${__objdir} ]; then \ + echo "$(CC_DIR)/${__objdir}"; \ + else \ + echo "$(CC_DIR)"; \ + fi diff --git a/regress/libexec/ld.so/dlsym/test2/libbb/Makefile b/regress/libexec/ld.so/dlsym/test2/libbb/Makefile index 73bc8aae150..843500a9b37 100644 --- a/regress/libexec/ld.so/dlsym/test2/libbb/Makefile +++ b/regress/libexec/ld.so/dlsym/test2/libbb/Makefile @@ -1,14 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2005/09/15 22:16:27 kurt Exp $ +# $OpenBSD: Makefile,v 1.2 2005/09/18 12:17:29 kurt Exp $ -.include <bsd.obj.mk> - -CC_DIR=${.CURDIR}/../libcc - -CC_OBJDIR!= if [ -d $(CC_DIR)/${__objdir} ]; then \ - echo "$(CC_DIR)/${__objdir}"; \ - else \ - echo "$(CC_DIR)"; \ - fi +.include <../Makefile.inc> LIB=bb SRCS= bb.c |