Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
8c4b047a
Commit
8c4b047a
authored
10 years ago
by
Emmanuel Lepage Vallee
Browse files
Options
Downloads
Patches
Plain Diff
API: Move the public API in a new folder
Refs #63769 Change-Id: Ic35e28eb8d43f2e264ae2003ebf3cab8994ce884
parent
51898f2e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
daemon/bin/Makefile.am
+4
-2
4 additions, 2 deletions
daemon/bin/Makefile.am
daemon/bin/dbus/Makefile.am
+2
-1
2 additions, 1 deletion
daemon/bin/dbus/Makefile.am
daemon/globals.mak
+1
-0
1 addition, 0 deletions
daemon/globals.mak
daemon/src/public/ring.h
+0
-0
0 additions, 0 deletions
daemon/src/public/ring.h
with
7 additions
and
3 deletions
daemon/bin/Makefile.am
+
4
−
2
View file @
8c4b047a
...
...
@@ -9,6 +9,7 @@ if HAVE_OSX
libexec_PROGRAMS
=
ringcli
ringcli_SOURCES
=
osxmain.cpp
ringcli_CXXFLAGS
=
-I
$(
top_srcdir
)
/src
\
-I
$(
top_srcdir
)
/src/public
\
-DTOP_BUILDDIR
=
\"
$$(
cd
"
$(
top_builddir
)
"
;
pwd
)
\"
ringcli_LDADD
=
$(
top_builddir
)
/src/libring.la
endif
...
...
@@ -20,8 +21,9 @@ libexec_PROGRAMS = dring
dring_SOURCES
=
main.cpp
dring_CXXFLAGS
=
-I
$(
top_srcdir
)
/src
${
DBUSCPP_CFLAGS
}
\
-DTOP_BUILDDIR
=
\"
$$(
cd
"
$(
top_builddir
)
"
;
pwd
)
\"
dring_CXXFLAGS
=
-I
$(
top_srcdir
)
/src
${
DBUSCPP_CFLAGS
}
\
-I
$(
top_srcdir
)
/src/public
\
-DTOP_BUILDDIR
=
\"
$$(
cd
"
$(
top_builddir
)
"
;
pwd
)
\"
dring_LDADD
=
dbus/libclient_dbus.la
${
DBUSCPP_LIBS
}
$(
top_builddir
)
/src/libring.la
endif
This diff is collapsed.
Click to expand it.
daemon/bin/dbus/Makefile.am
+
2
−
1
View file @
8c4b047a
...
...
@@ -48,7 +48,8 @@ libclient_dbus_la_SOURCES += dbusvideomanager.cpp dbusvideomanager.h
endif
libclient_dbus_la_CXXFLAGS
=
-I
../
\
-I
$(
top_srcdir
)
/src
\
-I
$(
top_srcdir
)
/src
\
-I
$(
top_srcdir
)
/src/public
\
-DPREFIX
=
\"
$(
prefix
)
\"
\
-DPROGSHAREDIR
=
\"
${
datadir
}
/ring
\"
\
$(
DBUSCPP_CFLAGS
)
...
...
This diff is collapsed.
Click to expand it.
daemon/globals.mak
+
1
−
0
View file @
8c4b047a
...
...
@@ -25,6 +25,7 @@ AM_CPPFLAGS = \
-I
$(
src
)
/src
\
-I
$(
src
)
/src/config
\
-I
$(
src
)
/test
\
-I
$(
src
)
/src/public
\
$(
SIP_CFLAGS
)
\
-DPREFIX
=
\"
$(
prefix
)
\"
\
-DPROGSHAREDIR
=
\"
${
datadir
}
/ring
\"
\
...
...
This diff is collapsed.
Click to expand it.
daemon/src/ring.h
→
daemon/src/
public/
ring.h
+
0
−
0
View file @
8c4b047a
File moved
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment