projects
/
asdcplib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3cb2cbf
)
Update version string.
author
msheby
<msheby@cinecert.com>
Mon, 2 Mar 2009 19:30:35 +0000
(19:30 +0000)
committer
msheby
<>
Mon, 2 Mar 2009 19:30:35 +0000
(19:30 +0000)
src/Makefile.am
patch
|
blob
|
history
win32/Makefile.mak
patch
|
blob
|
history
diff --git
a/src/Makefile.am
b/src/Makefile.am
index ebf93c14e3bf9e2742a28a4b0bd9be9e9f5b8195..81089c0756da3eb7c218d5f5a2ff4a595dbfe32f 100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-74,7
+74,7
@@
libpyasdcp_la_LDFLAGS = @PYTHON_LSPEC@
libpyasdcp_la_LIBADD = libkumu.la libasdcp.la
pyexecdir = @PYTHON_EXECDIR@
pyexec_includedir = $(PYTHON_PREFIX)/include/python$(PYTHON_SHORTVERSION)
libpyasdcp_la_LIBADD = libkumu.la libasdcp.la
pyexecdir = @PYTHON_EXECDIR@
pyexec_includedir = $(PYTHON_PREFIX)/include/python$(PYTHON_SHORTVERSION)
-pyexec_include_HEADERS = kumu_python.h asdcp_python.h
+
nodist_
pyexec_include_HEADERS = kumu_python.h asdcp_python.h
pyexec_LTLIBRARIES = kumu.la asdcp.la
nodist_kumu_la_SOURCES = pykumu.cpp kumu_python.h
kumu_la_CPPFLAGS = @PYTHON_CPPFLAGS@
pyexec_LTLIBRARIES = kumu.la asdcp.la
nodist_kumu_la_SOURCES = pykumu.cpp kumu_python.h
kumu_la_CPPFLAGS = @PYTHON_CPPFLAGS@
@@
-141,7
+141,7
@@
TESTS_ENVIRONMENT = BUILD_DIR="." TEST_FILES=../tests TEST_FILE_PREFIX=DCPd1-M1
EXTRA_DIST = fips-186-test-harness.pl $(TESTS)
if PYTHON_USE
if !FREEDIST
EXTRA_DIST = fips-186-test-harness.pl $(TESTS)
if PYTHON_USE
if !FREEDIST
-EXTRA_DIST += $(nodist_libpyasdcp_la_SOURCES) $(nodist_kumu_la_SOURCES) $(nodist_asdcp_la_SOURCES)
+EXTRA_DIST += $(nodist_
pyexec_include_HEADERS) $(nodist_
libpyasdcp_la_SOURCES) $(nodist_kumu_la_SOURCES) $(nodist_asdcp_la_SOURCES)
endif
endif
endif
endif
diff --git
a/win32/Makefile.mak
b/win32/Makefile.mak
index 1d2e7bd26c303c339d47882dbe4e8a5d59934337..912fa41107183ac7ec76b9fc019dcffc9f3540c7 100755
(executable)
--- a/
win32/Makefile.mak
+++ b/
win32/Makefile.mak
@@
-32,7
+32,7
@@
OBJDIR = .
!endif
\r
\r
CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \
\r
!endif
\r
\r
CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \
\r
- /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.
3.20
\" \
\r
+ /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.
4.21
\" \
\r
/I$(WITH_OPENSSL)\inc32
\r
\r
LIB_EXE = lib.exe
\r
/I$(WITH_OPENSSL)\inc32
\r
\r
LIB_EXE = lib.exe
\r