Skip to content

Commit

Permalink
Name demo applications with suffix -gtkX. See #2
Browse files Browse the repository at this point in the history
  • Loading branch information
wandrien committed May 17, 2013
1 parent 1a78038 commit a667a67
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 9 deletions.
2 changes: 2 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ AC_ARG_ENABLE(demo,
[enable_demo=no]
)
AM_CONDITIONAL(ENABLE_DEMO, test x"$enable_demo" = x"yes")
DEMO_APPS="libsmfm-demo-gtk$GTK_VERSION_MAJOR libsmfm-file-search-cli-demo-gtk$GTK_VERSION_MAJOR"
AC_SUBST(DEMO_APPS)

GETTEXT_PACKAGE="libsmfm-gtk$GTK_VERSION_MAJOR"
AC_SUBST(GETTEXT_PACKAGE)
Expand Down
35 changes: 26 additions & 9 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -184,46 +184,63 @@ libsmfm_pref_apps_LDADD = \


if ENABLE_DEMO
bin_PROGRAMS += libsmfm-demo libsmfm-file-search-cli-demo
libsmfm_demo_SOURCES = \

bin_PROGRAMS += @DEMO_APPS@

EXTRA_PROGRAMS += \
libsmfm-demo-gtk2 \
libsmfm-file-search-cli-demo-gtk2 \
libsmfm-demo-gtk3 \
libsmfm-file-search-cli-demo-gtk3 \
$(NULL)

libsmfm_demo_gtk2_SOURCES = \
$(gtk_compat_SOURCES) \
demo/libsmfm-demo.c \
demo/main-win.c demo/main-win.h \
$(NULL)
libsmfm_demo_gtk3_SOURCES = $(libsmfm_demo_gtk2_SOURCES)

libsmfm_demo_DEPENDENCIES = \
libsmfm_demo_gtk2_DEPENDENCIES = \
@LIBSMFM_GTK_LTLIBRARIES@ \
$(NULL)
libsmfm_demo_gtk3_DEPENDENCIES = $(libsmfm_demo_gtk2_DEPENDENCIES)

libsmfm_demo_CFLAGS = \
libsmfm_demo_gtk2_CFLAGS = \
$(LIBSMFM_CFLAGS) \
$(GTK_CFLAGS) \
-Werror-implicit-function-declaration \
$(NULL)
libsmfm_demo_gtk3_CFLAGS = $(libsmfm_demo_gtk2_CFLAGS)

libsmfm_demo_LDADD = \
libsmfm_demo_gtk2_LDADD = \
$(LIBSMFM_LIBS) \
$(GTK_LIBS) \
$(INTLLIBS) \
@LIBSMFM_GTK_LTLIBRARIES@ \
$(NULL)
libsmfm_demo_gtk3_LDADD = $(libsmfm_demo_gtk2_LDADD)

libsmfm_file_search_cli_demo_SOURCES = \
libsmfm_file_search_cli_demo_gtk2_SOURCES = \
demo/libsmfm-file-search-cli-demo.c \
$(NULL)
libsmfm_file_search_cli_demo_gtk3_SOURCES = $(libsmfm_file_search_cli_demo_gtk2_SOURCES)

libsmfm_file_search_cli_demo_CFLAGS = \
libsmfm_file_search_cli_demo_gtk2_CFLAGS = \
$(LIBSMFM_CFLAGS) \
$(GTK_CFLAGS) \
-Werror-implicit-function-declaration \
$(NULL)
libsmfm_file_search_cli_demo_gtk3_CFLAGS = $(libsmfm_file_search_cli_demo_gtk2_CFLAGS)

libsmfm_file_search_cli_demo_LDADD = \
libsmfm_file_search_cli_demo_gtk2_LDADD = \
$(LIBSMFM_LIBS) \
$(GTK_LIBS) \
$(INTLLIBS) \
libsmfm-gtk2.la \
@LIBSMFM_GTK_LTLIBRARIES@ \
$(NULL)
libsmfm_file_search_cli_demo_gtk3_LDADD = $(libsmfm_file_search_cli_demo_gtk2_LDADD)

endif


Expand Down

0 comments on commit a667a67

Please sign in to comment.