Update CMakelist to match Makefile.am in oc2

This commit is contained in:
dmh 2014-12-26 12:37:07 -07:00
parent 7a0a10ec7b
commit c4bc1569f6
5 changed files with 4 additions and 6 deletions

View File

@ -1,9 +1,7 @@
SET(oc_SOURCES oc.c daplex.c dapparse.c daptab.c occlientparams.c occompile.c occurlfunctions.c ocdata.c ocdebug.c ocdump.c ocinternal.c ocnode.c ochttp.c ocrc.c ocread.c ocutil.c ocbytes.c oclist.c ocuri.c oclog.c xxdr.c)
SET(oc_SOURCES oc.c daplex.c dapparse.c daptab.c occlientparams.c occompile.c occurlfunctions.c ocdata.c ocdebug.c ocdump.c ocinternal.c ocnode.c ochttp.c ocrc.c ocread.c ocutil.c ocbytes.c oclist.c ocuri.c oclog.c occurlflags.c xxdr.c)
add_library(oc2 OBJECT ${oc_SOURCES})
## Specify files to be distributed by 'make dist'
FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)

View File

@ -22,7 +22,6 @@ ocdata.h ocdatatypes.h ocdebug.h ocdump.h \
ocinternal.h ocnode.h \
ochttp.h ocread.h ocutil.h \
ocbytes.h oclist.h ocuri.h oclog.h \
occurlflags.h \
xxdr.h
FILES=${HDRS} ${SRC} dap.y

View File

@ -29,7 +29,6 @@ ocdata.h ocdatatypes.h ocdebug.h ocdump.h \
ocinternal.h ocnode.h \
ochttp.h ocread.h ocutil.h \
ocbytes.h oclist.h ocuri.h oclog.h \
occurlflags.h \
xxdr.h
EXTRA_DIST = dap.y CMakeLists.txt

View File

View File

@ -10,7 +10,9 @@
extern OCerror ocset_curlopt(OCstate* state, int flag, void* value);
extern OCerror ocset_curlflagbyname(OCstate*, const char* name, void* value);
struct OCCURLFLAG* occurlflagbyflag(int flag);
struct OCCURLFLAG* occurlflagbyname(const char* name);
extern OCerror ocset_flags_perfetch(OCstate*);
extern OCerror ocset_flags_perlink(OCstate*);