From 27594eeae6f40a402bc3110f06d57975168e74e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 19:20:15 +0200 Subject: ics-openvpn as a submodule! beautiful ics-openvpn is now officially on GitHub, and they track openssl and openvpn as submodules, so it's easier to update everything. Just a git submodule update --recursive. I've also set up soft links to native modules from ics-openvpn in app, so that we don't copy files in Gradle (which was causing problems with the submodules .git* files, not being copied). That makes the repo cleaner. --- app/lzo/minilzo/Makefile.minilzo | 100 --------------------------------------- 1 file changed, 100 deletions(-) delete mode 100644 app/lzo/minilzo/Makefile.minilzo (limited to 'app/lzo/minilzo/Makefile.minilzo') diff --git a/app/lzo/minilzo/Makefile.minilzo b/app/lzo/minilzo/Makefile.minilzo deleted file mode 100644 index e511e74e..00000000 --- a/app/lzo/minilzo/Makefile.minilzo +++ /dev/null @@ -1,100 +0,0 @@ -# -# a very simple Makefile for miniLZO -# -# Copyright (C) 1996-2014 Markus F.X.J. Oberhumer -# - -PROGRAM = testmini -SOURCES = testmini.c minilzo.c - -default: - @echo "" - @echo "Welcome to miniLZO. Please choose one of the following 'make' targets:" - @echo "" - @echo " gcc: gcc" - @echo " unix: hpux hpux9" - @echo " win32: win32-bc win32-cygwin win32-dm win32-lccwin32" - @echo " win32-intelc win32-mingw win32-vc win32-watcomc" - @echo " dos32: dos32-djgpp2 dos32-wc" - @echo "" - - -# Make sure that minilzo.h, lzoconf.h and lzodefs.h are in the -# current dircectory. Otherwise you may want to adjust CPPFLAGS. -CPPFLAGS = -I. -I../include/lzo - -GCC_CFLAGS = -s -Wall -O2 -fomit-frame-pointer - - -# -# gcc (generic) -# - -gcc: - gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM) $(SOURCES) - -cc: - cc $(CPPFLAGS) -o $(PROGRAM) $(SOURCES) - - -# -# UNIX -# - -hpux: - cc -Ae $(CPPFLAGS) -o $(PROGRAM) $(SOURCES) - -hpux9: - cc -Aa -D_HPUX_SOURCE $(CPPFLAGS) -o $(PROGRAM) $(SOURCES) - - -# -# Windows (32-bit) -# - -win32-borlandc win32-bc: - bcc32 -O2 -d -w -w-aus $(CPPFLAGS) $(SOURCES) - -win32-cygwin32 win32-cygwin: - gcc -mcygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES) - -win32-digitalmars win32-dm: - dmc -mn -o -w- $(CPPFLAGS) $(SOURCES) - -win32-intelc win32-ic: - icl -nologo -MT -W3 -O2 -GF $(CPPFLAGS) $(SOURCES) - -win32-lccwin32: - @echo "NOTE: need lcc 2002-07-25 or newer, older versions have bugs" - lc -A -unused -O $(CPPFLAGS) $(SOURCES) - -win32-mingw32 win32-mingw: - gcc -mno-cygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES) - -win32-visualc win32-vc: - cl -nologo -MT -W3 -O2 -GF $(CPPFLAGS) $(SOURCES) - -win32-watcomc win32-wc: - wcl386 -bt=nt -zq -mf -5r -zc -w5 -oneatx $(CPPFLAGS) $(SOURCES) - - -# -# DOS (32-bit) -# - -dos32-djgpp2 dos32-dj2: - gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES) - -dos32-watcomc dos32-wc: - wcl386 -zq -mf -bt=dos -l=dos4g -5r -ox -zc $(CPPFLAGS) $(SOURCES) - - -# -# other targets -# - -clean: - rm -f $(PROGRAM) $(PROGRAM).exe $(PROGRAM).map $(PROGRAM).tds - rm -f *.err *.o *.obj - -.PHONY: default clean -- cgit v1.2.3