readtags: use external libreadtags repo

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
limkokholefork · Mar 10, 2020 · 112a28b · 112a28b
1 parent 7ccd834
commit 112a28b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -51,7 +51,7 @@ endif
 
 if USE_READCMD
 bin_PROGRAMS+= readtags
-readtags_CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/main -I$(srcdir)/read
+readtags_CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/main -I$(srcdir)/libreadtags
 readtags_CFLAGS = $(COVERAGE_CFLAGS)
 dist_readtags_SOURCES = $(READTAGS_SRCS) $(READTAGS_HEADS)
 readtags_CPPFLAGS += -DREADTAGS_DSL -I$(srcdir)/dsl

diff --git a/mk_mingw.mak b/mk_mingw.mak
@@ -19,7 +19,7 @@ ALL_OBJS += $(FNMATCH_OBJS)
 ALL_OBJS += $(WIN32_OBJS)
 ALL_OBJS += $(PEG_OBJS)
 ALL_OBJS += $(RES_OBJ)
-VPATH = . ./main ./parsers ./optlib ./read ./win32
+VPATH = . ./main ./parsers ./optlib ./readtags-cmd ./libreadtags ./win32
 
 ifeq (yes, $(WITH_ICONV))
 DEFINES += -DHAVE_ICONV
@@ -106,8 +106,10 @@ ctags.exe: $(ALL_OBJS) $(ALL_HEADS) $(PEG_HEADS) $(PEG_EXTRA_HEADS) $(REGEX_HEAD
 $(RES_OBJ): win32/ctags.rc win32/ctags.exe.manifest win32/resource.h
 	$(V_WINDRES) $(WINDRES) -o $@ -O coff $<
 
-read/%.o: read/%.c
-	$(V_CC) $(CC) -c $(OPT) $(CFLAGS) -DWIN32 -Iread -o $@ $<
+readtags-cmd/%.o: readtags-cmd/%.c
+	$(V_CC) $(CC) -c $(OPT) $(CFLAGS) -DWIN32 -Ilibreadtags -o $@ $<
+libreadtags/%.o: libreadtags/%.c
+	$(V_CC) $(CC) -c $(OPT) $(CFLAGS) -DWIN32 -Ilibreadtags -o $@ $<
 
 readtags.exe: $(READTAGS_OBJS) $(READTAGS_HEADS)
 	$(V_CC) $(CC) $(OPT) -o $@ $(READTAGS_OBJS) $(LIBS)
@@ -116,4 +118,4 @@ clean:
 	$(SILENT) echo Cleaning
 	$(SILENT) rm -f ctags.exe readtags.exe $(PACKCC)
 	$(SILENT) rm -f tags
-	$(SILENT) rm -f main/*.o optlib/*.o parsers/*.o parsers/cxx/*.o gnu_regex/*.o fnmatch/*.o misc/packcc/*.o peg/*.o read/*.o win32/*.o win32/mkstemp/*.o
+	$(SILENT) rm -f main/*.o optlib/*.o parsers/*.o parsers/cxx/*.o gnu_regex/*.o fnmatch/*.o misc/packcc/*.o peg/*.o readtags-cmd/*.o libreadtags/*.o win32/*.o win32/mkstemp/*.o
diff --git a/mk_mvc.mak b/mk_mvc.mak
@@ -14,7 +14,7 @@ REGEX_DEFINES = -DHAVE_REGCOMP -D__USE_GNU -DHAVE_STDBOOL_H -Dstrcasecmp=stricmp
 OBJEXT = obj
 COMMON_DEFINES =
 DEFINES = -DWIN32 $(REGEX_DEFINES) -DHAVE_PACKCC $(COMMON_DEFINES) -DHAVE_REPOINFO_H
-INCLUDES = -I. -Imain -Ignu_regex -Ifnmatch -Iparsers
+INCLUDES = -I. -Imain -Ignu_regex -Ifnmatch -Iparsers -Ilibreadtags
 OPT = /O2 /WX
 PACKCC = packcc.exe
 REGEX_OBJS = $(REGEX_SRCS:.c=.obj)
@@ -58,8 +58,10 @@ PDBFLAG =
 	$(CC) $(OPT) $(DEFINES) $(INCLUDES) /Foparsers\ /c $<
 {parsers\cxx}.c{parsers\cxx}.obj::
 	$(CC) $(OPT) $(DEFINES) $(INCLUDES) /Foparsers\cxx\ /c $<
-{read}.c{read}.obj::
-	$(CC) $(OPT) $(DEFINES) $(INCLUDES) /Foread\ /c $<
+{readtags-cmd}.c{readtags-cmd}.obj::
+	$(CC) $(OPT) $(DEFINES) $(INCLUDES) /Foreadtags-cmd\ /c $<
+{libreadtags}.c{libreadtags}.obj::
+	$(CC) $(OPT) $(DEFINES) $(INCLUDES) /Folibreadtags\ /c $<
 {win32\mkstemp}.c{win32\mkstemp}.obj::
 	$(CC) $(OPT) $(DEFINES) $(INCLUDES) /Fowin32\mkstemp\ /c $<
 {peg}.peg{peg}.c::
@@ -98,6 +100,6 @@ $(RES_OBJ): win32/ctags.rc win32/ctags.exe.manifest win32/resource.h
 
 
 clean:
-	- del *.obj main\*.obj optlib\*.obj parsers\*.obj parsers\cxx\*.obj gnu_regex\*.obj fnmatch\*.obj misc\packcc\*.obj peg\*.obj read\*.obj win32\mkstemp\*.obj win32\*.res main\repoinfo.h
+	- del *.obj main\*.obj optlib\*.obj parsers\*.obj parsers\cxx\*.obj gnu_regex\*.obj fnmatch\*.obj misc\packcc\*.obj peg\*.obj readtags-cmd\*.obj libreadtags\*.obj win32\mkstemp\*.obj win32\*.res main\repoinfo.h
 	- del ctags.exe readtags.exe $(PACKCC)
 	- del tags
diff --git a/readtags-cmd/read/readtags-cmd.c → readtags-cmd/readtags-cmd.c b/readtags-cmd/read/readtags-cmd.c → readtags-cmd/readtags-cmd.c
diff --git a/source.mak b/source.mak
@@ -358,11 +358,11 @@ ALL_OBJS = \
 
 
 READTAGS_SRCS  = \
-	read/readtags.c      \
-	read/readtags-cmd.c  \
+	libreadtags/readtags.c      \
+	readtags-cmd/readtags-cmd.c  \
 	\
 	$(NULL)
-READTAGS_HEADS = read/readtags.h
+READTAGS_HEADS = libreadtags/readtags.h
 READTAGS_OBJS  = $(READTAGS_SRCS:.c=.$(OBJEXT))
 
 PACKCC_SRCS = \