Fix null pointer access in strhandle

[st.git] / Makefile

diff --git a/Makefile b/Makefile
index 52af636..470ac86 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,60 +1,57 @@
 # st - simple terminal
 # See LICENSE file for copyright and license details.
 # st - simple terminal
 # See LICENSE file for copyright and license details.

+.POSIX:

 
 include config.mk
 
 
 include config.mk
 

-SRC = st.c
-OBJ = ${SRC:.c=.o}
+SRC = st.c x.c
+OBJ = $(SRC:.c=.o)

 
 all: options st
 
 options:
        @echo st build options:
 
 all: options st
 
 options:
        @echo st build options:

-       @echo "CFLAGS   = ${CFLAGS}"
-       @echo "LDFLAGS  = ${LDFLAGS}"
-       @echo "CC       = ${CC}"
+       @echo "CFLAGS  = $(STCFLAGS)"
+       @echo "LDFLAGS = $(STLDFLAGS)"
+       @echo "CC      = $(CC)"

 
 config.h:
        cp config.def.h config.h
 
 .c.o:
 
 config.h:
        cp config.def.h config.h
 
 .c.o:

-       @echo CC $<
-       @${CC} -c ${CFLAGS} $<
+       $(CC) $(STCFLAGS) -c $<

 
 

-${OBJ}: config.h config.mk
+st.o: config.h st.h win.h
+x.o: arg.h config.h st.h win.h

 
 

-st: ${OBJ}
-       @echo CC -o $@
-       @${CC} -o $@ ${OBJ} ${LDFLAGS}
+$(OBJ): config.h config.mk
+
+st: $(OBJ)
+       $(CC) -o $@ $(OBJ) $(STLDFLAGS)

 
 clean:
 
 clean:

-       @echo cleaning
-       @rm -f st ${OBJ} st-${VERSION}.tar.gz
+       rm -f st $(OBJ) st-$(VERSION).tar.gz

 
 dist: clean
 
 dist: clean

-       @echo creating dist tarball
-       @mkdir -p st-${VERSION}
-       @cp -R LICENSE Makefile README config.mk config.def.h st.info st.1 ${SRC} st-${VERSION}
-       @tar -cf st-${VERSION}.tar st-${VERSION}
-       @gzip st-${VERSION}.tar
-       @rm -rf st-${VERSION}
-
-install: all
-       @echo installing executable file to ${DESTDIR}${PREFIX}/bin
-       @mkdir -p ${DESTDIR}${PREFIX}/bin
-       @cp -f st ${DESTDIR}${PREFIX}/bin
-       @chmod 755 ${DESTDIR}${PREFIX}/bin/st
-       @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
-       @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-       @sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
-       @chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
+       mkdir -p st-$(VERSION)
+       cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\
+               config.def.h st.info st.1 arg.h st.h win.h $(SRC)\
+               st-$(VERSION)
+       tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz
+       rm -rf st-$(VERSION)
+
+install: st
+       mkdir -p $(DESTDIR)$(PREFIX)/bin
+       cp -f st $(DESTDIR)$(PREFIX)/bin
+       chmod 755 $(DESTDIR)$(PREFIX)/bin/st
+       mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+       sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
+       chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
+       tic -sx st.info

        @echo Please see the README file regarding the terminfo entry of st.
        @echo Please see the README file regarding the terminfo entry of st.

-       @tic -s st.info

 
 uninstall:
 
 uninstall:

-       @echo removing executable file from ${DESTDIR}${PREFIX}/bin
-       @rm -f ${DESTDIR}${PREFIX}/bin/st
-       @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
-       @rm -f ${DESTDIR}${MANPREFIX}/man1/st.1
+       rm -f $(DESTDIR)$(PREFIX)/bin/st
+       rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1

 
 .PHONY: all options clean dist install uninstall
 
 .PHONY: all options clean dist install uninstall