Change version to 3.0.0

Indicate this is fvwm-3.0.0

(cherry picked from commit d58219c)

.gitignore

@@ -31,7 +31,7 @@ core
 doc/footer.html
 doc/fvwm.ent
 etc/
-fvwm/fvwm
+fvwm/fvwm3
 modules/FvwmAnimate/FvwmAnimate
 modules/FvwmAuto/FvwmAuto
 modules/FvwmBacker/FvwmBacker

TODO.md

@@ -43,7 +43,7 @@ Items
               the macro definition and not hundreds of users.  Especially with
               a future rewrite of the style system in mind, this is still very
               important.
-    * [ ] What's in libs/ -- the static linking of libfvwm.a useful anymore?
+    * [ ] What's in libs/ -- the static linking of libfvwm3.a useful anymore?
       There's a lot of code being ripped out of libs/ and I don't see much
       more being added in.
       dv: Static linkage was good when the library was small.  Nowadays its

bin/Makefile.am

@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = fvwm-root
 fvwm_root_SOURCE= fvwm-root.c
-fvwm_root_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+fvwm_root_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 bin_SCRIPTS = fvwm-config fvwm-bug fvwm-perllib \
 	fvwm-convert-2.6 \
@@ -15,7 +15,7 @@ man_MANS = \
 	fvwm-menu-xlock.1 fvwm-menu-directory.1 \
 	fvwm-menu-desktop.1 fvwm-menu-headlines.1
 
-LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm $(xpm_LIBS) $(Xcursor_LIBS) \
+LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm3 $(xpm_LIBS) $(Xcursor_LIBS) \
 	$(X_PRE_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) $(Xrender_LIBS) \
 	$(Xcursor_LIBS) $(png_LIBS) $(rsvg_LIBS) $(Xinerama_LIBS)
 AM_CPPFLAGS = -I$(top_srcdir) $(xpm_CFLAGS) $(X_CFLAGS) $(png_CFLAGS) \

configure.ac

@@ -13,7 +13,7 @@ fi
 # Silence warning: ar: 'u' modifier ignored since 'D' is the default
 AC_SUBST(AR_FLAGS, [cr])
 
