Improve consistency of warning flags between makefiles.

Change default CC to cc.

Change symlinks to be relative.

Eliminate warnings.

diff --git a/Makefile b/Makefile
index d32b0b2ebec0d0ec2a8f1dfa254b4952aa4eb071..8b94bb5aa73010c22c29dcc6bd97bc44f4151787 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ MANDIR= ${PREFIX}/man/man
 obj: _xenocara_obj
 
 beforeinstall:
-       ln -sf ${BINDIR}/${PROG} ${BINDIR}/scrotwm
+       ln -sf ${PROG} ${BINDIR}/scrotwm
 
 # clang targets
 .if ${.TARGETS:M*analyze*}

diff --git a/freebsd/Makefile b/freebsd/Makefile
index 0d0dac25f9910db45cb02bc2e07e041308434a00..1cc31435c8408f716168f08513e00b7c8edffea4 100644 (file)
--- a/freebsd/Makefile
+++ b/freebsd/Makefile
@@ -7,14 +7,16 @@ SWM_BINDIR?= $(PREFIX)/bin
 SWM_LIBDIR?= $(PREFIX)/lib
 SWM_MANDIR?= $(PREFIX)/man
 
+CC?= cc
+
 LVERS!=        awk -F = '/major/ { printf( "%s.", $$2 ) } /minor/ { printf( "%s", $$2 ) }' ${.CURDIR}/../lib/shlib_version
 BUILDVERSION!= sh "${.CURDIR}/../buildver.sh"
 .if !${BUILDVERSION} == ""
 CFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
 .endif
 
-CFLAGS+= -Wall -Wextra -I. -I${LOCALBASE}/include \
-        -I${LOCALBASE}/include/freetype2
+CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
+CFLAGS+= -I. -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
 CFLAGS+= -DSWM_LIB=\"$(SWM_LIBDIR)/libswmhack.so.$(LVERS)\"
 LDADD+= -lutil -L${LOCALBASE}/lib -lX11 -lX11-xcb -lxcb \
        -lxcb-icccm -lxcb-keysyms -lxcb-randr -lxcb-util -lxcb-xtest -lXft -lXcursor
@@ -49,7 +51,7 @@ install: all
        install -m 644 ../spectrwm_it.1 $(SWM_MANDIR)/man1/spectrwm_it.1
        install -m 644 ../spectrwm_pt.1 $(SWM_MANDIR)/man1/spectrwm_pt.1
        install -m 644 ../spectrwm_ru.1 $(SWM_MANDIR)/man1/spectrwm_ru.1
-       ln -sf $(SWM_BINDIR)/spectrwm $(SWM_BINDIR)/scrotwm
+       ln -sf spectrwm $(SWM_BINDIR)/scrotwm
 
 clean:
        rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c version.h

diff --git a/lib/Makefile b/lib/Makefile
index decc2ba35e73d8400f5762adf69ecf8fba480838..98251ef267d40ce596a5431b29f503f79b1f1aed 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -7,10 +7,13 @@ NOMAN=        yes
 SRCS=  swm_hack.c
 LIBDIR= ${X11BASE}/lib
 
+CC?= cc
+
 DEBUGLIBS= no
 NOPROFILE= yes
 
-CFLAGS+=-Wall -Wno-uninitialized -g -fPIC
+CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
+CFLAGS+= -fPIC
 CFLAGS+= -I${X11BASE}/include
 
 install:

diff --git a/linux/Makefile b/linux/Makefile
index 5d0cd5d44871426a8e90f17ce6ecd125d8ed8721..73c3d37f8224f5924f897d67b520d663cb07fb77 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,5 +1,5 @@
-CFLAGS+= -std=c99 -Wall -Wextra -Wmissing-prototypes -Wshadow -g -D_GNU_SOURCE -I. -I/usr/include/freetype2
-CFLAGS+= -DSWM_LIB=\"libswmhack.so.$(LVERS)\"
+CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
+CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\"
 LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
 
 PREFIX?= /usr/local
@@ -7,7 +7,7 @@ BINDIR?= $(PREFIX)/bin
 LIBDIR?= $(PREFIX)/lib
 MANDIR?= $(PREFIX)/share/man
 
-CC?= gcc
+CC?= cc
 
 LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
 
@@ -29,7 +29,7 @@ spectrwm: spectrwm.o linux.o
        $(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
 
 %.so: %.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -c -fpic -DPIC $+ -o $@
+       $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
 
 libswmhack.so.$(LVERS): swm_hack.so
        $(CC) $(LDFLAGS) -Wl,-soname,$@ -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)

diff --git a/osx/Makefile b/osx/Makefile
index 899b3fb1b4f81619cb024b2df157c1c63d4c0999..db7d3d9a0f0d7538a256549375bec20a37ec1e68 100644 (file)
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -9,7 +9,8 @@ LDADD+=  -L/opt/local/lib -lX11 -lXcursor -lXft
 
 LDADD+=  -lxcb-keysyms -lxcb-util -lxcb-randr -lX11-xcb -lxcb-xtest -lxcb -lxcb-icccm
 
-CFLAGS+= -O2 -Wall -g -D_GNU_SOURCE -D__OSX__ -I. -I.. ${INCFLAGS}
+CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
+CFLAGS+= -O2 -D_GNU_SOURCE -D__OSX__ -I. -I.. ${INCFLAGS}
 CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
 
 PREFIX?= /usr/local
@@ -17,7 +18,7 @@ BINDIR?= $(PREFIX)/bin
 LIBDIR?= $(PREFIX)/lib
 MANDIR?= $(PREFIX)/share/man
 
-CC= gcc
+CC?= cc
 
 LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
 
@@ -38,7 +39,7 @@ spectrwm: spectrwm.o osx.o
        $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
 
 libswmhack.so.$(LVERS): swm_hack.so
-       $(CC) -shared -fpic -o libswmhack.so.$(LVERS) $(LDADD) swm_hack.so
+       $(CC) $(LDFLAGS) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
 # replace above line with this for OSX 10.5
 #      $(CC) -shared -bundle -fpic -o libswmhack.so.$(LVERS) $(LDADD) swm_hack.so
 
@@ -53,7 +54,9 @@ install: all
        install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1
        install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1
        install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1
-       ln -sf $(DESTDIR)$(BINDIR)/spectrwm $(DESTDIR)$(BINDIR)/scrotwm
+       ln -sf spectrwm $(DESTDIR)$(BINDIR)/scrotwm
+       ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so.0
+       ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so
 
 clean:
        rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c tree.h version.h