diff options
| author | Joachim Nilsson <troglobit@gmail.com> | 2019-09-29 15:44:23 +0200 |
|---|---|---|
| committer | Joachim Nilsson <troglobit@gmail.com> | 2019-09-29 15:46:20 +0200 |
| commit | 65f90f70bcfa0d3ac47a44787537761bdaeb9ce7 (patch) | |
| tree | 0e5851869fd0a987a2dfe1d7913507af7dc6d95f | |
| parent | 5aec8988d97a19f830b9d199b244596230a37fd7 (diff) | |
| download | libnet-65f90f70bcfa0d3ac47a44787537761bdaeb9ce7.tar.gz | |
Relocate scripts/ to bin/ and .bat file to win32/
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | appveyor.yml | 4 | ||||
| -rwxr-xr-x | bin/Build (renamed from scripts/Build) | 0 | ||||
| -rwxr-xr-x | bin/Changelog (renamed from scripts/Changelog) | 0 | ||||
| -rwxr-xr-x | bin/Check (renamed from scripts/Check) | 0 | ||||
| -rwxr-xr-x | bin/Clean (renamed from scripts/Clean) | 0 | ||||
| -rw-r--r-- | bin/Makefile.am | 1 | ||||
| -rwxr-xr-x | bin/Package (renamed from scripts/Package) | 0 | ||||
| -rwxr-xr-x | bin/Prepare (renamed from scripts/Prepare) | 0 | ||||
| -rwxr-xr-x | bin/Stow (renamed from scripts/Stow) | 0 | ||||
| -rwxr-xr-x | bin/map-pblock-types (renamed from map-pblock-types) | 0 | ||||
| -rw-r--r-- | configure.ac | 29 | ||||
| -rw-r--r-- | win32/Makefile.am | 2 | ||||
| -rw-r--r-- | win32/msvcbuild.bat (renamed from msvcbuild.bat) | 0 |
14 files changed, 22 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index e7b9e80..5073aa6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,12 +9,8 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnet.pc doc_DATA = README.md LICENSE -EXTRA_DIST = README.md LICENSE \ - msvcbuild.bat \ - README.win32 \ - autogen.sh \ - map-pblock-types -SUBDIRS = include src win32 +EXTRA_DIST = README.md README.win32 LICENSE autogen.sh +SUBDIRS = bin include src win32 if ENABLE_DOXYGEN SUBDIRS += doc diff --git a/appveyor.yml b/appveyor.yml index c7515b1..856bbf3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,5 +7,5 @@ before_build: - cd C:\projects\libnet
build_script:
-- msvcbuild.bat
-- msvcbuild.bat x64
\ No newline at end of file +- %~dp0\win32\msvcbuild.bat
+- %~dp0\win32\msvcbuild.bat x64
diff --git a/scripts/Build b/bin/Build index fd0f385..fd0f385 100755 --- a/scripts/Build +++ b/bin/Build diff --git a/scripts/Changelog b/bin/Changelog index 32b7cff..32b7cff 100755 --- a/scripts/Changelog +++ b/bin/Changelog diff --git a/scripts/Check b/bin/Check index 115de27..115de27 100755 --- a/scripts/Check +++ b/bin/Check diff --git a/scripts/Clean b/bin/Clean index 68f75bb..68f75bb 100755 --- a/scripts/Clean +++ b/bin/Clean diff --git a/bin/Makefile.am b/bin/Makefile.am new file mode 100644 index 0000000..4ad77a4 --- /dev/null +++ b/bin/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = map-pblock-types diff --git a/scripts/Package b/bin/Package index f7f20b8..f7f20b8 100755 --- a/scripts/Package +++ b/bin/Package diff --git a/scripts/Prepare b/bin/Prepare index 871c03a..871c03a 100755 --- a/scripts/Prepare +++ b/bin/Prepare diff --git a/map-pblock-types b/bin/map-pblock-types index 35552be..35552be 100755 --- a/map-pblock-types +++ b/bin/map-pblock-types diff --git a/configure.ac b/configure.ac index 61e221a..f9022ce 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,21 @@ AM_INIT_AUTOMAKE([1.14 foreign subdir-objects no-dependencies dist-zip]) AM_SILENT_RULES([yes]) AC_CONFIG_HEADERS([include/config.h]) +AC_CONFIG_FILES([Makefile \ + Doxyfile \ + bin/Makefile \ + doc/Makefile \ + doc/html/Makefile \ + doc/man/Makefile \ + doc/man/man3/Makefile \ + include/Makefile \ + include/libnet.h \ + libnet.pc \ + src/Makefile \ + sample/Makefile \ + win32/Makefile]) +AC_CONFIG_FILES([doc/fixmanpages], [chmod a+x doc/fixmanpages]) + dnl the default compiler flags are "-O2 -g" if the user does not set anything. dnl IMO O2 optimizations are fine, but debugging should be up to the user. : ${CFLAGS="-O2"} @@ -419,19 +434,7 @@ esac dnl this only matters if we are building for Windows... AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) -AC_CONFIG_FILES([Makefile \ - Doxyfile \ - doc/Makefile \ - doc/html/Makefile \ - doc/man/Makefile \ - doc/man/man3/Makefile \ - include/Makefile \ - include/libnet.h \ - libnet.pc \ - src/Makefile \ - sample/Makefile \ - win32/Makefile]) -AC_CONFIG_FILES([doc/fixmanpages], [chmod a+x doc/fixmanpages]) +dnl Create all files from AC_CONFIG_FILES() AC_OUTPUT AC_MSG_RESULT([ diff --git a/win32/Makefile.am b/win32/Makefile.am index 8772069..8ec7c0c 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -1,2 +1,2 @@ -EXTRA_DIST = getopt.h libnet.h config.h stdint.h wpdpack +EXTRA_DIST = getopt.h libnet.h config.h stdint.h msvcbuild.bat wpdpack diff --git a/msvcbuild.bat b/win32/msvcbuild.bat index 2a5ee3d..2a5ee3d 100644 --- a/msvcbuild.bat +++ b/win32/msvcbuild.bat |