-AC_INIT([fvwm],
+AC_INIT([fvwm3],
 	m4_esyscmd_s([utils/fvwm-version-str.sh]),
 	[[email protected]])
 AC_CONFIG_AUX_DIR(etc)

doc/fvwm/Makefile.am

@@ -1,16 +1,16 @@
 # Author: Scott Smedley
 
-docdir = @FVWM_DOCDIR@/fvwm
+docdir = @FVWM_DOCDIR@/fvwm3
 XSLTPROC = @XSLTPROC@
 
 XSL_FILE = $(srcdir)/../fvwm.xsl
 XSL_MAN_FILE = $(srcdir)/../fvwm-man.xsl
 XSL_PROFILE = $(srcdir)/../docbook-xsl/profiling/profile.xsl
 
-HTML_FILES = fvwm.man.html
+HTML_FILES = fvwm3.man.html
 XML_FILES = @DOC_SECTIONS_XML_PATH@
 EXTRA_DIST = @DOC_SECTIONS_XML@ $(man_MANS) sections
-man_MANS = fvwm.1
+man_MANS = fvwm3.1
 
 if FVWM_BUILD_HTMLDOC
 doc_DATA = $(HTML_FILES)
@@ -48,27 +48,16 @@ fvwm.man.html: $(XML_FILES) $(XSL_FILE) $(top_builddir)/doc/fvwm.ent @DOC_COMMAN
 		--stringparam section.autolabel 1 \
 		-o $@ $(XSL_FILE) fvwm.man.html.tmp && rm fvwm.man.html.tmp
 
-fvwm.1: $(XML_FILES) $(srcdir)/fvwm.man.xml $(XSL_MAN_FILE) @DOC_COMMANDS_XML_PATH@
+fvwm3.1: $(XML_FILES) $(srcdir)/fvwm.man.xml $(XSL_MAN_FILE) @DOC_COMMANDS_XML_PATH@
 	$(XSLTPROC) --path "$(top_builddir)/doc":"$(top_srcdir)/doc/commands" \
 		--xinclude \
 		--stringparam profile.attribute output \
 		--stringparam profile.value man \
-		-o fvwm.1.tmp \
+		-o fvwm3.1.tmp \
 		$(XSL_PROFILE) "$(srcdir)/fvwm.man.xml"
 	$(XSLTPROC) --path "$(top_builddir)/doc":"$(top_srcdir)/doc/commands" \
 		--xinclude \
-		$(XSL_MAN_FILE) fvwm.1.tmp && rm fvwm.1.tmp
+		$(XSL_MAN_FILE) fvwm3.1.tmp && rm fvwm3.1.tmp
 #	mv fvwm.1 fvwm.1.pre
 #	tbl fvwm.1.pre | sed '/^\.T[SE]$$/d' > fvwm.1 && rm fvwm.1.pre
 endif
-
-fvwm_name =`echo "fvwm" | "$(SED)" -e "${transform}"`
-fvwm2_name =`echo "fvwm2" | "$(SED)" -e "${transform}"`
-
-install-data-local:
-	@rm -f "$(DESTDIR)$(mandir)/man1/$(fvwm2_name).1"
-	@$(LN_S) $(fvwm_name).1 "$(DESTDIR)$(mandir)/man1/$(fvwm2_name).1" || \
-	echo "Minor warning: $(mandir)/man1/$(fvwm2_name).1 symlink was not created"
-
-uninstall-local:
-	@rm -f "$(DESTDIR)$(mandir)/man1/$(fvwm2_name).1"

fvwm/Makefile.am

@@ -1,18 +1,18 @@
 ## Process this file with automake to create Makefile.in
 
 configdir = @FVWM_DATADIR@
-bin_PROGRAMS = fvwm
+bin_PROGRAMS = fvwm3
 
 EXTRA_DIST = $(config_DATA)
 
 config_DATA = ConfigFvwmDefaults
 
 ## please keep .c file in largest first order to speed up parallel makes
-fvwm_SOURCES = \
+fvwm3_SOURCES = \
 	add_window.h bindings.h borders.h builtins.h colormaps.h colorset.h \
 	commands.h conditional.h condrc.h cursor.h decorations.h events.h \
 	eventhandler.h eventmask.h ewmh.h ewmh_intern.h expand.h externs.h \
-	focus.h functable.h functions.h fvwm.h geometry.h focus_policy.h \
+	focus.h functable.h functions.h fvwm3.h geometry.h focus_policy.h \
 	icccm2.h icons.h menubindings.h menudim.h menugeometry.h \
 	menuitem.h menuroot.h menuparameters.h menus.h menustyle.h misc.h \
 	modconf.h module_interface.h module_list.h move_resize.h \
@@ -21,7 +21,7 @@ fvwm_SOURCES = \
 	infostore.h \
 	\
 	menus.c style.c borders.c events.c move_resize.c builtins.c \
-	add_window.c icons.c fvwm.c frame.c placement.c virtual.c \
+	add_window.c icons.c fvwm3.c frame.c placement.c virtual.c \
 	menustyle.c conditional.c ewmh.c stack.c session.c colorset.c \
 	functions.c ewmh_events.c geometry.c module_list.c focus.c \
 	windowlist.c functable.c menuitem.c expand.c module_interface.c \
@@ -30,10 +30,10 @@ fvwm_SOURCES = \
 	menucmd.c ewmh_names.c icccm2.c windowshade.c focus_policy.c repeat.c \
 	execcontext.c menugeometry.c menudim.c condrc.c infostore.c
 
-fvwm_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+fvwm3_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 LDADD = \
-	-L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
+	-L$(top_builddir)/libs -lfvwm3 $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
 	$(stroke_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 \
 	$(X_EXTRA_LIBS) -lm $(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) \
 	$(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS)
@@ -49,17 +49,3 @@ AM_CFLAGS = \
 	-DFVWM_CONFDIR=\"$(FVWM_CONFDIR)\" \
 	-DFVWM_COLORSET_PRIVATE=1 \
 	-DLOCALEDIR=\"$(LOCALEDIR)\"
-
-## Create compatibility symlinks if available
-
-fvwm_name =`echo "fvwm" | "$(SED)" -e "${transform}"`
-fvwm2_name =`echo "fvwm2" | "$(SED)" -e "${transform}"`
-
-install-exec-local:
-	@rm -f $(DESTDIR)$(bindir)/$(fvwm2_name)$(EXEEXT)
-	@$(LN_S) $(fvwm_name)$(EXEEXT) \
-		$(DESTDIR)$(bindir)/$(fvwm2_name)$(EXEEXT) || \
-		echo "Minor warning: $(bindir)/fvwm2 symlink was not created"
-
-uninstall-local:
-	@rm -f $(DESTDIR)$(bindir)/$(fvwm2_name)$(EXEEXT)

libs/Makefile.am

@@ -1,9 +1,9 @@
 ## Process this file with automake to create Makefile.in
 
-noinst_LIBRARIES = libfvwm.a
+noinst_LIBRARIES = libfvwm3.a
 
 ## please keep .c files in largest first order to speed up parallel makes
-libfvwm_a_SOURCES = \
+libfvwm3_a_SOURCES = \
 	BidiJoin.h Bindings.h ClientMsg.h ColorUtils.h Colorset.h \
 	CombineChars.h Cursor.h Event.h FBidi.h FEvent.h FGettext.h FImage.h \
 	FRender.h FRenderInit.h FRenderInterface.h FSMlib.h FScreen.h \
@@ -26,9 +26,9 @@ libfvwm_a_SOURCES = \
 	fvwmrect.c FRenderInit.c safemalloc.c  FBidi.c \
 	wild.c Grab.c Event.c ClientMsg.c setpgrp.c FShape.c \
 	FGettext.c Rectangles.c timeout.c flist.c charmap.c wcontext.c \
-	modifiers.c fsm.c FTips.c fio.c fvwmlib.c
+	modifiers.c fsm.c FTips.c fio.c fvwmlib3.c
 
-libfvwm_a_LIBADD = @LIBOBJS@
+libfvwm3_a_LIBADD = @LIBOBJS@
 
 AM_CPPFLAGS = -I$(top_srcdir) $(xpm_CFLAGS) $(Xft_CFLAGS) $(X_CFLAGS) \
 	$(iconv_CFLAGS) $(Xrender_CFLAGS) $(Bidi_CFLAGS) $(png_CFLAGS) \

modules/FvwmAnimate/Makefile.am

@@ -8,12 +8,12 @@ man_MANS = FvwmAnimate.1
 EXTRA_DIST = $(man_MANS)
 
 FvwmAnimate_SOURCES = FvwmAnimate.c FvwmAnimate.h
-FvwmAnimate_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmAnimate_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 ## Xpm note: while this module may not depend on Xpm explicitly,
 ## there are sometimes dependencies through functions in libfvwm
 ## so we might as well link against libXpm, if present.
-LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm $(xpm_LIBS) $(rplay_LIBS) \
+LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm3 $(xpm_LIBS) $(rplay_LIBS) \
 	$(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) -lm $(png_LIBS) \
 	$(rsvg_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS)
 

modules/FvwmAuto/Makefile.am

@@ -8,9 +8,9 @@ man_MANS = FvwmAuto.1
 EXTRA_DIST = $(man_MANS)
 
 FvwmAuto_SOURCES = FvwmAuto.c
-FvwmAuto_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmAuto_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
-LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm  \
+LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm3  \
 	$(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)
 
 AM_CPPFLAGS = -I$(top_srcdir) $(X_CFLAGS)

modules/FvwmBacker/Makefile.am

@@ -13,9 +13,9 @@ config_DATA = \
   ConfigFvwmBacker
 
 FvwmBacker_SOURCES = FvwmBacker.c FvwmBacker.h root_bits.c
-FvwmBacker_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmBacker_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
-LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm \
+LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm3 \
 	$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) \
 	$(Xrender_LIBS) $(rsvg_LIBS)
 

modules/FvwmBanner/Makefile.am

@@ -10,12 +10,12 @@ man_MANS = FvwmBanner.1
 EXTRA_DIST = $(man_MANS) fvwm-logo-current.xpm fvwm-logo-current.xbm
 
 FvwmBanner_SOURCES = FvwmBanner.c
-FvwmBanner_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a fvwm-logo-current.xpm
+FvwmBanner_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a fvwm-logo-current.xpm
 
 ## Xpm note: while this module may not depend on Xpm explicitly,
 ## there are sometimes dependencies through functions in libfvwm
 ## so we might as well link against libXpm, if present.
-LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm -lm $(xpm_LIBS)  \
+LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm3 -lm $(xpm_LIBS)  \
 	$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) \
 	$(png_LIBS) $(rsvg_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS)
 

