bonkmaykr/amiwm-neo
1
0
Fork 0
mirror of https://github.com/amiwm/amiwm.git synced 2026-04-14 11:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:erikarn/amiwm-2

Browse Source
This commit is contained in:
Adrian Chadd
2022-09-05 16:05:52 -07:00
parent 229d2b2c4d 5577e78cc8
commit c0450d83bc
3 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Imakefile
View File

@@ -67,7 +67,7 @@ InstallNonExec(def_tool.info, $(AMIWM_HOME)/def_tool.info)
/* Targets for my private use. Not very portable. // Marcus */ /* 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 system.amiwmrc def_tool.info
patch : patch :

17
Makefile.in
View File

@@ -24,9 +24,8 @@ STRIPFLAG = -s
PROGS = amiwm requestchoice executecmd ppmtoinfo config_util PROGS = amiwm requestchoice executecmd ppmtoinfo config_util
MODULES = $(srcdir)/Background $(srcdir)/Keyboard $(srcdir)/Background_resize \ MODULES = Background Keyboard Background_resize Background_stretch \
$(srcdir)/Background_stretch $(srcdir)/def_tool.info $(srcdir)/Filesystem \ def_tool.info Filesystem Launcher
$(srcdir)/Launcher
OBJS = main.o screen.o client.o frame.o icc.o \ OBJS = main.o screen.o client.o frame.o icc.o \
icon.o menu.o diskobject.o gram.o lex.o rc.o \ icon.o menu.o diskobject.o gram.o lex.o rc.o \
@@ -38,7 +37,7 @@ SRCS = main.c screen.c client.c frame.c icc.c \
requestchoice.c executecmd.c kbdmodule.c kbdlexer.c \ requestchoice.c executecmd.c kbdmodule.c kbdlexer.c \
config_util.c launchermodule.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 \ configure configure.in Makefile.in install-sh smakefile scoptions \
*.[chly] system.amiwmrc def_*.info *.map \ *.[chly] system.amiwmrc def_*.info *.map \
Background Background_resize Background_resize_norepeat \ Background Background_resize Background_resize_norepeat \
@@ -74,7 +73,7 @@ diskobject.o : diskobject.c
$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $< $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $<
filesystem.o: joke_fs.c filesystem.o: joke_fs.c
$(CC) -o $@ -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $< $(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)\" $< $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $<
@@ -102,16 +101,16 @@ install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init
$(INSTALL) $(STRIPFLAG) config_util $(AMIWM_HOME)/config_util $(INSTALL) $(STRIPFLAG) config_util $(AMIWM_HOME)/config_util
$(INSTALL) $(STRIPFLAG) executecmd $(AMIWM_HOME)/executecmd $(INSTALL) $(STRIPFLAG) executecmd $(AMIWM_HOME)/executecmd
for module in $(MODULES); do \ for module in $(MODULES); do \
if [ "$$module" = "$(srcdir)/Background" ]; then \ if [ "$$module" = "Background" ]; then \
$(INSTALL) $$module $(AMIWM_MODULES)/Background; \ $(INSTALL) $$module $(AMIWM_MODULES)/Background; \
else \ else \
if [ "$$module" = "$(srcdir)/Background_resize" ]; then \ if [ "$$module" = "Background_resize" ]; then \
$(INSTALL) $$module $(AMIWM_MODULES)/Background_resize; \ $(INSTALL) $$module $(AMIWM_MODULES)/Background_resize; \
else \ else \
if [ "$$module" = "$(srcdir)/Background_stretch" ]; then \ if [ "$$module" = "Background_stretch" ]; then \
$(INSTALL) $$module $(AMIWM_MODULES)/Background_stretch; \ $(INSTALL) $$module $(AMIWM_MODULES)/Background_stretch; \
else \ else \
if [ "$$module" = "$(srcdir)/def_tool.info" ]; then \ if [ "$$module" = "def_tool.info" ]; then \
$(INSTALL) $$module $(AMIWM_MODULES)/def_tool.info; \ $(INSTALL) $$module $(AMIWM_MODULES)/def_tool.info; \
else \ else \
$(INSTALL) $(STRIPFLAG) $$module $(AMIWM_MODULES)/$$module; \ $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_MODULES)/$$module; \

2
amiwm.1
View File

@@ -134,7 +134,7 @@ shared amongst different architectures.
Start a module with the specified name. If initstring is specified, it Start a module with the specified name. If initstring is specified, it
is sent to the module. There are currently two modules shipped with is sent to the module. There are currently two modules shipped with
amiwm; Background and Keyboard. These are documented in the file 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. Background module, the screen that was created last is used.
.SH InterScreenGap number .SH InterScreenGap number