Fix libraries list for static architectures

18 files changed, 39 insertions, 37 deletions

diff --git a/app/fvwm/modules/FvwmAuto/Makefile b/app/fvwm/modules/FvwmAuto/Makefile
index 247869f64..be842da73 100644
--- a/app/fvwm/modules/FvwmAuto/Makefile
+++ b/app/fvwm/modules/FvwmAuto/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmBacker/Makefile b/app/fvwm/modules/FvwmBacker/Makefile
index 077f7ba87..aaf8f4e75 100644
--- a/app/fvwm/modules/FvwmBacker/Makefile
+++ b/app/fvwm/modules/FvwmBacker/Makefile
@@ -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>
\ No newline at end of file
+.include <bsd.xorg.mk>
diff --git a/app/fvwm/modules/FvwmBanner/Makefile b/app/fvwm/modules/FvwmBanner/Makefile
index 1947e1364..9d8b776fe 100644
--- a/app/fvwm/modules/FvwmBanner/Makefile
+++ b/app/fvwm/modules/FvwmBanner/Makefile
@@ -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>
\ No newline at end of file
+.include <bsd.xorg.mk>
diff --git a/app/fvwm/modules/FvwmButtons/Makefile b/app/fvwm/modules/FvwmButtons/Makefile
index 890b89a2d..00dc25f09 100644
--- a/app/fvwm/modules/FvwmButtons/Makefile
+++ b/app/fvwm/modules/FvwmButtons/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmCpp/Makefile b/app/fvwm/modules/FvwmCpp/Makefile
index b89610e25..186f3c5f0 100644
--- a/app/fvwm/modules/FvwmCpp/Makefile
+++ b/app/fvwm/modules/FvwmCpp/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmForm/Makefile b/app/fvwm/modules/FvwmForm/Makefile
index 97f8a9f9e..efe8625f7 100644
--- a/app/fvwm/modules/FvwmForm/Makefile
+++ b/app/fvwm/modules/FvwmForm/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmIconBox/Makefile b/app/fvwm/modules/FvwmIconBox/Makefile
index 4bb7d5da0..9221961bb 100644
--- a/app/fvwm/modules/FvwmIconBox/Makefile
+++ b/app/fvwm/modules/FvwmIconBox/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmIconMan/Makefile b/app/fvwm/modules/FvwmIconMan/Makefile
index 4f370e5cd..d468bc758 100644
--- a/app/fvwm/modules/FvwmIconMan/Makefile
+++ b/app/fvwm/modules/FvwmIconMan/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmIdent/Makefile b/app/fvwm/modules/FvwmIdent/Makefile
index 0a2b6499a..d94de8acc 100644
--- a/app/fvwm/modules/FvwmIdent/Makefile
+++ b/app/fvwm/modules/FvwmIdent/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmM4/Makefile b/app/fvwm/modules/FvwmM4/Makefile
index a6598892b..f3c7bf145 100644
--- a/app/fvwm/modules/FvwmM4/Makefile
+++ b/app/fvwm/modules/FvwmM4/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmPager/Makefile b/app/fvwm/modules/FvwmPager/Makefile
index 23325747b..afb98e27e 100644
--- a/app/fvwm/modules/FvwmPager/Makefile
+++ b/app/fvwm/modules/FvwmPager/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmRearrange/Makefile b/app/fvwm/modules/FvwmRearrange/Makefile
index d4cda78b9..98a559328 100644
--- a/app/fvwm/modules/FvwmRearrange/Makefile
+++ b/app/fvwm/modules/FvwmRearrange/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmSave/Makefile b/app/fvwm/modules/FvwmSave/Makefile
index 9404b8569..449b3ab62 100644
--- a/app/fvwm/modules/FvwmSave/Makefile
+++ b/app/fvwm/modules/FvwmSave/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmSaveDesk/Makefile b/app/fvwm/modules/FvwmSaveDesk/Makefile
index a2b0ea88f..1bc073bd3 100644
--- a/app/fvwm/modules/FvwmSaveDesk/Makefile
+++ b/app/fvwm/modules/FvwmSaveDesk/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmScroll/Makefile b/app/fvwm/modules/FvwmScroll/Makefile
index 3ddaf2770..9f1ed60f2 100644
--- a/app/fvwm/modules/FvwmScroll/Makefile
+++ b/app/fvwm/modules/FvwmScroll/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmTalk/Makefile b/app/fvwm/modules/FvwmTalk/Makefile
index 37e03aa8f..c41767f09 100644
--- a/app/fvwm/modules/FvwmTalk/Makefile
+++ b/app/fvwm/modules/FvwmTalk/Makefile
@@ -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>
diff --git a/app/fvwm/modules/FvwmWinList/Makefile b/app/fvwm/modules/FvwmWinList/Makefile
index 7d2140f9f..4003cb2f8 100644
--- a/app/fvwm/modules/FvwmWinList/Makefile
+++ b/app/fvwm/modules/FvwmWinList/Makefile
@@ -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>
diff --git a/app/fvwm/modules/Makefile.inc b/app/fvwm/modules/Makefile.inc
index 408321ff5..76968daf4 100644
--- a/app/fvwm/modules/Makefile.inc
+++ b/app/fvwm/modules/Makefile.inc
@@ -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