From 992869d713d769f8bc73b8901b995c30a43e15cc Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 28 Apr 2015 11:10:06 +0800 Subject: [PATCH] src/Makefile.am --- src/Makefile.am | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 6d6d85cb9..2cc2beea8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,14 +30,10 @@ endif if HAVE_GDA5 builder_LIBGDA = --pkg libgda-5.0 -LIBGDA_CFLAGS = $(BUILDER_CFLAGS) $(LIBGDA5_CFLAGS) -LIBGDA_LIBS = $(LIBGDA5_LIBS) endif if HAVE_GDA4 builder_LIBGDA = --pkg libgda-4.0 -LIBGDA_CFLAGS = $(BUILDER_CFLAGS) $(LIBGDA4_CFLAGS) -LIBGDA_LIBS = $(LIBGDA4_LIBS) endif @@ -46,32 +42,13 @@ endif if HAVE_WEBKIT4 builder_WEBKKIT = --pkg webkit2gtk-4.0 -WEBKIT_CFLAGS = $(WEBKIT4_CFLAGS) -WEBKIT_LIBS = $(WEBKIT4_LIBS) endif if HAVE_WEBKIT3 builder_WEBKKIT = --pkg webkit2gtk-3.0 -WEBKIT_CFLAGS = $(WEBKIT3_CFLAGS) -WEBKIT_LIBS = $(WEBKIT3_LIBS) -endif - - -# AVASCRIPTCOREGTK - - -if HAVE_JAVASCRIPTCOREGTK4 -# builder_JAVASCRIPTCOREGTK = --pkg javascriptcore -JAVASCRIPTCOREGTK_CFLAGS = $(JAVASCRIPTCOREGTK4_CFLAGS) -JAVASCRIPTCOREGTK_LIBS = $(JAVASCRIPTCOREGTK4_LIBS) -endif - -if HAVE_JAVASCRIPTCOREGTK3 -# builder_JAVASCRIPTCOREGTK = --pkg javascriptcore -JAVASCRIPTCOREGTK_CFLAGS = $(JAVASCRIPTCOREGTK3_CFLAGS) -JAVASCRIPTCOREGTK_LIBS = $(JAVASCRIPTCOREGTK3_LIBS) endif + AM_CPPFLAGS = $(BUILDER_CFLAGS) $(WEBKIT_CFLAGS) $(LIBGDA_CFLAGS) $(LIBVALA_CFLAGS) $(JAVASCRIPTCOREGTK_CFLAGS) -- 2.39.2