Merge remote-tracking branch

'origin/GP-985_caheckman_PR-1677_guedou_sleighexample_fixes' (Closes
#1677)
This commit is contained in:
Ryan Kurtz 2021-07-20 07:41:52 -04:00
commit 656060a1a5
2 changed files with 5 additions and 2 deletions

View File

@ -296,7 +296,7 @@ libdecomp.a: $(LIBDECOMP_OPT_OBJS)
ar qc libdecomp.a $(LIBDECOMP_OPT_OBJS)
ranlib libdecomp.a
sleighexamp_dir:
sleighexamp_dir: slghscan.cc
rm -rf $(SLEIGHVERSION)
mkdir $(SLEIGHVERSION)
mkdir $(SLEIGHVERSION)/src $(SLEIGHVERSION)/specfiles

View File

@ -346,10 +346,13 @@ int main(int argc,char **argv)
--
--LNK=src/libsla.a
--
--libsla.a:
-- $(MAKE) -C src/ $@
--
--sleighexample.o: sleighexample.cc
-- $(CXX) -c $(DBG_CXXFLAGS) $(INCLUDES) $< -o $@
--
--sleighexample: sleighexample.o
--sleighexample: sleighexample.o libsla.a
-- $(CXX) $(DBG_CXXFLAGS) -o sleighexample sleighexample.o $(LNK)
--
--clean: