DeforaOS/VPN
DeforaOS/VPN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-generate the Makefiles

Browse Source
This commit is contained in:
Pierre Pronchery 2016-02-04 02:42:04 +01:00
parent c188369631
commit 29038dc70e
3 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Makefile
View File

@ -10,18 +10,28 @@ MKDIR = mkdir -m 0755 -p
all: subdirs
subdirs:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done
@for i in $(SUBDIRS); do (cd "$$i" && \
if [ -n "$(OBJDIR)" ]; then \
([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \
$(MAKE) OBJDIR="$(OBJDIR)$$i/"; \
else $(MAKE); fi) || exit; done
clean:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done
@for i in $(SUBDIRS); do (cd "$$i" && \
if [ -n "$(OBJDIR)" ]; then \
$(MAKE) OBJDIR="$(OBJDIR)$$i/" clean; \
else $(MAKE) clean; fi) || exit; done
distclean:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done
@for i in $(SUBDIRS); do (cd "$$i" && \
if [ -n "$(OBJDIR)" ]; then \
$(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \
else $(MAKE) distclean; fi) || exit; done
dist:
$(RM) -r -- $(PACKAGE)-$(VERSION)
$(LN) -s -- . $(PACKAGE)-$(VERSION)
@$(TAR) -czvf $(PACKAGE)-$(VERSION).tar.gz -- \
$(RM) -r -- $(OBJDIR)$(PACKAGE)-$(VERSION)
$(LN) -s -- "$$PWD" $(OBJDIR)$(PACKAGE)-$(VERSION)
@cd $(OBJDIR). && $(TAR) -czvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz -- \
$(PACKAGE)-$(VERSION)/data/Makefile \
$(PACKAGE)-$(VERSION)/data/VPN.interface \
$(PACKAGE)-$(VERSION)/data/appbroker.sh \
@ -41,23 +51,29 @@ dist:
$(PACKAGE)-$(VERSION)/Makefile \
$(PACKAGE)-$(VERSION)/config.h \
$(PACKAGE)-$(VERSION)/project.conf
$(RM) -- $(PACKAGE)-$(VERSION)
$(RM) -- $(OBJDIR)$(PACKAGE)-$(VERSION)
distcheck: dist
$(TAR) -xzvf $(PACKAGE)-$(VERSION).tar.gz
$(TAR) -xzvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz
$(MKDIR) -- $(PACKAGE)-$(VERSION)/objdir
$(MKDIR) -- $(PACKAGE)-$(VERSION)/destdir
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/")
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" install)
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" uninstall)
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" distclean)
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) dist)
cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/"
cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" install
cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" uninstall
cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" distclean
cd "$(PACKAGE)-$(VERSION)" && $(MAKE) dist
$(RM) -r -- $(PACKAGE)-$(VERSION)
install:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done
@for i in $(SUBDIRS); do (cd "$$i" && \
if [ -n "$(OBJDIR)" ]; then \
$(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \
else $(MAKE) install; fi) || exit; done
uninstall:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
@for i in $(SUBDIRS); do (cd "$$i" && \
if [ -n "$(OBJDIR)" ]; then \
$(MAKE) OBJDIR="$(OBJDIR)$$i/" uninstall; \
else $(MAKE) uninstall; fi) || exit; done
.PHONY: all subdirs clean distclean dist distcheck install uninstall

11
src/Makefile
View File

@ -1,4 +1,4 @@
TARGETS = $(OBJDIR)../include/VPN.h $(OBJDIR)VPN
TARGETS = $(OBJDIR)../include/VPN.h $(OBJDIR)VPN$(EXEEXT)
OBJDIR =
PREFIX = /usr/local
DESTDIR =
@ -11,6 +11,7 @@ CFLAGSF = -W `pkg-config --cflags libApp`
CFLAGS = -Wall -g -O2 -pedantic
LDFLAGSF= `pkg-config --libs libApp` -Wl,--export-dynamic
LDFLAGS =
EXEEXT =
RM = rm -f
LN = ln -f
MKDIR = mkdir -m 0755 -p
@ -26,8 +27,8 @@ VPN_OBJS = $(OBJDIR)vpn.o $(OBJDIR)main.o
VPN_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
VPN_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
$(OBJDIR)VPN: $(VPN_OBJS)
$(CC) -o $(OBJDIR)VPN $(VPN_OBJS) $(VPN_LDFLAGS)
$(OBJDIR)VPN$(EXEEXT): $(VPN_OBJS)
$(CC) -o $(OBJDIR)VPN$(EXEEXT) $(VPN_OBJS) $(VPN_LDFLAGS)
$(OBJDIR)vpn.o: vpn.c ../include/VPN.h
$(CC) $(VPN_CFLAGS) -o $(OBJDIR)vpn.o -c vpn.c
@ -44,9 +45,9 @@ distclean: clean
install: $(TARGETS)
$(MKDIR) $(DESTDIR)$(BINDIR)
$(INSTALL) -m 0755 $(OBJDIR)VPN $(DESTDIR)$(BINDIR)/VPN
$(INSTALL) -m 0755 $(OBJDIR)VPN$(EXEEXT) $(DESTDIR)$(BINDIR)/VPN$(EXEEXT)
uninstall:
$(RM) -- $(DESTDIR)$(BINDIR)/VPN
$(RM) -- $(DESTDIR)$(BINDIR)/VPN$(EXEEXT)
.PHONY: all clean distclean install uninstall

12
tools/Makefile
View File

@ -1,4 +1,4 @@
TARGETS = $(OBJDIR)libVPN.so
TARGETS = $(OBJDIR)libVPN$(SOEXT)
OBJDIR =
PREFIX = /usr/local
DESTDIR =
@ -10,9 +10,11 @@ CFLAGSF = -W -fPIC `pkg-config --cflags libApp`
CFLAGS = -Wall -g -O2 -pedantic
LDFLAGSF= `pkg-config --libs libApp`
LDFLAGS =
EXEEXT =
AR = ar
RANLIB = ranlib
CCSHARED= $(CC) -shared
SOEXT = .so
RM = rm -f
LN = ln -f
MKDIR = mkdir -m 0755 -p
@ -25,8 +27,8 @@ libVPN_OBJS = $(OBJDIR)libvpn.o
libVPN_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
libVPN_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
$(OBJDIR)libVPN.so: $(libVPN_OBJS)
$(CCSHARED) -o $(OBJDIR)libVPN.so $(libVPN_OBJS) $(libVPN_LDFLAGS)
$(OBJDIR)libVPN$(SOEXT): $(libVPN_OBJS)
$(CCSHARED) -o $(OBJDIR)libVPN$(SOEXT) $(libVPN_OBJS) $(libVPN_LDFLAGS)
$(OBJDIR)libvpn.o: libvpn.c ../include/VPN.h ../src/common.c
$(CC) $(libVPN_CFLAGS) -o $(OBJDIR)libvpn.o -c libvpn.c
@ -39,9 +41,9 @@ distclean: clean
install: $(TARGETS)
$(MKDIR) $(DESTDIR)$(LIBDIR)/AppWrapper
$(INSTALL) -m 0755 $(OBJDIR)libVPN.so $(DESTDIR)$(LIBDIR)/AppWrapper/libVPN.so
$(INSTALL) -m 0755 $(OBJDIR)libVPN$(SOEXT) $(DESTDIR)$(LIBDIR)/AppWrapper/libVPN$(SOEXT)
uninstall:
$(RM) -- $(DESTDIR)$(LIBDIR)/AppWrapper/libVPN.so
$(RM) -- $(DESTDIR)$(LIBDIR)/AppWrapper/libVPN$(SOEXT)
.PHONY: all clean distclean install uninstall