Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'distribute_parser_c' into gammamoo

Conflicts:
	Makefile.in
  • Loading branch information...
commit ed392ea7370e65514dcd5e23ccd9f727ebbdec14 2 parents 0d93477 + 8482311
@luke-jr authored
Showing with 4 additions and 7 deletions.
  1. +4 −7 Makefile.in
View
11 Makefile.in
@@ -38,6 +38,7 @@ CSRCS = ast.c code_gen.c db_file.c db_io.c db_objects.c db_properties.c \
extension-gcrypt.c \
log.c malloc.c match.c md5.c name_lookup.c network.c net_mplex.c \
net_proto.c numbers.c objects.c parse_cmd.c pattern.c program.c \
+ parser.c \
property.c quota.c ref_count.c regexpr.c server.c storage.c streams.c str_intern.c \
sym_table.c tasks.c timers.c unparse.c utils.c verbs.c version.c \
extension-fileio.c
@@ -51,8 +52,6 @@ OPT_NET_OBJS = $(OPT_NET_SRCS:.c=.o)
OPT_CSRCS = gnu-malloc.c $(OPT_NET_SRCS)
-YSRCS = parser.y
-
HDRS = ast.h bf_register.h code_gen.h db.h db_io.h db_private.h decompile.h \
db_tune.h \
disassemble.h eval_env.h eval_vm.h exceptions.h execute.h functions.h \
@@ -72,7 +71,7 @@ CLIENT_SRCS = client_bsd.c client_sysv.c
ALL_CSRCS = $(CSRCS) $(OPT_CSRCS) $(CLIENT_SRCS)
-SRCS = $(ALL_CSRCS) keywords.gperf $(YSRCS) $(HDRS) $(SYSHDRS)
+SRCS = $(ALL_CSRCS) keywords.gperf parser.y $(HDRS) $(SYSHDRS)
DISTFILES = $(SRCS) GNUmakefile Makefile.in restart restart.sh \
Minimal.db README.Minimal \
@@ -83,9 +82,7 @@ DISTFILES = $(SRCS) GNUmakefile Makefile.in restart restart.sh \
COBJS = $(CSRCS:.c=.o)
-YOBJS = $(YSRCS:.y=.o)
-
-OBJS = $(COBJS) $(YOBJS)
+OBJS = $(COBJS)
moo: $(OBJS)
$(CC) $(CFLAGS) $(OBJS) $(LIBRARIES) $(MOOLIBS) -o $@
@@ -153,7 +150,7 @@ tags:
etags -t $(SRCS)
clean:
- rm -f $(OBJS) $(OPT_NET_OBJS) core parser.c y.tab.c y.tab.h y.output version_options.h makedep eddep
+ rm -f $(OBJS) $(OPT_NET_OBJS) core y.tab.c y.tab.h y.output version_options.h makedep eddep
distclean: clean
rm -f config.h Makefile config.status
Please sign in to comment.
Something went wrong with that request. Please try again.