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 pull request #10 from erikarn/20220618_fix_make

Browse Source 
[amiwm] Fix make rules to work under BSD make
This commit is contained in:
Adrian Chadd
2022-06-18 19:14:59 -07:00
committed by GitHub
parent feb42adcc6 918365056b
commit 5577e78cc8
1 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
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 \
@@ -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; \