Browse Source

fix compile issues

sisyphus
Dustin Falgout 9 years ago
parent
commit
ae8df97a7d
  1. 1
      .gitignore
  2. 19
      CMakeLists.txt
  3. 3
      configure.ac
  4. 21
      src/Makefile.am

1
.gitignore vendored

@ -1,3 +1,4 @@
/build
/ChangeLog /ChangeLog
/AUTHORS /AUTHORS
### ArchLinuxPackages template ### ArchLinuxPackages template

19
CMakeLists.txt

@ -1,2 +1,17 @@
project(lightdm-webkit2-greeter) cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8) project(lightdm-webkit2-greeter C)
#[[
set(lightdm-webkit2-greeter_VERSION_MAJOR 0)
set(lightdm-webkit2-greeter_VERSION_MINOR 2)
set(lightdm-webkit2-greeter_VERSION_BUGFIX 3)
set(PROJECT_SOURCE_DIR src)
set(LIBSRC ${PROJECT_SOURCE_DIR})
set(SRC lightdm-webkit2-greeter)
install(FILES lightdm-webkit2-greeter-ext.so DESTINATION lib)
install(FILES lightdm-webkit2-greeter DESTINATION bin)
add_library(lightdm-webkit2-greeter-ext SHARED ${LIBSRC}/lightdm-webkit2-greeter-ext.c)
add_executable(lightdm-webkit2-greeter ${PROJECT_SOURCE_DIR}/lightdm-webkit2-greeter.c)]]

3
configure.ac

@ -30,8 +30,7 @@ dnl PKG_CHECK_MODULES(WEB_EXTENSION, [webkit2gtk-4.0 >= 2.8.0])
dnl AC_SUBST(WEB_EXTENSION_CFLAGS) dnl AC_SUBST(WEB_EXTENSION_CFLAGS)
dnl AC_SUBST(WEB_EXTENSION_LIBS) dnl AC_SUBST(WEB_EXTENSION_LIBS)
PKG_CHECK_MODULES([WEB_EXTENSION], [ PKG_CHECK_MODULES([WEB_EXTENSION], [webkit2gtk-web-extension-4.0 >= 2.8.0])
webkit2gtk-web-extension-4.0 >= 2.8.0])
AC_SUBST([WEB_EXTENSION_CFLAGS]) AC_SUBST([WEB_EXTENSION_CFLAGS])
AC_SUBST([WEB_EXTENSION_LIBS]) AC_SUBST([WEB_EXTENSION_LIBS])

21
src/Makefile.am

@ -1,8 +1,10 @@
webextension_LTLIBRARIES = liblightdm-webkit2-greeter-ext.la webextension_LTLIBRARIES = liblightdm-webkit2-greeter-ext.la
webextensiondir = $(libdir)/lightdm-webkit2-greeter webextensiondir = $(libdir)/lightdm-webkit2-greeter
liblightdm_webkit2_greeter_ext_la_SOURCES = \ lightdm-webkit2-greeter-css-application.h: $(srcdir)/lightdm-webkit2-greeter-application.css Makefile
lightdm-webkit2-greeter-ext.c $(AM_V_GEN) exo-csource --static --name=lightdm_webkit2_greeter_css_application $< >$@
liblightdm_webkit2_greeter_ext_la_SOURCES = lightdm-webkit2-greeter-ext.c
liblightdm_webkit2_greeter_ext_la_CFLAGS = \ liblightdm_webkit2_greeter_ext_la_CFLAGS = \
$(GREETER_CFLAGS) \ $(GREETER_CFLAGS) \
@ -16,7 +18,7 @@ liblightdm_webkit2_greeter_ext_la_LIBADD = \
$(GREETER_LIBS) $(GREETER_LIBS)
liblightdm_webkit2_greeter_ext_LDADD = \ liblightdm_webkit2_greeter_ext_LDADD = \
$(WEB_EXTENSION_LIBS) \ $(WEB_EXTENSION_LIBS) \
$(GREETER_LIBS) $(GREETER_LIBS)
liblightdm_webkit2_greeter_ext_la_LDFLAGS = -module -avoid-version -no-undefined liblightdm_webkit2_greeter_ext_la_LDFLAGS = -module -avoid-version -no-undefined
@ -24,8 +26,7 @@ liblightdm_webkit2_greeter_ext_la_LDFLAGS = -module -avoid-version -no-undefined
greeter_PROGRAMS = lightdm-webkit2-greeter greeter_PROGRAMS = lightdm-webkit2-greeter
greeterdir = $(bindir) greeterdir = $(bindir)
lightdm_webkit2_greeter_built_sources = \ lightdm_webkit2_greeter_built_sources = lightdm-webkit2-greeter-css-application.h
lightdm-webkit2-greeter-css-application.h
lightdm_webkit2_greeter_SOURCES = \ lightdm_webkit2_greeter_SOURCES = \
$(lightdm_webkit2_greeter_built_sources) \ $(lightdm_webkit2_greeter_built_sources) \
@ -44,15 +45,13 @@ lightdm_webkit2_greeter_LDADD = \
$(WEB_EXTENSION_LIBS) \ $(WEB_EXTENSION_LIBS) \
$(LIBX11_LIBS) $(LIBX11_LIBS)
lightdm-webkit2-greeter-css-application.h: $(srcdir)/lightdm-webkit2-greeter-application.css Makefile
$(AM_V_GEN) exo-csource --static --name=lightdm_webkit2_greeter_css_application $< >$@
BUILT_SOURCES = \ BUILT_SOURCES = $(lightdm_webkit2_greeter_built_sources)
$(lightdm_webkit2_greeter_built_sources)
DISTCLEANFILES = \ DISTCLEANFILES = \
Makefile.in \ Makefile.in \
$(lightdm_webkit2_greeter_built_sources) $(lightdm_webkit2_greeter_built_sources)
EXTRA_DIST = \ EXTRA_DIST = lightdm-webkit2-greeter-application.css
lightdm-webkit2-greeter-application.css

Loading…
Cancel
Save