Git.pm: Kill Git.xs for now

diff --git a/Makefile b/Makefile
index ac42ae32bad42536da717810c77fa38901028e63..8a7f29bc9b78d3be02f181b8aa30fe3d4218f8ad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -112,11 +112,10 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
 # CFLAGS and LDFLAGS are for the users to override from the command line.
 
 CFLAGS = -g -O2 -Wall
+PIC_FLAG = -fPIC
 LDFLAGS =
 ALL_CFLAGS = $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
-PERL_CFLAGS =
-PERL_LDFLAGS =
 STRIP ?= strip
 
 prefix = $(HOME)
@@ -153,9 +152,10 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
 ### --- END CONFIGURATION SECTION ---
 
 # Those must not be GNU-specific; they are shared with perl/ which may
-# be built by a different compiler.
-BASIC_CFLAGS = $(PERL_CFLAGS)
-BASIC_LDFLAGS = $(PERL_LDFLAGS)
+# be built by a different compiler. (Note that this is an artifact now
+# but it still might be nice to keep that distinction.)
+BASIC_CFLAGS =
+BASIC_LDFLAGS =
 
 SCRIPT_SH = \
        git-bisect.sh git-branch.sh git-checkout.sh \
@@ -402,6 +402,9 @@ endif
 ifneq (,$(findstring arm,$(uname_M)))
        ARM_SHA1 = YesPlease
 endif
+ifeq ($(uname_M),sun4u)
+       USE_PIC = YesPlease
+endif
 ifeq ($(uname_M),x86_64)
        USE_PIC = YesPlease
 endif
@@ -544,7 +547,7 @@ endif
 endif
 endif
 ifdef USE_PIC
-       ALL_CFLAGS += -fPIC
+       ALL_CFLAGS += $(PIC_FLAG)
 endif
 ifdef NO_ACCURATE_DIFF
        BASIC_CFLAGS += -DNO_ACCURATE_DIFF
@@ -749,15 +752,9 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
        rm -f $@ && $(AR) rcs $@ $(XDIFF_OBJS)
 
 
-PERL_DEFINE = $(BASIC_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"'
-PERL_DEFINE_SQ = $(subst ','\'',$(PERL_DEFINE))
-PERL_LIBS = $(BASIC_LDFLAGS) $(EXTLIBS)
-PERL_LIBS_SQ = $(subst ','\'',$(PERL_LIBS))
 perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
        (cd perl && $(PERL_PATH) Makefile.PL \
-               PREFIX='$(prefix_SQ)' \
-               DEFINE='$(PERL_DEFINE_SQ)' \
-               LIBS='$(PERL_LIBS_SQ)')
+               PREFIX='$(prefix_SQ)')
 
 doc:
        $(MAKE) -C Documentation all