modules/FvwmButtons/Makefile.am

@@ -16,12 +16,12 @@ FvwmButtons_SOURCES = \
 	icons.c icons.h misc.c misc.h output.c parse.c parse.h \
 	dynamic.c dynamic.h
 
-FvwmButtons_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmButtons_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 ## Xpm note: while this module may not depend on Xpm explicitly,
 ## there are sometimes dependencies through functions in libfvwm
 ## so we might as well link against libXpm, if present.
-LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS)  \
+LDADD = -L$(top_builddir)/libs -lfvwm3 $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS)  \
 	$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) \
 	$(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) $(Bidi_LIBS) \
 	$(png_LIBS) $(rsvg_LIBS)

modules/FvwmCommand/Makefile.am

@@ -24,13 +24,13 @@ FvwmCommand.pm: findcmd.pl $(top_srcdir)/fvwm/functable.c
 
 CLEANFILES = FvwmCommand.sh FvwmCommand.pm
 
-FvwmCommand_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmCommand_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 man_MANS = FvwmCommand.1
 
 EXTRA_DIST = $(man_MANS) findcmd.pl
 
-LDADD = -L$(top_builddir)/libs -lfvwm
+LDADD = -L$(top_builddir)/libs -lfvwm3
 
 # FIXME:
 # Despite not using X functions explicitly, the code includes

