316
BUILT_INS =
317
COMPAT_CFLAGS =
318
COMPAT_OBJS =
319
+EXTRA_CPPFLAGS =
320
LIB_H =
321
LIB_OBJS =
322
PROGRAM_OBJS =
1481
$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
1482
1483
git.o: common-cmds.h
1483
-git.s git.o: ALL_CFLAGS += -DGIT_VERSION='"$(GIT_VERSION)"' \
1484
+git.s git.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' \
1485
'-DGIT_HTML_PATH="$(htmldir_SQ)"'
1486
1487
git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
1489
$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
1490
1491
builtin/help.o: common-cmds.h
1491
-builtin/help.s builtin/help.o: ALL_CFLAGS += \
1492
+builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
1493
'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
1494
'-DGIT_MAN_PATH="$(mandir_SQ)"' \
1495
'-DGIT_INFO_PATH="$(infodir_SQ)"'
1715
1716
ifndef CHECK_HEADER_DEPENDENCIES
1717
$(C_OBJ): %.o: %.c GIT-CFLAGS $(missing_dep_dirs)
1717
- $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $<
1718
+ $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
1719
$(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs)
1719
- $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $<
1720
+ $(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
1721
endif
1722
1723
%.s: %.c GIT-CFLAGS FORCE
1723
- $(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $<
1724
+ $(QUIET_CC)$(CC) -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
1725
1726
ifdef USE_COMPUTED_HEADER_DEPENDENCIES
1727
# Take advantage of gcc's on-the-fly dependency generation
1761
xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
1762
endif
1763
1763
-exec_cmd.s exec_cmd.o: ALL_CFLAGS += \
1764
+exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \
1765
'-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
1766
'-DBINDIR="$(bindir_relative_SQ)"' \
1767
'-DPREFIX="$(prefix_SQ)"'
1768
1768
-builtin/init-db.s builtin/init-db.o: ALL_CFLAGS += \
1769
+builtin/init-db.s builtin/init-db.o: EXTRA_CPPFLAGS = \
1770
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"'
1771
1771
-config.s config.o: ALL_CFLAGS += -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"'
1772
+config.s config.o: EXTRA_CPPFLAGS = -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"'
1773
1773
-http.s http.o: ALL_CFLAGS += -DGIT_USER_AGENT='"git/$(GIT_VERSION)"'
1774
+http.s http.o: EXTRA_CPPFLAGS = -DGIT_USER_AGENT='"git/$(GIT_VERSION)"'
1775
1776
ifdef NO_EXPAT
1776
-http-walker.s http-walker.o: ALL_CFLAGS += -DNO_EXPAT
1777
+http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
1778
endif
1779
1780
git-%$X: %.o $(GITLIBS)