Fix libraries list for static architectures

This commit is contained in:
matthieu
2007-04-09 18:59:57 +00:00
parent 5c60e52752
commit 9a4d745922
18 changed files with 39 additions and 37 deletions

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2006/11/28 19:05:40 matthieu Exp $
# $OpenBSD: Makefile,v 1.4 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmAuto
SRCS= FvwmAuto.c
LDADD+= -lXpm -lX11
LDADD+= -lXpm ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,8 +7,8 @@
PROG= FvwmBacker
SRCS= FvwmBacker.c Mallocs.c root_bits.c
LDADD+= -lXpm -lX11
LDADD+= -lXpm ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>
.include <bsd.xorg.mk>
.include <bsd.xorg.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,8 +7,8 @@
PROG= FvwmBanner
SRCS= FvwmBanner.c
LDADD+= -lXpm -lXext -lX11
LDADD+= -lXpm -lXext ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>
.include <bsd.xorg.mk>
.include <bsd.xorg.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmButtons
SRCS= FvwmButtons.c button.c draw.c icons.c misc.c output.c parse.c
LDADD+= -lXpm -lXext -lX11
LDADD+= -lXpm -lXext ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -10,7 +10,7 @@ SRCS= FvwmCpp.c
CPPFLAGS+= -DFVWM_MODULEDIR=\"$(FVWMLIBDIR)\" \
-DFVWM_CONFIGDIR=\"$(FVWMLIBDIR)\" \
-DFVWM_CPP=\"$(FVWMLIBDIR)/FvwmCpp\"
LDADD+= -lX11
LDADD+= ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmForm
SRCS= FvwmForm.c
LDADD+= -lXpm -lX11
LDADD+= -lXpm ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmIconBox
SRCS= FvwmIconBox.c icons.c
LDADD+= -lXpm -lXext -lX11
LDADD+= -lXpm -lXext ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -8,7 +8,7 @@ PROG= FvwmIconMan
SRCS= FvwmIconMan.c debug.c functions.c fvwm.c globals.c readconfig.c \
winlist.c x.c xmanager.c
LDADD+= -lXpm -lXext -lX11
LDADD+= -lXpm -lXext ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmIdent
SRCS= FvwmIdent.c
LDADD+= -lX11
LDADD+= ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -10,7 +10,7 @@ SRCS= FvwmM4.c
CPPFLAGS+= -DFVWM_MODULEDIR=\"$(FVWMLIBDIR)\" \
-DFVWM_CONFIGDIR=\"$(FVWMLIBDIR)\" \
LDADD+= -lX11
LDADD+= ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmPager
SRCS= FvwmPager.c x_pager.c
LDADD+= -lXpm -lX11
LDADD+= -lXpm ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmRearrange
SRCS= FvwmRearrange.c
LDADD+= -lXpm -lX11
LDADD+= -lXpm ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmSave
SRCS= FvwmSave.c
LDADD+= -lXpm -lX11
LDADD+= -lXpm ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmSaveDesk
SRCS= FvwmSaveDesk.c
LDADD+= -lXpm -lX11
LDADD+= -lXpm ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmScroll
SRCS= FvwmScroll.c GrabWindow.c
LDADD+= -lXpm -lX11
LDADD+= -lXpm ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmTalk
SRCS= FvwmTalk.c
LDADD+= -lXpm -lX11
LDADD+= -lXpm ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
# $OpenBSD: Makefile,v 1.3 2007/04/09 18:59:57 matthieu Exp $
.include "../Makefile.inc"
@@ -7,7 +7,7 @@
PROG= FvwmWinList
SRCS= ButtonArray.c Colors.c FvwmWinList.c List.c Mallocs.c
LDADD+= -lXpm -lX11
LDADD+= -lXpm ${XLIB}
BINDIR= ${FVWMLIBDIR}
.include <bsd.prog.mk>

View File

@@ -1,5 +1,5 @@
# -*- makefile -*-
# $OpenBSD: Makefile.inc,v 1.4 2007/04/04 22:33:46 david Exp $
# $OpenBSD: Makefile.inc,v 1.5 2007/04/09 18:59:57 matthieu Exp $
.ifndef FVWM_MAKEFILE_INC
FVWM_MAKEFILE_INC = done
@@ -10,6 +10,8 @@ X11BASE?= /usr/X11R6
CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/../.. -I${.CURDIR}/../../libs
LDADD+= -L${X11BASE}/lib
XLIB= -lX11 -lXau -lXdmcp
FVWMLIBDIR= ${X11BASE}/lib/X11/fvwm
MANDIR= ${X11BASE}/man/cat