N0VA/BeamMeUp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[refactor] change name app name to teleport

Browse Source
This commit is contained in:
Julian Sparber
2017-10-02 14:38:17 +02:00
parent 56835864e6
commit cfe4793b0a
10 changed files with 62 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/.gitignore vendored
View File

@@ -24,7 +24,5 @@ _libs
/main.o
/resources.c
/resources.o
/teleportapp
/teleportapp.o
/teleportappwin.o
/teleport
test_download

12
src/Makefile
View File

@@ -4,25 +4,25 @@ CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0 avahi-client libsoup-2.4)
LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0 avahi-client libsoup-2.4)
GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
SRC = teleportapp.c teleportappwin.c teleportpeer.c main.c browser.c publish.c server.c get.c
SRC = teleport.c teleportwin.c teleportpeer.c main.c browser.c publish.c server.c get.c
BUILT_SRC = resources.c
OBJS = $(BUILT_SRC:.c=.o) $(SRC:.c=.o)
all: teleportapp
all: teleport
resources.c: teleportapp.gresource.xml window.ui settings.ui remote_list.ui
$(GLIB_COMPILE_RESOURCES) teleportapp.gresource.xml --target=$@ --sourcedir=. --generate-source
resources.c: teleport.gresource.xml window.ui settings.ui remote_list.ui
$(GLIB_COMPILE_RESOURCES) teleport.gresource.xml --target=$@ --sourcedir=. --generate-source
%.o: %.c
$(CC) -c -o $(@F) $(CFLAGS) $<
teleportapp: $(OBJS)
teleport: $(OBJS)
$(CC) -o $(@F) $(OBJS) $(LIBS)
clean:
rm -f $(BUILT_SRC)
rm -f $(OBJS)
rm -f teleportapp
rm -f teleport

24
src/meson.build
View File

@@ -29,9 +29,9 @@ sources = files(
sources += gnome.compile_resources(
'gtd-resources',
join_paths(data_dir, 'teleportapp.gresource.xml'),
join_paths(data_dir, 'teleport.gresource.xml'),
source_dir: [ data_dir, join_paths(meson.build_root(), 'plugins') ],
c_name: 'teleportapp',
c_name: 'teleport',
# dependencies: plugins_confs,
export: true
)
@@ -57,11 +57,11 @@ incs = [
]
cflags = [
'-DPACKAGE_DATA_DIR="@0@"'.format(teleportapp_pkgdatadir),
'-DPACKAGE_LIB_DIR="@0@"'.format(teleportapp_pkglibdir),
'-DPACKAGE_LOCALE_DIR="@0@"'.format(teleportapp_localedir),
'-DPACKAGE_DATA_DIR="@0@"'.format(teleport_pkgdatadir),
'-DPACKAGE_LIB_DIR="@0@"'.format(teleport_pkglibdir),
'-DPACKAGE_LOCALE_DIR="@0@"'.format(teleport_localedir),
'-DPACKAGE_SRC_DIR="@0@"'.format(meson.current_source_dir()),
'-DUI_DATA_DIR="@0@"'.format(join_paths(teleportapp_pkgdatadir, 'style'))
'-DUI_DATA_DIR="@0@"'.format(join_paths(teleport_pkgdatadir, 'style'))
]
ldflags = [ '-Wl,--export-dynamic' ]
@@ -76,19 +76,19 @@ ldflags = [ '-Wl,--export-dynamic' ]
###############
# teleportapp #
# teleport #
###############
teleportapp = executable(
teleport = executable(
meson.project_name(),
sources,
include_directories: incs,
dependencies: teleportapp_deps,
dependencies: teleport_deps,
c_args: cflags,
#link_with: plugins_libs,
link_args: ldflags,
install: true,
install_dir: teleportapp_bindir
install_dir: teleport_bindir
)
@@ -102,13 +102,13 @@ libgtd = shared_library(
version: libversion,
soversion: soversion,
include_directories: incs,
dependencies: teleportapp_deps,
dependencies: teleport_deps,
c_args: cflags
)
libgtd_dep = declare_dependency(
link_with: libgtd,
include_directories: src_inc,
dependencies: teleportapp_deps
dependencies: teleport_deps
)