PolytreeDE/polytreewm
1
0
Fork 0
Code Issues 4 Releases Activity

Remove unnecessary makefiles

Browse source
This commit is contained in:
Alex Kotov 2021-11-17 04:05:40 +05:00
parent 6e743a8d2f
commit 4bca8fc8f5
Signed by: kotovalexarian
GPG key ID: 553C0EBBEB5D5F08
5 changed files with 10 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -1,7 +1,4 @@
/config/1-custom.mk /config/1-generated.mk
/config/2-generated.mk /config/2-defvars.mk
/config/3-custom.mk
/config/4-defvars.mk
/config/5-custom.mk
/polytreewm /polytreewm
/src/*.o /src/*.o

21
Makefile
View file

@ -3,18 +3,12 @@
all: polytreewm all: polytreewm
include config/1-custom.mk include config/1-generated.mk
include config/2-generated.mk include config/2-defvars.mk
include config/3-custom.mk
include config/4-defvars.mk
include config/5-custom.mk
CONFIGMKS = \ CONFIGMKS = \
config/1-custom.mk \ config/1-generated.mk \
config/2-generated.mk \ config/2-defvars.mk \
config/3-custom.mk \
config/4-defvars.mk \
config/5-custom.mk
VERSION = 6.2 VERSION = 6.2
@ -64,12 +58,7 @@ clean:
rm -f polytreewm ${OBJ} rm -f polytreewm ${OBJ}
distclean: clean distclean: clean
rm -f \ rm -f $(CONFIGMKS)
config/1-custom.mk \
config/2-generated.mk \
config/3-custom.mk \
config/4-defvars.mk \
config/5-custom.mk
install: all install: all
mkdir -p ${DESTDIR}${BINDIR} mkdir -p ${DESTDIR}${BINDIR}

0
config/4-defvars-bsd.mk → config/2-defvars-bsd.mk
View file

0
config/4-defvars-gnu.mk → config/2-defvars-gnu.mk
View file

10
configure vendored
View file

@ -110,11 +110,7 @@ echo "MANDIR = $mandir"
echo "ENABLE_GNOME_TERMINAL = $enable_gnome_terminal" echo "ENABLE_GNOME_TERMINAL = $enable_gnome_terminal"
echo "ENABLE_XINERAMA = $enable_xinerama" echo "ENABLE_XINERAMA = $enable_xinerama"
touch 'config/1-custom.mk' cat > 'config/1-generated.mk' << MAKE
touch 'config/3-custom.mk'
touch 'config/5-custom.mk'
cat > 'config/2-generated.mk' << MAKE
PREFIX = $prefix PREFIX = $prefix
EPREFIX = $eprefix EPREFIX = $eprefix
BINDIR = $bindir BINDIR = $bindir
@ -126,7 +122,7 @@ MAKE
make_help_result="$(make --help 2>&1 || true)" make_help_result="$(make --help 2>&1 || true)"
if [ "$(echo "$make_help_result" | grep 'gnu.org')" = '' ]; then if [ "$(echo "$make_help_result" | grep 'gnu.org')" = '' ]; then
ln -sf '4-defvars-bsd.mk' 'config/4-defvars.mk' ln -sf '2-defvars-bsd.mk' 'config/2-defvars.mk'
else else
ln -sf '4-defvars-gnu.mk' 'config/4-defvars.mk' ln -sf '2-defvars-gnu.mk' 'config/2-defvars.mk'
fi fi