From e6f7a1bc17e8c19a77701925b1b72bcc8b2dc646 Mon Sep 17 00:00:00 2001 From: Justin Dossey Date: Wed, 25 May 2022 10:06:37 -0700 Subject: [PATCH 1/2] Correct filenames for README and MODULES The README file in this repo is called README.md and the old README.modules is now named MODULES.md. Changed references to those files (including in the man page) to reflect what is in the repo today. --- Imakefile | 2 +- Makefile.in | 2 +- amiwm.1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Imakefile b/Imakefile index 3b99c2f..9f23a4a 100644 --- a/Imakefile +++ b/Imakefile @@ -67,7 +67,7 @@ InstallNonExec(def_tool.info, $(AMIWM_HOME)/def_tool.info) /* Targets for my private use. Not very portable. // Marcus */ -DISTFILES = README INSTALL Imakefile smakefile scoptions *.[chly] \ +DISTFILES = README.md INSTALL Imakefile smakefile scoptions *.[chly] \ system.amiwmrc def_tool.info patch : diff --git a/Makefile.in b/Makefile.in index 5e323c6..5099ad7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38,7 +38,7 @@ SRCS = main.c screen.c client.c frame.c icc.c \ requestchoice.c executecmd.c kbdmodule.c kbdlexer.c \ config_util.c launchermodule.c -DISTFILES = README README.modules INSTALL LICENSE amiwm.1 \ +DISTFILES = README.md MODULES.md INSTALL LICENSE amiwm.1 \ configure configure.in Makefile.in install-sh smakefile scoptions \ *.[chly] system.amiwmrc def_*.info *.map \ Background Background_resize Background_resize_norepeat \ diff --git a/amiwm.1 b/amiwm.1 index 6e90cf2..cbed6a1 100644 --- a/amiwm.1 +++ b/amiwm.1 @@ -134,7 +134,7 @@ shared amongst different architectures. Start a module with the specified name. If initstring is specified, it is sent to the module. There are currently two modules shipped with amiwm; Background and Keyboard. These are documented in the file -README.modules. If a module is limited to a single screen, like the +MODULES.md. If a module is limited to a single screen, like the Background module, the screen that was created last is used. .SH InterScreenGap number From 918365056b651fd1ba8e98430998cf9ecc43d55e Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Sat, 18 Jun 2022 19:13:03 -0700 Subject: [PATCH 2/2] [amiwm] Fix make rules to work under BSD make * fix whitespace * filesystem / jokefs rule implication stuff was working fine in GNU make but not in BSD make, so fix it there * Remove the $(srcdir)/module thing, because it was tripping up BSD make rules. The "./" is just making it angry. Tested: * FreeBSD, gmake and make --- Makefile.in | 77 ++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5e323c6..c41bcfa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,9 +24,8 @@ STRIPFLAG = -s PROGS = amiwm requestchoice executecmd ppmtoinfo config_util -MODULES = $(srcdir)/Background $(srcdir)/Keyboard $(srcdir)/Background_resize \ - $(srcdir)/Background_stretch $(srcdir)/def_tool.info $(srcdir)/Filesystem \ - $(srcdir)/Launcher +MODULES = Background Keyboard Background_resize Background_stretch \ + def_tool.info Filesystem Launcher OBJS = main.o screen.o client.o frame.o icc.o \ icon.o menu.o diskobject.o gram.o lex.o rc.o \ @@ -50,33 +49,33 @@ PACKAGENAME = amiwm AMIWM_HOME = $(libdir)/amiwm AMIWM_MODULES = $(libdir)/amiwm/modules -all : lib_all +all: lib_all @$(MAKE) local_all -local_all : $(PROGS) $(MODULES) +local_all: $(PROGS) $(MODULES) -lib_all : +lib_all: @( cd libami; $(MAKE) all ) -lib_clean : +lib_clean: @( cd libami; $(MAKE) clean ) .c.o: $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -menu.o : menu.c +menu.o: menu.c $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $< -rc.o : rc.c +rc.o: rc.c $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $< -diskobject.o : diskobject.c +diskobject.o: diskobject.c $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $< -filesystem.o : joke_fs.c - $(CC) -o $@ -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $< +filesystem.o: joke_fs.c + $(CC) -o $@ -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" joke_fs.c -ppmtoinfo.o : ppmtoinfo.c +ppmtoinfo.o: ppmtoinfo.c $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $< gram.h gram.c: gram.y @@ -84,7 +83,7 @@ gram.h gram.c: gram.y mv y.tab.c gram.c mv y.tab.h gram.h -lex.c : lex.l +lex.c: lex.l $(LEX) -t $< > lex.c kbdmodule.h kbdmodule.c: kbdmodule.y @@ -92,30 +91,30 @@ kbdmodule.h kbdmodule.c: kbdmodule.y mv y.tab.c kbdmodule.c mv y.tab.h kbdmodule.h -kbdlexer.c : kbdlexer.l +kbdlexer.c: kbdlexer.l $(LEX) -t $< > kbdlexer.c -install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init +install: $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init -mkdir -p $(AMIWM_HOME) -mkdir -p $(AMIWM_MODULES) $(INSTALL) $(STRIPFLAG) requestchoice $(AMIWM_HOME)/requestchoice $(INSTALL) $(STRIPFLAG) config_util $(AMIWM_HOME)/config_util $(INSTALL) $(STRIPFLAG) executecmd $(AMIWM_HOME)/executecmd for module in $(MODULES); do \ - if [ "$$module" = "$(srcdir)/Background" ]; then \ + if [ "$$module" = "Background" ]; then \ $(INSTALL) $$module $(AMIWM_MODULES)/Background; \ else \ - if [ "$$module" = "$(srcdir)/Background_resize" ]; then \ + if [ "$$module" = "Background_resize" ]; then \ $(INSTALL) $$module $(AMIWM_MODULES)/Background_resize; \ else \ - if [ "$$module" = "$(srcdir)/Background_stretch" ]; then \ + if [ "$$module" = "Background_stretch" ]; then \ $(INSTALL) $$module $(AMIWM_MODULES)/Background_stretch; \ else \ - if [ "$$module" = "$(srcdir)/def_tool.info" ]; then \ + if [ "$$module" = "def_tool.info" ]; then \ $(INSTALL) $$module $(AMIWM_MODULES)/def_tool.info; \ else \ - $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_MODULES)/$$module; \ - fi; \ + $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_MODULES)/$$module; \ + fi; \ fi; \ fi; \ fi; \ @@ -140,12 +139,12 @@ install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init -mkdir -p $(mandir)/man1 $(INSTALL) -m 644 $(srcdir)/amiwm.1 $(mandir)/man1/amiwm.1 -fs-install : Filesystem +fs-install: Filesystem $(INSTALL) $(STRIPFLAG) Filesystem $(AMIWM_HOME)/Filesystem $(INSTALL) -m 644 def_disk.info $(AMIWM_HOME)/def_disk.info $(INSTALL) -m 644 def_drawer.info $(AMIWM_HOME)/def_disk.info -cde-install : Xresources.amiwm Amilogo.bm Amilogo.pm +cde-install: Xresources.amiwm Amilogo.bm Amilogo.pm -mkdir -p $(DT_DIR)/config/C/Xresources.d $(INSTALL) -m 644 Xresources.amiwm $(DT_DIR)/config/C/Xresources.d/Xresources.amiwm -mkdir -p $(DT_DIR)/appconfig/icons/C @@ -153,57 +152,57 @@ cde-install : Xresources.amiwm Amilogo.bm Amilogo.pm $(INSTALL) -m 644 Amilogo.pm $(DT_DIR)/appconfig/icons/C/Amilogo.pm -amiwm : $(OBJS) $(LIBAMI) +amiwm: $(OBJS) $(LIBAMI) $(CC) -o amiwm $(OBJS) $(LIBS) -requestchoice : requestchoice.o $(LIBAMI) +requestchoice: requestchoice.o $(LIBAMI) $(CC) -o requestchoice requestchoice.o $(LIBS) -config_util : config_util.o $(LIBAMI) +config_util: config_util.o $(LIBAMI) $(CC) -o config_util config_util.o $(LIBS) -executecmd : executecmd.o $(LIBAMI) +executecmd: executecmd.o $(LIBAMI) $(CC) -o executecmd executecmd.o $(LIBS) -Filesystem : filesystem.o $(LIBAMI) +Filesystem: filesystem.o $(LIBAMI) $(CC) -o Filesystem filesystem.o $(LIBS) -Keyboard : kbdmodule.o kbdlexer.o $(LIBAMI) +Keyboard: kbdmodule.o kbdlexer.o $(LIBAMI) $(CC) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS) -Battery : battery_module.o $(LIBAMI) +Battery: battery_module.o $(LIBAMI) $(CC) -o Battery battery_module.o $(LIBS) -Launcher : launchermodule.o $(LIBAMI) +Launcher: launchermodule.o $(LIBAMI) $(CC) -o Launcher launchermodule.o $(LIBS) -ppmtoinfo : ppmtoinfo.o +ppmtoinfo: ppmtoinfo.o $(CC) -o ppmtoinfo ppmtoinfo.o -lm -localetest : localetest.o $(LIBAMI) +localetest: localetest.o $(LIBAMI) $(CC) -o localetest localetest.o $(LIBS) -clean : lib_clean +clean: lib_clean $(RM) core $(PROGS) $(LIBAMI) Keyboard Battery Launcher *.o $(RM) lex.yy.c lex.c y.tab.c y.tab.h gram.h gram.c $(RM) kbdlexer.c kbdmodule.h kbdmodule.c $(RM) config.log -distclean : clean +distclean: clean $(RM) config.status config.cache *~ $(RM) Makefile libami/Makefile Xresources.amiwm Xsession Xsession2 Xinitrc -spotless : distclean +spotless: distclean TAGS: etags *.[ch] libami/*.[ch] -patch : +patch: mv version.h old_version.h sed < old_version.h 's/l/"/' | awk '-F"' '{ printf "%s\"%sl%s\"\n",$$1,$$2,1+$$3 }' > version.h rm old_version.h -dist : version.h clean +dist: version.h clean ( version=`sed < version.h -e 's/^[^"]*"//' -e 's/"[^"]*$$//'`; \ tarname="$(PACKAGENAME)$$version.tar"; \ mkdir $(PACKAGENAME)$$version; \