74713bf989016a59eea9825daf922cf8ac377720 markd Wed Mar 5 14:06:53 2025 -0800 fixed userApp in docker make problem caused by blatHuge and gfServerHuge rules diff --git src/gfServer/makefile src/gfServer/makefile index 8bb59373fc6..4dfb737472a 100644 --- src/gfServer/makefile +++ src/gfServer/makefile @@ -1,37 +1,37 @@ kentSrc = .. # use recursive make to compile 32-bit and 64-bit index versions # if IDXSIZE=64 is passed in, we get the 64-bit version -all: compile -compile:: - ${MAKE} build - ${MAKE} build IDXSIZE=huge ifeq (${IDXSIZE},huge) A = gfServerHuge CFLAGS += -DGFSERVER_HUGE preMyLibs += ../lib/$(MACHTYPE)/jkOwnLibHuge.a else A = gfServer preMyLibs += ../lib/$(MACHTYPE)/jkOwnLib.a endif + +build_both: + ${MAKE} do_build + ${MAKE} do_build IDXSIZE=huge + +do_build: default + # this must be include here, after the above setup but before the build target include $(kentSrc)/inc/userApp.mk -build: ${DESTDIR}${BINDIR}/${A}${EXE} -L += -lm $(SOCKETLIB) - gfServerHuge.c: gfServer.c ln -sf $< $@ test:: cd tests && ${MAKE} test clean:: ${MAKE} clean_idxsize ${MAKE} clean_idxsize IDXSIZE=HUGE cd tests && ${MAKE} clean clean_idxsize: rm -fr ${O} gfServerHuge.c