Skip to content

Commit

Permalink
Merge branch 'mxqsub'
Browse files Browse the repository at this point in the history
* mxqsub:
  mxqsub: Add --verbose option
  mxqsub: Handle unrecognized options better
  mxqsub: Improve user input verification
  mxqsub: User mx_mysql functions and remove mxq_mysql support
  mxqsub: Remove unused -D option (Fixes memory leak)
  • Loading branch information
mariux committed May 21, 2015
2 parents e4f9f7b + 1dc2db8 commit 742e873
Show file tree
Hide file tree
Showing 2 changed files with 267 additions and 245 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ mxqsub.o: $(mxq_util.h)
mxqsub.o: $(mx_util.h)
mxqsub.o: $(mx_log.h)
mxqsub.o: $(mxq_mysql.h)
mxqsub.o: $(mx_mysql.h)
mxqsub.o: CFLAGS += $(CFLAGS_MYSQL)
mxqsub.o: CFLAGS += $(CFLAGS_MXQ_MYSQL_DEFAULT_FILE)

Expand Down Expand Up @@ -380,6 +381,7 @@ mxqsub: mxq_mysql.o
mxqsub: mxq_util.o
mxqsub: mx_util.o
mxqsub: mx_log.o
mxqsub: mx_mysql.o
mxqsub: LDLIBS += $(LDLIBS_MYSQL)

build: mxqsub
Expand Down
Loading

0 comments on commit 742e873

Please sign in to comment.