1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
@echo ''
@false
-configure: configure.in
+configure: configure.ac
@echo Generating configure.
autoconf
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -11,10 +11,11 @@
################################ Definitions ################################
DIR := /usr/share/doc
-VERSION := $(shell git describe --tags --always)
+VERSION := 1.2.11
+CC := @CC@
CFLAGS := @CFLAGS@
-CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"' -Wno-deprecated-declarations
+CFLAGS += -Wall -funsigned-char -DFSVS_VERSION='"$(VERSION)"' -Wno-deprecated-declarations
LDFLAGS := @LDFLAGS@
FSVS_LDFLAGS = $(LDFLAGS)
BASELIBS := -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre2-8 -lgdbm -ldl
@@ -48,11 +49,7 @@
################################ Targets ###################################
-ifeq (@CHROOTER_JAIL@, )
-all: deps tags check-version check-dox $(DEST) lsDEST
-else
-all: tools/fsvs-chrooter
-endif
+all: fsvs
check-version: config.h fsvs.c
@@ -145,18 +142,11 @@
################################ Rules ######################################
-%.o: %.c
- @echo " CC $<"
- @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
# if the Makefile has changed, the output will (at least sometimes)
# change, too.
$(DEST): $(C_FILES:%.c=%.o)
- @echo " Link $@"
- @$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS)
-ifeq (@ENABLE_RELEASE@, 1)
- -strip $@
-endif
+ $(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS)
# For debugging: generate preprocessed, generate assembler
@@ -171,7 +161,6 @@
.%.d: %.c
@echo " deps for $<"
@$(CC) $(CPPFLAGS) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@
-include $(D_FILES)
tools/fsvs-chrooter: tools/fsvs-chrooter.c
tools/fsvs-chrooter: interface.h config.h
|
GitWeb
