From 16f9694bdc6f0703c1660faa7446ab7366de7f55 Mon Sep 17 00:00:00 2001 From: Alsor Zhou Date: Thu, 17 Sep 2009 13:40:07 +0800 Subject: [PATCH] Resolve problem for passing build --- configure.ac | 1 - test/Makefile.am | 117 +----------------------------------------------------- 2 files changed, 2 insertions(+), 116 deletions(-) diff --git a/configure.ac b/configure.ac index d716c9b..dac2270 100644 --- a/configure.ac +++ b/configure.ac @@ -171,7 +171,6 @@ AC_OUTPUT([ util/Makefile data/Makefile data/org.ifanr.MiM.service - data/mim-pinyin.desktop test/Makefile docs/Makefile ]) diff --git a/test/Makefile.am b/test/Makefile.am index dec36ca..b282b5d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,126 +3,13 @@ # # Program name -bin_PROGRAMS = \ - chat-ui-tester \ - messaging-widgets-renderer-test \ - sms-ui-tester \ - messaging-ui-tester \ - url-smiley-parser-tester +bin_PROGRAMS = # Binary specific CFLAGS INCLUDES = \ @DEBUG_FLAGS@ \ $(PACKAGE_CFLAGS) \ - $(WIDGETS_CFLAGS) \ - $(OSSO_ADDRESSBOOK_CFLAGS) - - -# MSG WIDGETS -messaging_widgets_renderer_test_SOURCES = \ - messaging-widgets-renderer-test.c - -messaging_widgets_renderer_test_LDFLAGS = \ - $(WIDGETS_LDFLAGS) \ - $(LD_MALLOC_FLAGS) \ - -L../messaging-widgets - -messaging_widgets_renderer_test_LDADD = \ - $(WIDGETS_LIBS) \ - -lrtcom-messaging-widgets - -# -# MSG UI -# - -# Sources for SMS UI tester -messaging_ui_tester_SOURCES = \ - messaging-ui-tester-main.c - -# Link flags for SMS UI tester -messaging_ui_tester_LDFLAGS = \ - $(PACKAGE_LDFLAGS) \ - $(LD_MALLOC_FLAGS) \ - -L../sms-ui \ - -L../messaging-widgets \ - -L../messaging-ui \ - -L../chat-ui - -# Libraries to be linked for SMS UI -messaging_ui_tester_LDADD = \ - $(PACKAGE_LIBS) \ - -lrtcom-sms-ui \ - -lrtcom-messaging-widgets \ - -lrtcom-chat-ui \ - -lrtcom-messaging-ui - -# -# SMS UI -# - -# Sources for SMS UI tester -sms_ui_tester_SOURCES = \ - sms-ui-tester-main.c - -# Link flags for SMS UI tester -sms_ui_tester_LDFLAGS = \ - $(PACKAGE_LDFLAGS) \ - $(LD_MALLOC_FLAGS) \ - -L$(top_builddir)/messaging-widgets - -# Libraries to be linked for SMS UI -sms_ui_tester_LDADD = \ - $(PACKAGE_LIBS) \ - $(top_builddir)/sms-ui/librtcom-sms-ui.la \ - $(top_builddir)/messaging-ui/librtcom-messaging-ui.la \ - -lrtcom-messaging-widgets \ - -lrtcom-eventlogger \ - -lrtcom-el-plugin-sms - -# -# CHAT UI -# - -# Sources for CHAT UI tester -chat_ui_tester_SOURCES = \ - chat-ui-tester-main.c - -# Link flags for CHAT UI tester -chat_ui_tester_LDFLAGS = \ - $(PACKAGE_LDFLAGS) \ - $(LD_MALLOC_FLAGS) \ - $(OSSO_ADDRESSBOOK_LDFLAGS) \ - -L../messaging-widgets \ - -L../messaging-ui \ - -L../chat-ui \ - -L../sms-ui - -# Libraries to be linked for CHAT UI -chat_ui_tester_LDADD = \ - $(PACKAGE_LIBS) \ - $(OSSO_ADDRESSBOOK_LIBS) \ - -lrtcom-messaging-ui \ - -lrtcom-messaging-widgets \ - -lrtcom-chat-ui \ - -lrtcom-sms-ui - - -url_smiley_parser_tester_SOURCES = \ - url-smiley-parser-main.c - -url_smiley_parser_tester_LDFLAGS = \ - $(WIDGETS_LDFLAGS) \ - $(LD_MALLOC_FLAGS) \ - -L../sms-ui \ - -L../messaging-ui \ - -L../messaging-widgets - -url_smiley_parser_tester_LDADD = \ - $(WIDGETS_LIBS) \ - -lrtcom-sms-ui \ - -lrtcom-messaging-ui \ - -lrtcom-messaging-widgets - + $(WIDGETS_CFLAGS) # Cleaning and autogenerated stuff BUILT_SOURCES = -- 1.7.9.5