projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GIT 0.99.9m aka 1.0rc5
[git.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
ba05986
..
8b433d1
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-55,7
+55,7
@@
all:
# Define USE_STDEV below if you want git to care about the underlying device
# change being considered an inode change from the update-cache perspective.
# Define USE_STDEV below if you want git to care about the underlying device
# change being considered an inode change from the update-cache perspective.
-GIT_VERSION = 0.99.9
l
+GIT_VERSION = 0.99.9
m
# CFLAGS and LDFLAGS are for the users to override from the command line.
# CFLAGS and LDFLAGS are for the users to override from the command line.
@@
-162,7
+162,7
@@
LIB_FILE=libgit.a
LIB_H = \
blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
diff.h epoch.h object.h pack.h pkt-line.h quote.h refs.h \
LIB_H = \
blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
diff.h epoch.h object.h pack.h pkt-line.h quote.h refs.h \
- run-command.h strbuf.h tag.h tree.h
+ run-command.h strbuf.h tag.h tree.h
git-compat-util.h
DIFF_OBJS = \
diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
DIFF_OBJS = \
diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
@@
-243,6
+243,10
@@
ifeq ($(uname_S),NetBSD)
ALL_CFLAGS += -I/usr/pkg/include
ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
endif
ALL_CFLAGS += -I/usr/pkg/include
ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
endif
+ifeq ($(uname_S),AIX)
+ NO_STRCASESTR=YesPlease
+ NEEDS_LIBICONV=YesPlease
+endif
ifneq (,$(findstring arm,$(uname_M)))
ARM_SHA1 = YesPlease
endif
ifneq (,$(findstring arm,$(uname_M)))
ARM_SHA1 = YesPlease
endif
@@
-320,15
+324,15
@@
ifdef NEEDS_NSL
SIMPLE_LIB += -lnsl
endif
ifdef NO_STRCASESTR
SIMPLE_LIB += -lnsl
endif
ifdef NO_STRCASESTR
- COMPAT_CFLAGS += -D
strcasestr=gitstrcasestr -DNO_STRCASESTR=1
+ COMPAT_CFLAGS += -D
NO_STRCASESTR
COMPAT_OBJS += compat/strcasestr.o
endif
ifdef NO_SETENV
COMPAT_OBJS += compat/strcasestr.o
endif
ifdef NO_SETENV
- COMPAT_CFLAGS += -D
setenv=gitsetenv -DNO_SETENV=1
+ COMPAT_CFLAGS += -D
NO_SETENV
COMPAT_OBJS += compat/setenv.o
endif
ifdef NO_MMAP
COMPAT_OBJS += compat/setenv.o
endif
ifdef NO_MMAP
- COMPAT_CFLAGS += -D
mmap=gitfakemmap -Dmunmap=gitfakemunmap -D
NO_MMAP
+ COMPAT_CFLAGS += -DNO_MMAP
COMPAT_OBJS += compat/mmap.o
endif
ifdef NO_IPV6
COMPAT_OBJS += compat/mmap.o
endif
ifdef NO_IPV6
@@
-363,9
+367,9
@@
all: $(ALL_PROGRAMS)
all:
$(MAKE) -C templates
all:
$(MAKE) -C templates
-git$
(X): git.c $(COMPAT_OBJS
) Makefile
+git$
X: git.c $(LIB_FILE
) Makefile
$(CC) -DGIT_EXEC_PATH='"$(bindir)"' -DGIT_VERSION='"$(GIT_VERSION)"' \
$(CC) -DGIT_EXEC_PATH='"$(bindir)"' -DGIT_VERSION='"$(GIT_VERSION)"' \
- $(CFLAGS) $(COMPAT_CFLAGS) -o $@ $(filter %.c,$^) $(
filter %.o,$^
)
+ $(CFLAGS) $(COMPAT_CFLAGS) -o $@ $(filter %.c,$^) $(
LIB_FILE
)
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
rm -f $@
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
rm -f $@