Review bmake files

reuse descriptor opened in kqueue_timer

btree/Makefile

@@ -27,7 +27,6 @@ $(BPROMPT_YACC): parse.y
 $(BPROMPT): $(BPROMPT_OBJS) $(BPROMPT_LEX) $(BPROMPT_YACC)
 	$(CC) -o ${.TARGET} ${.ALLSRC} -O3 -fPIE $(LDFLAGS)
 
-SUFFIXES: .c .o
 .c.o:
 	$(CC) -o ${.TARGET} $(CFLAGS) -c ${.IMPSRC}
 

common/Makefile

@@ -1,4 +1,4 @@
-CFLAGS+=-O3 -Wall -fno-strict-aliasing
+CFLAGS+=-O2 -Wall -fno-strict-aliasing
 CFLAGS+=-Wformat -Wformat=2 -Wconversion -Wimplicit-fallthrough
 CFLAGS+=-Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3
 CFLAGS+=-fstack-clash-protection -fstack-protector-strong
@@ -15,8 +15,8 @@ PROJ_OBJS=libdm.o
 $(PROJ): $(PROJ_OBJS)
 	$(CC) -o ${.TARGET} ${.ALLSRC} $(LDFLAGS) 
 
-%o: 
-	$(CC) -o ${.TARGET} -c ${.IMPSRC}
+.c.o:
+	$(CC) -o ${.TARGET} $(CFLAGS) -c ${.IMPSRC}
 
 clean:
 	rm -f *.o $(PROJ)

crc32/Makefile

@@ -13,8 +13,8 @@ PROG_OBJS=crc32c.o
 $(PROG): $(PROG_OBJS)
 	$(CC) -o ${.TARGET} ${.ALLSRC} $(LDFLAGS)
 
-%o: 
-	$(CC) -o ${.TARGET} -c ${.IMPSRC}
+.c.o:
+	$(CC) -o ${.TARGET} $(CFLAGS) -c ${.IMPSRC}
 
 clean:
 	rm -f *.o $(PROG)

ismounted/Makefile

@@ -11,8 +11,10 @@ PRJ_OBJS=ismounted.o
 
 $(PRJ): $(PRJ_OBJS)
 	$(CC) -o ${.TARGET} ${.ALLSRC} $(LDFLAGS)
-%o:
-	$(CC) -o ${.TARGET} -c ${.IMPSRC}
+
+.c.o:
+	$(CC) -o ${.TARGET} $(CFLAGS) -c ${.IMPSRC}
+
 clean:
 	rm -f *.o $(PRJ)
 

kqueue/Makefile

@@ -1,4 +1,4 @@
-CFLAGS+=-O3 -Wall
+CFLAGS+=-O2 -Wall
 
 LDFLAGS+=-Wl,-O3
 
@@ -12,8 +12,8 @@ KQT_OBJS=kq_timer.o
 kq_timer: $(KQT_OBJS)
 	$(CC) -o ${.TARGET} ${.ALLSRC} $(LDFLAGS)
 
-%o: 
-	$(CC) -o ${.TARGET} -c ${.IMPSRC}
+.c.o:
+	$(CC) -o ${.TARGET} $(CFLAGS)  -c ${.IMPSRC}
 
 clean:
 	rm -f *.o $(KQT)

kqueue/kq_timer.c

@@ -95,12 +95,13 @@ int main(int argc, char *argv[])
 
 	/* Dummy file to store measurements */
 	strncpy(template, "/tmp/timer.XXXXXX", sizeof template);
-	if (mkstemp(template) == -1) {
+	int fdx = mkstemp(template);	
+	if (fdx == -1) {
 		warn("mkstemp() failure");
 		return EXIT_FAILURE;
 	}
 
-	fd = fopen(template, "w");
+	fd = fdopen(fdx, "w");
 	if (fd == NULL) {
 		warn("fopen() failure");
 		return EXIT_FAILURE;

sockraw/Makefile

@@ -1,4 +1,4 @@
-CFLAGS+=-O3 -Wall
+CFLAGS=-O2 -Wall
 
 LDFLAGS+=-Wl,-O3
 
@@ -12,8 +12,8 @@ BPF_OBJS=sockbpf.o
 $(BPF): $(BPF_OBJS)
 	$(CC) -o ${.TARGET} ${.ALLSRC} $(LDFLAGS)
 
-%o:
-	$(CC) -o ${.TARGET} -c ${.IMPSRC}
+.c.o:
+	$(CC) -o ${.TARGET} $(CFLAGS) -c ${.IMPSRC}
 
 clean:
 	rm -f *.o $(BPF)

swap/Makefile

@@ -13,8 +13,8 @@ PROG_OBJS=swap16.o
 $(PROG): $(PROG_OBJS)
 	$(CC) -o ${.TARGET} ${.ALLSRC} $(LDFLAGS)
 
-%o: 
-	$(CC) -o ${.TARGET} -c ${.IMPSRC}
+.c.o:
+	$(CC) -o ${.TARGET} $(CFLAGS) -c ${.IMPSRC}
 
 clean:
 	rm -f *.o $(PROG)