remove 'prefix' program altogether, add 'll.h' to HEADERS

pobrn · May 24, 2020 · 5affc8e · 5affc8e
1 parent 2d55f76
commit 5affc8e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 88 deletions.
diff --git a/BSDmakefile b/BSDmakefile
@@ -60,8 +60,8 @@ all: $(program)
 
 .SUFFIXES: .o .c
 .c.o:
-	$(CC) $(CFLAGS) $(DEFINES) -DPRIoff="\"`./prefix`d\"" -DVERSION="\"$(version)\"" -c $(.IMPSRC)
+	$(CC) $(CFLAGS) $(DEFINES) -DVERSION="\"$(version)\"" -c $(.IMPSRC)
 
-$(OBJS): $(HEADERS) prefix
+$(OBJS): $(HEADERS)
 
 .include "rules.mk"
diff --git a/GNUmakefile b/GNUmakefile
@@ -54,13 +54,11 @@ ifdef DEBUG
 DEFINES += -DDEBUG
 endif
 
-OFFPRFX = $(shell ./prefix)
-
 OBJS = $(SRCS:.c=.o)
 
 all: $(program)
 
-%.o: %.c $(HEADERS) prefix
-	$(CC) $(CFLAGS) $(DEFINES) -DPRIoff="\"$(OFFPRFX)d\"" -DVERSION="\"$(version)\"" -c $<
+%.o: %.c $(HEADERS)
+	$(CC) $(CFLAGS) $(DEFINES) -DVERSION="\"$(version)\"" -c $<
 
 include rules.mk
diff --git a/Makefile b/Makefile
@@ -65,5 +65,5 @@
 program = mktorrent
 version = 1.1
 
-HEADERS  = mktorrent.h
+HEADERS  = mktorrent.h ll.h
 SRCS     = ftw.c init.c sha1.c hash.c output.c main.c msg.c ll.c
diff --git a/prefix.c b/prefix.c
diff --git a/rules.mk b/rules.mk
@@ -17,14 +17,11 @@
 
 .PHONY: strip indent clean install uninstall
 
-prefix: prefix.c
-	$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $< -o $@
-
 $(program): $(OBJS)
 	$(CC) $(CFLAGS) $(OBJS) -o $(program) $(LDFLAGS) $(LIBS)
 
-allinone: $(SRCS) $(HEADERS) prefix
-	$(CC) $(CFLAGS) $(DEFINES) -DPRIoff="\"`./prefix`d\"" -DVERSION="\"$(version)\"" -DALLINONE main.c -o $(program) $(LDFLAGS) $(LIBS)
+allinone: $(SRCS) $(HEADERS)
+	$(CC) $(CFLAGS) $(DEFINES) -DVERSION="\"$(version)\"" -DALLINONE main.c -o $(program) $(LDFLAGS) $(LIBS)
 
 strip:
 	strip $(program)
@@ -33,7 +30,7 @@ indent:
 	indent -kr -i8 *.c *.h
 
 clean:
-	rm -f $(program) prefix *.o *.c~ *.h~
+	rm -f $(program) *.o *.c~ *.h~
 
 install: $(program)
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin