From 413ab5f578c0e0d306e0a0d66f1d11ef9bdb304b Mon Sep 17 00:00:00 2001 From: Roland Lutz Date: Mon, 2 Mar 2015 19:06:59 +0100 Subject: [PATCH] Move library header to include/ directory --- Makefile.am | 5 +++-- exposed/CDemo.c | 2 +- exposed/Makefile.am | 3 +-- exposed/lib.cpp | 2 +- {exposed => include}/slvs.h | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename {exposed => include}/slvs.h (100%) diff --git a/Makefile.am b/Makefile.am index 35564b02..7dfc4a3b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,13 +4,14 @@ ACLOCAL_AMFLAGS = -I ac-aux SUBDIRS = src exposed +noinst_HEADERS = include/slvs.h + exposed = \ exposed/CDemo.c \ exposed/DOC.txt \ exposed/Makefile \ exposed/VbDemo.vb \ - exposed/lib.cpp \ - exposed/slvs.h + exposed/lib.cpp EXTRA_DIST = \ $(exposed) \ diff --git a/exposed/CDemo.c b/exposed/CDemo.c index 5dc0d6d8..14d95d2b 100644 --- a/exposed/CDemo.c +++ b/exposed/CDemo.c @@ -18,7 +18,7 @@ # include #endif -#include "slvs.h" +#include static Slvs_System sys; diff --git a/exposed/Makefile.am b/exposed/Makefile.am index 7fefc1a9..92183557 100644 --- a/exposed/Makefile.am +++ b/exposed/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects -AM_CPPFLAGS = -DLIBRARY -I$(top_srcdir)/src +AM_CPPFLAGS = -DLIBRARY -I$(top_srcdir)/src -I$(top_srcdir)/include AM_LDFLAGS = -L. @@ -16,7 +16,6 @@ CDemo_SOURCES = CDemo.c libslvs_a_CPPFLAGS = $(AM_CPPFLAGS) libslvs_a_SOURCES = \ - slvs.h \ lib.cpp \ ../src/util.cpp \ ../src/entity.cpp \ diff --git a/exposed/lib.cpp b/exposed/lib.cpp index a2c58e33..816c1979 100644 --- a/exposed/lib.cpp +++ b/exposed/lib.cpp @@ -6,7 +6,7 @@ //----------------------------------------------------------------------------- #include "solvespace.h" #define EXPORT_DLL -#include "slvs.h" +#include Sketch SK; static System SYS; diff --git a/exposed/slvs.h b/include/slvs.h similarity index 100% rename from exposed/slvs.h rename to include/slvs.h