commit 079b2f6564ee7fbd71071aedde0c3c317b985d46 from: Stefan Sperling date: Sat Sep 08 14:56:10 2018 UTC add a Makefile hierarchy which builds the whole show commit - ad242220adab01ebd55a97a5701733d7256b2d32 commit + 079b2f6564ee7fbd71071aedde0c3c317b985d46 blob - 2f31fc45cd1c490ae0c867d0db07e38ad57d3d1a blob + e8932c8f9df52141dff8b8cfe9d03e125064fb93 --- got/Makefile +++ got/Makefile @@ -6,21 +6,10 @@ SRCS= got.c blame.c commit_graph.c delta.c diff.c dif object_idset.c object_parse.c opentemp.c path.c pack.c \ privsep.c reference.c repository.c sha1.c worktree.c inflate.c -GOT_LIBEXECDIR = ${HOME}/bin CPPFLAGS = -I${.CURDIR}/../include -I${.CURDIR}/../lib \ -DGOT_LIBEXECDIR=${GOT_LIBEXECDIR} LDADD = -lutil -lz DPADD = ${LIBZ} ${LIBUTIL} -.if defined(PROFILE) -CC = gcc -CPPFLAGS += -DPROFILE -DEBUG = -O0 -pg -.else -DEBUG = -O0 -g -.endif -CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable -#CFLAGS += -DGOT_PACK_NO_MMAP -#CFLAGS += -DGOT_NO_OBJ_CACHE # For now, default to installing binary in ~/bin GROUP!=id -g -n blob - /dev/null blob + 103d8cdb1fa53c4c75ee3ce22b958dacec5acdd9 (mode 644) --- /dev/null +++ Makefile @@ -0,0 +1,3 @@ +SUBDIR = libexec got tog regress + +.include blob - /dev/null blob + 894e86cb82d9dc6d0e0a129148bf40e2ff3bb703 (mode 644) --- /dev/null +++ Makefile.inc @@ -0,0 +1,13 @@ +GOT_LIBEXECDIR = ${HOME}/bin + +CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable +#CFLAGS += -DGOT_PACK_NO_MMAP +#CFLAGS += -DGOT_NO_OBJ_CACHE + +.if defined(PROFILE) +CC = gcc +CPPFLAGS += -DPROFILE +DEBUG = -O0 -pg +.else +DEBUG = -O0 -g +.endif blob - 261f1cc59455aad5fbbd415b6933ecf56a74f571 blob + 564acd4b5dec9e9f796f19fe13e4bb3e3e230610 --- libexec/got-read-blob/Makefile +++ libexec/got-read-blob/Makefile @@ -7,23 +7,12 @@ SRCS= got-read-blob.c delta.c error.c inflate.c objec CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib LDADD = -lutil -lz DPADD = ${LIBZ} ${LIBUTIL} -.if defined(PROFILE) -CC = gcc -CPPFLAGS += -DPROFILE -DEBUG = -O0 -pg -.else -DEBUG = -O0 -g -.endif -CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable -#CFLAGS += -DGOT_PACK_NO_MMAP -#CFLAGS += -DGOT_NO_OBJ_CACHE # For now, default to installing binary in ~/bin -LIBEXECDIR = ${HOME}/bin GROUP!=id -g -n install: ${INSTALL} ${INSTALL_COPY} -o ${USER} -g ${GROUP} \ - -m ${BINMODE} ${PROG} ${LIBEXECDIR}/${PROG} + -m ${BINMODE} ${PROG} ${GOT_LIBEXECDIR}/${PROG} # Don't install man pages yet NOMAN = Yes blob - /dev/null blob + 33f79980386c63a8da9a85071f4a800d04fd8d20 (mode 644) --- /dev/null +++ libexec/Makefile @@ -0,0 +1,3 @@ +SUBDIR = got-read-blob got-read-commit got-read-object got-read-tree + +.include blob - fe091982cd9735bf9abd120934bf0c1a6417b8d4 blob + 1470f726d1eb6653e5953e61b6fe9f72ec633bdb --- libexec/got-read-commit/Makefile +++ libexec/got-read-commit/Makefile @@ -7,23 +7,12 @@ SRCS= got-read-commit.c delta.c error.c inflate.c obj CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib LDADD = -lutil -lz DPADD = ${LIBZ} ${LIBUTIL} -.if defined(PROFILE) -CC = gcc -CPPFLAGS += -DPROFILE -DEBUG = -O0 -pg -.else -DEBUG = -O0 -g -.endif -CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable -#CFLAGS += -DGOT_PACK_NO_MMAP -#CFLAGS += -DGOT_NO_OBJ_CACHE # For now, default to installing binary in ~/bin -LIBEXECDIR = ${HOME}/bin GROUP!=id -g -n install: ${INSTALL} ${INSTALL_COPY} -o ${USER} -g ${GROUP} \ - -m ${BINMODE} ${PROG} ${LIBEXECDIR}/${PROG} + -m ${BINMODE} ${PROG} ${GOT_LIBEXECDIR}/${PROG} # Don't install man pages yet NOMAN = Yes blob - /dev/null blob + 01b5f23410c841bf51e05b95e22841fb657be42a (mode 644) --- /dev/null +++ libexec/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" blob - 71a0ac872de0db8584350f20eb5986bdd75fc46f blob + 9cb00e16eaaaf2f4b671b7c9b7f13730953e7bd8 --- libexec/got-read-object/Makefile +++ libexec/got-read-object/Makefile @@ -7,23 +7,12 @@ SRCS= got-read-object.c delta.c error.c inflate.c obj CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib LDADD = -lutil -lz DPADD = ${LIBZ} ${LIBUTIL} -.if defined(PROFILE) -CC = gcc -CPPFLAGS += -DPROFILE -DEBUG = -O0 -pg -.else -DEBUG = -O0 -g -.endif -CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable -#CFLAGS += -DGOT_PACK_NO_MMAP -#CFLAGS += -DGOT_NO_OBJ_CACHE # For now, default to installing binary in ~/bin -LIBEXECDIR = ${HOME}/bin GROUP!=id -g -n install: ${INSTALL} ${INSTALL_COPY} -o ${USER} -g ${GROUP} \ - -m ${BINMODE} ${PROG} ${LIBEXECDIR}/${PROG} + -m ${BINMODE} ${PROG} ${GOT_LIBEXECDIR}/${PROG} # Don't install man pages yet NOMAN = Yes blob - c6079e3ec721fb0b95f0662d62d4e6b2275372f1 blob + 600541da63b37f6061f6c39a8eb70d6288cc0e11 --- libexec/got-read-tree/Makefile +++ libexec/got-read-tree/Makefile @@ -7,23 +7,12 @@ SRCS= got-read-tree.c delta.c error.c inflate.c objec CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib LDADD = -lutil -lz DPADD = ${LIBZ} ${LIBUTIL} -.if defined(PROFILE) -CC = gcc -CPPFLAGS += -DPROFILE -DEBUG = -O0 -pg -.else -DEBUG = -O0 -g -.endif -CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable -#CFLAGS += -DGOT_PACK_NO_MMAP -#CFLAGS += -DGOT_NO_OBJ_CACHE # For now, default to installing binary in ~/bin -LIBEXECDIR = ${HOME}/bin GROUP!=id -g -n install: ${INSTALL} ${INSTALL_COPY} -o ${USER} -g ${GROUP} \ - -m ${BINMODE} ${PROG} ${LIBEXECDIR}/${PROG} + -m ${BINMODE} ${PROG} ${GOT_LIBEXECDIR}/${PROG} # Don't install man pages yet NOMAN = Yes blob - 4f7ab90c63f49171d8ec3118b7c0de69fbeafaa8 blob + f6163877e11c2f1998a5e85e51d34ce5b8b71069 --- regress/delta/Makefile +++ regress/delta/Makefile @@ -5,8 +5,6 @@ SRCS = delta.c error.c opentemp.c path.c inflate.c del CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib LDADD = -lz -DEBUG = -O0 -g -CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable NOMAN = yes blob - /dev/null blob + 31e2dae1aab1a02e90cf3bbde63915c8d964fbd7 (mode 644) --- /dev/null +++ regress/Makefile @@ -0,0 +1,3 @@ +SUBDIR = delta idset repository worktree + +.include blob - b4eade29e86f3947e2c77fb07aa7ee63085e46fd blob + 2b4ff87db84d484f641901960fee64e2c10a7483 --- regress/idset/Makefile +++ regress/idset/Makefile @@ -7,8 +7,6 @@ SRCS = error.c object.c privsep.c sha1.c pack.c inflat CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib LDADD = -lutil -lz -DEBUG = -O0 -g -CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable NOMAN = yes blob - /dev/null blob + 01b5f23410c841bf51e05b95e22841fb657be42a (mode 644) --- /dev/null +++ regress/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" blob - 2ee86e361958414c674a933d5a2e1494ea250b7d blob + babe3897b60847cc3b147a3c7ed92e9764521a5e --- regress/repository/Makefile +++ regress/repository/Makefile @@ -6,14 +6,9 @@ SRCS = path.c repository.c error.c reference.c object. pack.c privsep.c delta.c fileindex.c worktree.c inflate.c \ repository_test.c -GOT_LIBEXECDIR = ${HOME}/bin CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib \ -DGOT_LIBEXECDIR=${GOT_LIBEXECDIR} LDADD = -lutil -lz -DEBUG = -O0 -g -CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable -#CFLAGS += -DGOT_PACK_NO_MMAP -#CFLAGS += -DGOT_NO_OBJ_CACHE NOMAN = yes blob - 181971230c2c141420272c6cad96af4dabed1dab blob + c4b341e66ed438112421e3ff381e37f61759a950 --- regress/worktree/Makefile +++ regress/worktree/Makefile @@ -5,14 +5,9 @@ SRCS = worktree.c repository.c object.c object_idcache object_parse.c opentemp.c path.c error.c reference.c sha1.c pack.c \ privsep.c delta.c inflate.c fileindex.c worktree_test.c -GOT_LIBEXECDIR = ${HOME}/bin CPPFLAGS = -I${.CURDIR}/../../include -I${.CURDIR}/../../lib \ -DGOT_LIBEXECDIR=${GOT_LIBEXECDIR} LDADD = -lutil -lz -DEBUG = -O0 -g -CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable -#CFLAGS += -DGOT_PACK_NO_MMAP -#CFLAGS += -DGOT_NO_OBJ_CACHE NOMAN = yes blob - a3a05e3992bcc9bdc949b5bad8d348bdbad84b8d blob + ae6ee6919a93d2cc6297ebeea7282af4b325ba5b --- tog/Makefile +++ tog/Makefile @@ -7,21 +7,10 @@ SRCS= tog.c blame.c commit_graph.c delta.c diff.c dif privsep.c reference.c repository.c sha1.c worktree.c \ utf8.c inflate.c -GOT_LIBEXECDIR = ${HOME}/bin CPPFLAGS = -I${.CURDIR}/../include -I${.CURDIR}/../lib \ -DGOT_LIBEXECDIR=${GOT_LIBEXECDIR} LDADD = -lpanel -lncursesw -lutil -lz -lpthread DPADD = ${LIBZ} ${LIBUTIL} -.if defined(PROFILE) -CC = gcc -CPPFLAGS += -DPROFILE -DEBUG = -O0 -pg -.else -DEBUG = -O0 -g -.endif -CFLAGS += -Werror -Wall -Wstrict-prototypes -Wunused-variable -#CFLAGS += -DGOT_PACK_NO_MMAP -#CFLAGS += -DGOT_NO_OBJ_CACHE # For now, default to installing binary in ~/bin GROUP!=id -g -n