Skip to content

Commit

Permalink
keepalived: fix compile problem
Browse files Browse the repository at this point in the history
  • Loading branch information
ywc689 committed Jan 19, 2020
1 parent afdfb5e commit 479570f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 14,466 deletions.
16 changes: 0 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,6 @@ cscope*
filenametags
build/
bin/
tools/ipvsadm/ipvsadm
tools/keepalived/Makefile
tools/keepalived/bin/genhash
tools/keepalived/bin/keepalived
tools/keepalived/config.status
tools/keepalived/genhash/Makefile
tools/keepalived/keepalived.spec
tools/keepalived/keepalived/Makefile
tools/keepalived/keepalived/check/Makefile
tools/keepalived/keepalived/core/Makefile
tools/keepalived/keepalived/libipvs-2.6/Makefile
tools/keepalived/keepalived/libipvs-2.6/libipvs.a
tools/keepalived/keepalived/vrrp/Makefile
tools/keepalived/lib/Makefile
tools/keepalived/lib/config.h
tools/keepalived/install-sh
src/dpvs
.cache.mk
.tmp_versions/
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ clean:
for i in $(SUBDIRS); do $(MAKE) -C $$i clean || exit 1; done

distclean:
$(MAKE) -C tools/keepalived distclean || exit 1
$(MAKE) -C tools/keepalived distclean || true
-rm -f tools/keepalived/configure
-rm -f tools/keepalived/Makefile

install:all
-mkdir -p $(INSDIR)
Expand Down
8 changes: 5 additions & 3 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ config: keepalived_conf

keepalived_conf:
if [ ! -f keepalived/Makefile ]; then \
cd keepalived && \
./build_setup && \
./configure && \
cd keepalived; \
if [ ! -f keepalived/configure ]; then \
./build_setup; \
fi; \
./configure; \
cd -; \
fi

Expand Down
1 change: 1 addition & 0 deletions tools/ipvsadm/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ipvsadm
Loading

0 comments on commit 479570f

Please sign in to comment.