07639647efe6cfe6dbc643b8fae13c3dd153c528
markd
  Fri Jan 17 19:07:18 2025 -0800
work on docker utils build

diff --git src/hg/makeDb/hgLoadWiggle/makefile src/hg/makeDb/hgLoadWiggle/makefile
index 837ff6068f9..f5b9638aa57 100644
--- src/hg/makeDb/hgLoadWiggle/makefile
+++ src/hg/makeDb/hgLoadWiggle/makefile
@@ -1,114 +1,27 @@
 kentSrc = ../../..
-include ../../../inc/common.mk
+A = hgLoadWiggle hgWiggle wigEncode
 
-L += -lm ${MYSQLLIBS}
-MYLIBDIR = ../../../lib/${MACHTYPE}
-MYLIBS =  ${MYLIBDIR}/jkhgap.a ${MYLIBDIR}/jkweb.a
+include ${kentSrc}/inc/userApp.mk
 
-O = hgLoadWiggle.o
+perl_progs = fixStepToBedGraph varStepToBedGraph
+default:: ${perl_progs:%=%.pl}
 
-A = hgLoadWiggle
-
-all::	${A} hgWiggle wigEncode fixStepToBedGraph varStepToBedGraph
-
-hgLoadWiggle: $O ${MYLIBS}
-	${CC} -o ${DESTDIR}${BINDIR}/${A}${EXE} $O ${MYLIBS} $L
-	${STRIP} ${DESTDIR}${BINDIR}/${A}${EXE}
-
-hgDumpWiggle:	hgDumpWiggle.o ${MYLIBS}
-	${CC} -o ${DESTDIR}${BINDIR}/hgDumpWiggle${EXE} hgDumpWiggle.o \
-		${MYLIBS} $L
-	${STRIP} ${DESTDIR}${BINDIR}/hgDumpWiggle${EXE}
-
-hgWiggle:	hgWiggle.o ${MYLIBS}
-	${CC} -o ${DESTDIR}${BINDIR}/hgWiggle${EXE} hgWiggle.o \
-		${MYLIBS} $L
-	${STRIP} ${DESTDIR}${BINDIR}/hgWiggle${EXE}
-
-hgWiggle.o:	../../inc/wiggle.h hgWiggle.c
-
-wigEncode:	wigEncode.o ${MYLIBS}
-	${CC} -o ${DESTDIR}${BINDIR}/wigEncode${EXE} wigEncode.o ${MYLIBS} $L
-	${STRIP} ${DESTDIR}${BINDIR}/wigEncode${EXE}
-
-wigEncode.o:	../../inc/wiggle.h wigEncode.c
-
-varStepToBedGraph: varStepToBedGraph.pl
-	rm -f "${DESTDIR}${BINDIR}/$@.pl" &&  cp $@.pl "${DESTDIR}${BINDIR}" &&  chmod +x "${DESTDIR}${BINDIR}/$@.pl" 
-
-fixStepToBedGraph: fixStepToBedGraph.pl
-	rm -f "${DESTDIR}${BINDIR}/$@.pl" &&  cp $@.pl "${DESTDIR}${BINDIR}" &&  chmod +x "${DESTDIR}${BINDIR}/$@.pl" 
-
-compile:	${O} hgWiggle.o wigEncode.o ${MYLIBS}
-	${CC} -o ${A} $O ${MYLIBS} $L
-	${CC} -o hgWiggle hgWiggle.o ${MYLIBS} $L
-	${CC} -o wigEncode wigEncode.o ${MYLIBS} $L
-
-test:
-	cd tests && ./RunTest.sh
-
-test_verbose:
-	cd tests && ./RunTest.sh -verbose
-
-install_tests::
-	rm -f ${SCRIPTS}/chkWiggleTable.sh
-	cp -p chkWiggleTable.sh ${SCRIPTS}
-	rm -f ${SCRIPTS}/varStepToBedGraph.pl
-	cp -p varStepToBedGraph.pl ${SCRIPTS}
-	rm -f ${SCRIPTS}/fixStepToBedGraph.pl
-	cp -p fixStepToBedGraph.pl ${SCRIPTS}
-
-clean:
+clean::
 	rm -f test_data/chr1_0.wib test_data/chr1_0.wig test_data/chr1_1.wib \
 	test_data/chr1_1.wig test_data/chr1_2.wib test_data/chr1_2.wig \
 	test_data/chr1_begin.ascii test_data/chr1_end.ascii \
 	test_data/chr1_middle.ascii test_data/chrM.ascii test_data/chrM.wib \
-	test_data/chrM.wig test_data/wiggle.tab \
-	${O} hgDumpWiggle.o hgWiggle.o hgWiggle wigEncode.o wigEncode ${A}
-
-cgi:: compile
-	@if [ ! -d "${CGI_BIN}-${USER}/loader" ]; then \
-		${MKDIR} "${CGI_BIN}-${USER}/loader"; \
-	fi
-	rm -f ${CGI_BIN}-${USER}/loader/$A
-	rm -f ${CGI_BIN}-${USER}/loader/wigEncode
-	mv $A${EXE} ${CGI_BIN}-${USER}/loader/$A
-	mv wigEncode ${CGI_BIN}-${USER}/loader/wigEncode
-	rm -f hgWiggle
+	test_data/chrM.wig test_data/wiggle.tab
 
-alpha:: strip
-	@if [ ! -d "${DESTDIR}${CGI_BIN}/loader" ]; then \
-		${MKDIR} "${DESTDIR}${CGI_BIN}/loader"; \
-	fi
-	rm -f ${DESTDIR}${CGI_BIN}/loader/$A
-	rm -f ${DESTDIR}${CGI_BIN}/loader/wigEncode
-	mv $A${EXE} ${DESTDIR}${CGI_BIN}/loader/$A
-	mv wigEncode ${DESTDIR}${CGI_BIN}/loader/wigEncode
+user_loader_dir = ${CGI_BIN}-${USER}/loader
+alpha_loader_dir = ${CGI_BIN}/loader
+beta_loader_dir = ${CGI_BIN}-beta/loader
 
-beta:: strip
-	@if [ ! -d "${CGI_BIN}-beta/loader" ]; then \
-		${MKDIR} ${CGI_BIN}-beta/loader; \
-	fi
-	rm -f ${CGI_BIN}-beta/loader/$A
-	rm -f ${CGI_BIN}-beta/loader/wigEncode
-	mv $A${EXE} ${CGI_BIN}-beta/loader/$A
-	mv wigEncode ${CGI_BIN}-beta/loader/wigEncode
+cgi:: ${A:%=${user_loader_dir}/%}
 
-strip::  compile
-	${STRIP} $A${EXE}
-	${STRIP} wigEncode
-	chmod g+w $A${EXE} wigEncode
-	chmod a+rx $A${EXE} wigEncode
-	rm -f hgWiggle
+${user_loader_dir}/%: %
+	@{MKDIR} $(dir $@)
+	cp -f $< $@
 
-install::  strip
-	@if [ ! -d "${DESTDIR}${CGI_BIN}/loader" ]; then \
-		${MKDIR} "${DESTDIR}${CGI_BIN}/loader"; \
-	fi
-	rm -f ${DESTDIR}${CGI_BIN}/loader/$A
-	rm -f ${DESTDIR}${CGI_BIN}/loader/wigEncode
-	mv $A${EXE} ${DESTDIR}${CGI_BIN}/loader/$A
-	mv wigEncode ${DESTDIR}${CGI_BIN}/loader/wigEncode
+alpha:: 
 
-debug:: $O
-	${CC} -o $A${EXE} $O ${MYLIBS} ${L}