diff --git a/CMakeLists.txt b/CMakeLists.txt index 495944d..bc5276b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,10 +22,10 @@ add_executable(yo_dwm src/config.h src/drw.c src/drw.h - src/dwm.c + src/yo_dwm.c src/movestack.c src/transient.c src/util.c - src/util.h src/keys/mouse.c src/keys/mouse.h src/keys/functions.h src/dwm.h src/colors/dracula.h) + src/util.h src/keys/mouse.c src/keys/mouse.h src/keys/functions.h src/yo_dwm.h src/colors/dracula.h) target_link_libraries(yo_dwm X11 Xft Xinerama) diff --git a/src/Makefile b/src/Makefile index 4919ccb..19072cb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,13 +3,13 @@ include config.mk -SRC = drw.c dwm.c util.c +SRC = drw.c yo_dwm.c util.c OBJ = ${SRC:.c=.o} -all: options dwm +all: options yo-dwm options: - @echo dwm build options: + @echo yo-dwm build options: @echo "CFLAGS = ${CFLAGS}" @echo "LDFLAGS = ${LDFLAGS}" @echo "CC = ${CC}" @@ -22,41 +22,41 @@ ${OBJ}: config.h config.mk config.h: cp config.def.h $@ -dwm: ${OBJ} +yo-dwm: ${OBJ} ${CC} -o $@ ${OBJ} ${LDFLAGS} clean: - rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz + rm -f yo-dwm ${OBJ} yo-dwm_${VERSION}.tar.gz dist: clean - mkdir -p dwm-${VERSION} + mkdir -p yo-dwm_${VERSION} cp -R LICENSE Makefile README config.def.h config.mk\ - dwm.1 drw.h util.h ${SRC} dwm.png transient.c dwm-${VERSION} - tar -cf dwm-${VERSION}.tar dwm-${VERSION} - gzip dwm-${VERSION}.tar - rm -rf dwm-${VERSION} + yo-dwm.1 drw.h util.h ${SRC} dwm.png transient.c yo-dwm_${VERSION} + tar -cf yo-dwm_${VERSION}.tar yo-dwm_${VERSION} + gzip yo-dwm_${VERSION}.tar + rm -rf yo-dwm_${VERSION} install: all mkdir -p ${DESTDIR}${PREFIX}/bin - cp -f dwm ${DESTDIR}${PREFIX}/bin - chmod 755 ${DESTDIR}${PREFIX}/bin/dwm + cp -f yo-dwm ${DESTDIR}${PREFIX}/bin + chmod 755 ${DESTDIR}${PREFIX}/bin/yo-dwm mkdir -p ${DESTDIR}${MANPREFIX}/man1 - sed "s/VERSION/${VERSION}/g" < ../dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1 - chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1 + sed "s/VERSION/${VERSION}/g" < ../yo-dwm.1 > ${DESTDIR}${MANPREFIX}/man1/yo-dwm.1 + chmod 644 ${DESTDIR}${MANPREFIX}/man1/yo-dwm.1 -desktopfile: - full_path=/usr/share/xsessions/dwm-anas.desktop +desktop: + full_path=/usr/share/xsessions/yo-dwm.desktop mkdir -p /usr/share/xsessions cat <> ${full_path} [Desktop Entry] Type=XSession - Exec=/usr/local/bin/dwm - DesktopNames=dwm-anas - Name=dwm-anas - Comment=Anas Elgarhy dwm fork, with a lot of beautiful patches + Exec=/usr/local/bin/yo-dwm + DesktopNames=yo-dwm + Name=yo-dwm + Comment=Anas Elgarhy's dwm fork, with a lot of beautiful patches uninstall: - rm -f ${DESTDIR}${PREFIX}/bin/dwm\ - ${DESTDIR}${MANPREFIX}/man1/dwm.1 + rm -f ${DESTDIR}${PREFIX}/bin/yo-dwm\ + ${DESTDIR}${MANPREFIX}/man1/yo-dwm.1 .PHONY: all options clean dist install uninstall diff --git a/src/keys/functions.h b/src/keys/functions.h index 8eb2d7a..4eb40e5 100644 --- a/src/keys/functions.h +++ b/src/keys/functions.h @@ -5,7 +5,7 @@ #ifndef FUNCTIONS_H #define FUNCTIONS_H -#include "../dwm.h" +#include "../yo_dwm.h" static void spawn(const Arg *arg); diff --git a/src/keys/keys.h b/src/keys/keys.h index dbb14c4..6b19e97 100644 --- a/src/keys/keys.h +++ b/src/keys/keys.h @@ -1,7 +1,7 @@ #ifndef KEYS_H #define KEYS_H -#include "../dwm.h" +#include "../yo_dwm.h" #include typedef struct { diff --git a/src/layouts/centeredmaster.c b/src/layouts/centeredmaster.c index c5b91cd..89c0292 100644 --- a/src/layouts/centeredmaster.c +++ b/src/layouts/centeredmaster.c @@ -1,4 +1,4 @@ -#include "../dwm.h" +#include "../yo_dwm.h" #include "../util.h" void diff --git a/src/layouts/fibonacci.c b/src/layouts/fibonacci.c index 6c94c67..7fd95fd 100644 --- a/src/layouts/fibonacci.c +++ b/src/layouts/fibonacci.c @@ -1,4 +1,4 @@ -#include "../dwm.h" +#include "../yo_dwm.h" void fibonacci(Monitor *mon, int s) { diff --git a/src/layouts/grid.c b/src/layouts/grid.c index d6b3712..44df80e 100644 --- a/src/layouts/grid.c +++ b/src/layouts/grid.c @@ -1,4 +1,4 @@ -#include "../dwm.h" +#include "../yo_dwm.h" void grid(Monitor *m) { diff --git a/src/layouts/monocle.c b/src/layouts/monocle.c index 7ddaf78..3bb956f 100644 --- a/src/layouts/monocle.c +++ b/src/layouts/monocle.c @@ -1,4 +1,4 @@ -#include "../dwm.h" +#include "../yo_dwm.h" #include "../util.h" void diff --git a/src/layouts/tile.c b/src/layouts/tile.c index 206c13e..2df3c54 100644 --- a/src/layouts/tile.c +++ b/src/layouts/tile.c @@ -1,4 +1,4 @@ -#include "../dwm.h" +#include "../yo_dwm.h" #include "../util.h" void diff --git a/src/movestack.c b/src/movestack.c index 74f0cb2..1e80328 100644 --- a/src/movestack.c +++ b/src/movestack.c @@ -1,4 +1,4 @@ -#include "dwm.h" +#include "yo_dwm.h" #include "util.h" static void @@ -47,4 +47,4 @@ movestack(const Arg *arg) { arrange(selmon); } -} \ No newline at end of file +} diff --git a/src/dwm.c b/src/yo_dwm.c similarity index 99% rename from src/dwm.c rename to src/yo_dwm.c index 7033159..3f11175 100644 --- a/src/dwm.c +++ b/src/yo_dwm.c @@ -44,7 +44,7 @@ #include "drw.h" #include "util.h" -#include "dwm.h" +#include "yo_dwm.h" /* macros */ #define SYSTEM_TRAY_REQUEST_DOCK 0 diff --git a/src/dwm.h b/src/yo_dwm.h similarity index 100% rename from src/dwm.h rename to src/yo_dwm.h diff --git a/dwm.1 b/yo-dwm.1 similarity index 100% rename from dwm.1 rename to yo-dwm.1