build-sys: rename PACKCC_SRCS and PACKCC_OBJS to PACKCC_SRC and

PACKCC_OBJ, respectively.
limkokholefork · Aug 16, 2021 · f97101d · f97101d
1 parent d656a63
commit f97101d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -71,8 +71,8 @@ CLEANFILES += $(PACKCC)
 cc4b_verbose = $(cc4b_verbose_@AM_V@)
 cc4b_verbose_ = $(cc4b_verbose_@AM_DEFAULT_V@)
 cc4b_verbose_0 = @echo CC4BUILD "  $@";
-$(PACKCC): $(top_srcdir)/$(PACKCC_SRCS)
-	$(cc4b_verbose)$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(PACKCC_CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(top_srcdir)/$(PACKCC_SRCS)
+$(PACKCC): $(srcdir)/$(PACKCC_SRC)
+	$(cc4b_verbose)$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(PACKCC_CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(srcdir)/$(PACKCC_SRC)
 
 if USE_READCMD
 bin_PROGRAMS+= readtags

diff --git a/mk_mingw.mak b/mk_mingw.mak
@@ -96,10 +96,10 @@ all: copy_gnulib_heads $(PACKCC) ctags.exe readtags.exe optscript.exe
 
 ctags: ctags.exe
 
-$(PACKCC_OBJS): $(PACKCC_SRCS)
+$(PACKCC_OBJ): $(PACKCC_SRC)
 	$(V_CC) $(CC_FOR_PACKCC) -c $(OPT) $(CFLAGS) $(COMMON_DEFINES) -o $@ $<
 
-$(PACKCC): $(PACKCC_OBJS)
+$(PACKCC): $(PACKCC_OBJ)
 	$(V_CC) $(CC_FOR_PACKCC) $(OPT) -o $@ $^
 
 ctags.exe: $(ALL_OBJS) $(ALL_HEADS) $(PEG_HEADS) $(PEG_EXTRA_HEADS) $(MINGW_GNULIB_HEADS) $(WIN32_HEADS)

diff --git a/mk_mvc.mak b/mk_mvc.mak
@@ -18,7 +18,7 @@ PACKCC = packcc.exe
 GNULIB_OBJS = $(MVC_GNULIB_SRCS:.c=.obj)
 WIN32_OBJS = $(WIN32_SRCS:.c=.obj)
 PEG_OBJS = $(PEG_SRCS:.c=.obj)
-PACKCC_OBJS = $(PACKCC_SRCS:.c=.obj)
+PACKCC_OBJ = $(PACKCC_SRC:.c=.obj)
 RES_OBJ = win32/ctags.res
 EXTRA_OBJS = $(GNULIB_OBJS) $(WIN32_OBJS) $(PEG_OBJS) $(RES_OBJ)
 ALL_OBJS = $(ALL_SRCS:.c=.obj) $(EXTRA_OBJS)
@@ -89,11 +89,11 @@ readtags.exe: $(READTAGS_OBJS) $(READTAGS_HEADS) $(READTAGS_DSL_OBJS) $(READTAGS
 optscript.exe: $(ALL_LIB_OBJS) $(OPTSCRIPT_OBJS) $(ALL_LIB_HEADS) $(OPTSCRIPT_DSL_HEADS) $(WIN32_HEADS)
 	$(CC) $(OPT) /Fe$@ $(ALL_LIB_OBJS) $(OPTSCRIPT_OBJS) /link setargv.obj $(LIBS)
 
-$(PACKCC_OBJS): $(PACKCC_SRCS)
-	$(CC) /c $(OPT) /Fo$@ $(INCLUDES) $(COMMON_DEFINES) $(PACKCC_SRCS)
+$(PACKCC_OBJ): $(PACKCC_SRC)
+	$(CC) /c $(OPT) /Fo$@ $(INCLUDES) $(COMMON_DEFINES) $(PACKCC_SRC)
 
-$(PACKCC): $(PACKCC_OBJS)
-	$(CC) $(OPT) /Fe$@ $(PACKCC_OBJS) /link setargv.obj $(PDBFLAG)
+$(PACKCC): $(PACKCC_OBJ)
+	$(CC) $(OPT) /Fe$@ $(PACKCC_OBJ) /link setargv.obj $(PDBFLAG)
 
 main\repoinfo.obj: main\repoinfo.c main\repoinfo.h
 

diff --git a/source.mak b/source.mak
@@ -420,11 +420,8 @@ READTAGS_HEADS = \
 	$(NULL)
 READTAGS_OBJS  = $(READTAGS_SRCS:.c=.$(OBJEXT))
 
-PACKCC_SRCS = \
-	misc/packcc/src/packcc.c \
-	\
-	$(NULL)
-PACKCC_OBJS = $(PACKCC_SRCS:.c=.$(OBJEXT))
+PACKCC_SRC = misc/packcc/src/packcc.c
+PACKCC_OBJ = $(PACKCC_SRC:.c=.$(OBJEXT))
 
 WIN32_HEADS = main/e_msoft.h
 WIN32_SRCS = win32/mkstemp/mkstemp.c