diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-09-30 10:12:52 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-09-30 10:12:52 +0000 |
| commit | 612f395852080763f8ef40bec364ee6d9a296ef1 (patch) | |
| tree | 19d45472a56b936099c86a65ea06d09ca59e5a25 | |
| parent | ef92e9fedef88a3246e9eaee2fbc882a58588c48 (diff) | |
remove utterly bogus tests and simplify.
fvwm was only building thanks to an unlikely series of accidents...
okay matthieu@
| -rw-r--r-- | app/fvwm/Makefile.inc | 10 | ||||
| -rw-r--r-- | app/fvwm/modules/Makefile.inc | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/app/fvwm/Makefile.inc b/app/fvwm/Makefile.inc index c180f7242..a940be502 100644 --- a/app/fvwm/Makefile.inc +++ b/app/fvwm/Makefile.inc @@ -1,5 +1,5 @@ # -*- makefile -*- -# $OpenBSD: Makefile.inc,v 1.8 2011/06/23 22:48:59 naddy Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2012/09/30 10:12:51 espie Exp $ .ifndef FVWM_MAKEFILE_INC FVWM_MAKEFILE_INC = done @@ -14,11 +14,5 @@ MANDIR= ${X11BASE}/man/man obj: _xenocara_obj -.if exists(${.CURDIR}/../libs/${__objdir}) -LDADD+= -L${.CURDIR}/../libs/${__objdir} -lfvwm -DPADD+= ${.CURDIR}/../libs/${__objdir}/libfvwm.a -.else -LDADD+= -L${.CURDIR}/../libs -lfvwm -DPADD+= ${.CURDIR}/../libs/libfvwm.a -.endif +LDADD+= -L${.CURDIR}/../libs/${__objdir} -L${.CURDIR}/../libs -lfvwm .endif diff --git a/app/fvwm/modules/Makefile.inc b/app/fvwm/modules/Makefile.inc index b8b38d9d9..a361ac791 100644 --- a/app/fvwm/modules/Makefile.inc +++ b/app/fvwm/modules/Makefile.inc @@ -1,5 +1,5 @@ # -*- makefile -*- -# $OpenBSD: Makefile.inc,v 1.8 2011/06/23 22:48:59 naddy Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2012/09/30 10:12:51 espie Exp $ .ifndef FVWM_MAKEFILE_INC FVWM_MAKEFILE_INC = done @@ -17,11 +17,5 @@ MANDIR= ${X11BASE}/man/man obj: _xenocara_obj -.if exists(${.CURDIR}/../../libs/${__objdir}) -LDADD+= -L${.CURDIR}/../../libs/${__objdir} -lfvwm -DPADD+= ${.CURDIR}/../../libs/${__objdir}/libfvwm.a -.else -LDADD+= -L${.CURDIR}/../../libs -lfvwm -DPADD+= ${.CURDIR}/../../libs/libfvwm.a -.endif +LDADD+= -L${.CURDIR}/../../libs/${__objdir} -L${.CURDIR}/../../libs -lfvwm .endif |