modules/FvwmCommandS/Makefile.am

@@ -7,9 +7,9 @@ module_PROGRAMS = FvwmCommandS
 
 FvwmCommandS_SOURCES = FvwmCommandS.c FvwmCommand.h fifos.c
 
-FvwmCommandS_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmCommandS_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
-LDADD = -L$(top_builddir)/libs -lfvwm
+LDADD = -L$(top_builddir)/libs -lfvwm3
 
 # FIXME:
 # Despite not using X functions explicitly, the code includes

modules/FvwmConsole/Makefile.am

@@ -11,14 +11,14 @@ module_SCRIPTS = FvwmConsoleC.pl
 FvwmConsole_SOURCES = FvwmConsole.c FvwmConsole.h
 FvwmConsoleC_SOURCES = FvwmConsoleC.c FvwmConsole.h getline.c
 
-FvwmConsole_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
-FvwmConsoleC_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmConsole_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
+FvwmConsoleC_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 man_MANS = FvwmConsole.1 FvwmConsoleC.pl.1
 EXTRA_DIST = FvwmConsoleC.pl.in $(man_MANS) Changes .fvwm2rc.sample
 
 # Use X_EXTRA_LIBS to get socket(), etc.
-LDADD = -L$(top_builddir)/libs -lfvwm $(readline_LIBS) $(X_EXTRA_LIBS)
+LDADD = -L$(top_builddir)/libs -lfvwm3 $(readline_LIBS) $(X_EXTRA_LIBS)
 
 # FIXME:
 # Despite not using X functions explicitly, the code includes

modules/FvwmCpp/Makefile.am

@@ -8,12 +8,12 @@ man_MANS = FvwmCpp.1
 EXTRA_DIST = $(man_MANS)
 
 FvwmCpp_SOURCES = FvwmCpp.c FvwmCpp.h
-FvwmCpp_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmCpp_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 ## Xpm note: while this module may not depend on Xpm explicitly,
 ## there are sometimes dependencies through functions in libfvwm
 ## so we might as well link against libXpm, if present.
-LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm -lm  \
+LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm3 -lm  \
 	$(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)
 
 AM_CPPFLAGS = -I$(top_srcdir) $(X_CFLAGS)

modules/FvwmEvent/Makefile.am

@@ -8,7 +8,7 @@ man_MANS = FvwmEvent.1
 EXTRA_DIST = $(man_MANS)
 
 FvwmEvent_SOURCES = FvwmEvent.c
-FvwmEvent_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmEvent_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 # This module behaves like the old FvwmAudio when invoked with that name.
 install-exec-local: ../../config.h Makefile
@@ -22,7 +22,7 @@ install-exec-local: ../../config.h Makefile
 uninstall-local:
 	@rm -f $(DESTDIR)$(moduleexecdir)/FvwmAudio
 
-LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm $(rplay_LIBS) \
+LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm3 $(rplay_LIBS) \
 	$(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)
 
 AM_CPPFLAGS = -I$(top_srcdir) $(rplay_CFLAGS) $(X_CFLAGS)

modules/FvwmForm/Makefile.am

@@ -32,7 +32,7 @@ EXTRA_DIST = $(man_MANS) Changes \
 
 FvwmForm_SOURCES = FvwmForm.c FvwmForm.h ReadXServer.c ParseCommand.c
 
-FvwmForm_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmForm_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 config_DATA =             \
   FvwmForm-Form           \
@@ -49,7 +49,7 @@ config_DATA =             \
 ## Xpm note: while this module may not depend on Xpm explicitly,
 ## there are sometimes dependencies through functions in libfvwm
 ## so we might as well link against libXpm, if present.
-LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS)  \
+LDADD = -L$(top_builddir)/libs -lfvwm3 $(Xft_LIBS) $(X_LIBS)  \
 	$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) \
 	-lm $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS)
 

modules/FvwmIconMan/Makefile.am

@@ -16,12 +16,12 @@ FvwmIconMan_SOURCES = FvwmIconMan.c FvwmIconMan.h debug.c debug.h \
 	functions.c fvwm.c globals.c readconfig.c readconfig.h \
 	winlist.c x.c x.h xmanager.c xmanager.h
 
-FvwmIconMan_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmIconMan_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 ## Xpm note: while this module may not depend on Xpm explicitly,
 ## there are sometimes dependencies through functions in libfvwm
 ## so we might as well link against libXpm, if present.
-LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) \
+LDADD = -L$(top_builddir)/libs -lfvwm3 $(Xft_LIBS) $(X_LIBS) \
 	$(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) \
 	$(iconv_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) -lm $(Bidi_LIBS)
 

modules/FvwmIdent/Makefile.am

@@ -13,12 +13,12 @@ config_DATA = \
   ConfigFvwmIdent
 
 FvwmIdent_SOURCES = FvwmIdent.c FvwmIdent.h
-FvwmIdent_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmIdent_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 ## Xpm note: while this module may not depend on Xpm explicitly,
 ## there are sometimes dependencies through functions in libfvwm
 ## so we might as well link against libXpm, if present.
-LDADD = -L$(top_builddir)/libs -lfvwm $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
+LDADD = -L$(top_builddir)/libs -lfvwm3 $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
 	$(png_LIBS) $(X_PRE_LIBS) $(Xinerama_LIBS) -lXext -lX11 -lm \
 	$(X_EXTRA_LIBS) $(Xrender_LIBS) $(rsvg_LIBS) $(iconv_LIBS) $(Bidi_LIBS)
 

modules/FvwmM4/Makefile.am

@@ -8,12 +8,12 @@ man_MANS = FvwmM4.1
 EXTRA_DIST = $(man_MANS)
 
 FvwmM4_SOURCES = FvwmM4.c FvwmM4.h
-FvwmM4_DEPENDENCIES = $(top_builddir)/libs/libfvwm.a
+FvwmM4_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a
 
 ## Xpm note: while this module may not depend on Xpm explicitly,
 ## there are sometimes dependencies through functions in libfvwm
 ## so we might as well link against libXpm, if present.
-LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm -lm  \
+LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm3 -lm  \
 	$(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)
 
 AM_CPPFLAGS = -I$(top_srcdir) $(X_CFLAGS)