qwknet added to main makefile

This commit is contained in:
Andrew Pamment 2018-11-04 17:45:02 +10:00
parent a9d4afb76d
commit 988151d11a
3 changed files with 11 additions and 7 deletions

View File

@ -14,10 +14,10 @@ UUID:= ${DEPSDIR}/libuuid/.libs/libuuid.a
CUTEST:= ${DEPSDIR}/cutest-1.5/libcutest.a CUTEST:= ${DEPSDIR}/cutest-1.5/libcutest.a
all: magicka magimail magiedit ticproc mgpost magichat \ all: magicka magimail magiedit ticproc mgpost magichat \
filecenter dosbox_shim magiftpd reset_pass filecenter dosbox_shim magiftpd reset_pass qwknet
www: magickawww magimail magiedit ticproc mgpost magichat \ www: magickawww magimail magiedit ticproc mgpost magichat \
filecenter dosbox_shim magiftpd reset_pass filecenter dosbox_shim magiftpd reset_pass qwknet
${LUA}: ${LUA}:
cd ${DEPSDIR}/lua && ${MAKE} -f Makefile ${DEPS_LUA_TARGET} MAKEFLAGS= CC=${CC} cd ${DEPSDIR}/lua && ${MAKE} -f Makefile ${DEPS_LUA_TARGET} MAKEFLAGS= CC=${CC}
@ -100,6 +100,9 @@ magiftpd:
reset_pass: reset_pass:
cd ${UTILSDIR}/reset_pass && ${MAKE} cd ${UTILSDIR}/reset_pass && ${MAKE}
qwknet:
cd ${UTILSDIR}/qwknet && ${MAKE}
.PHONY: clean www .PHONY: clean www
clean: clean:
@ -123,3 +126,4 @@ clean:
cd ${DEPSDIR}/libuuid && rm -rf .libs cd ${DEPSDIR}/libuuid && rm -rf .libs
cd ${DEPSDIR}/cutest-1.5 && ${MAKE} clean cd ${DEPSDIR}/cutest-1.5 && ${MAKE} clean
cd ${DEPSDIR}/jsmn && ${MAKE} clean cd ${DEPSDIR}/jsmn && ${MAKE} clean
cd ${UTILSDIR}/qwknet && ${MAKE} clean

View File

@ -1,5 +1,5 @@
CC=cc CC=cc
CFLAGS=-I/usr/local/include -ggdb CFLAGS=-I/usr/local/include
DEPS = qwktoss.c qwkscan.c DEPS = qwktoss.c qwkscan.c
JAMLIB = ../../deps/jamlib/jamlib.a JAMLIB = ../../deps/jamlib/jamlib.a
OBJ = qwktoss.o ../../src/inih/ini.o OBJ = qwktoss.o ../../src/inih/ini.o
@ -11,7 +11,7 @@ all: qwktoss qwkscan
$(CC) -c -o $@ $< $(CFLAGS) $(CC) -c -o $@ $< $(CFLAGS)
$(JAMLIB): $(JAMLIB):
cd ../../deps/jamlib && make -f Makefile.linux cd ../../deps/jamlib && make -f $(JAMMAKE)
qwktoss: $(OBJ) $(JAMLIB) qwktoss: $(OBJ) $(JAMLIB)
$(CC) -o qwktoss $^ $(CFLAGS) -L/usr/local/lib $(CC) -o qwktoss $^ $(CFLAGS) -L/usr/local/lib
@ -22,4 +22,4 @@ qwkscan: $(SOBJ) $(JAMLIB)
.PHONY: clean .PHONY: clean
clean: clean:
rm -f $(OBJ) qwktoss rm -f $(OBJ) $(SOBJ) qwktoss qwkscan

View File

@ -311,7 +311,7 @@ int export_messages(int baseno, char *basefilename, int qwkidx) {
snprintf(buffer, PATH_MAX, "%s/HEADERS.DAT", temp_dir); snprintf(buffer, PATH_MAX, "%s/HEADERS.DAT", temp_dir);
hdrptr = fopen(buffer, "a"); hdrptr = fopen(buffer, "a");
fprintf(hdrptr, "[%x]\n", offset); fprintf(hdrptr, "[%lx]\n", offset);
if (msgid != NULL) { if (msgid != NULL) {
fprintf(hdrptr, "Message-ID: %s\n", msgid); fprintf(hdrptr, "Message-ID: %s\n", msgid);
free(msgid); free(msgid);
@ -452,4 +452,4 @@ int main(int argc, char **argv) {
} }
} }
recursive_delete(temp_dir); recursive_delete(temp_dir);
} }