diff options
| author | Karel Kočí <cynerd@email.cz> | 2018-11-05 23:04:32 +0100 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2018-11-05 23:04:32 +0100 |
| commit | d7f641d5dd6c099d4a9274a18fcfb89df00d4b4c (patch) | |
| tree | fa46c7ec3902a9549393df154f24b25ef7517875 /config.mk | |
| parent | 78d9d66ad6ce6455690670173623ad420d12170d (diff) | |
| parent | 2b71a22755bae132a639fe10475a0d42e582d244 (diff) | |
| download | surf-bda5433e84b99470681e1e3f67b7abd929750236.tar.gz surf-bda5433e84b99470681e1e3f67b7abd929750236.tar.bz2 surf-bda5433e84b99470681e1e3f67b7abd929750236.zip | |
Merge branch 'surf-webkit2' into mysurfv2.0.7
Diffstat (limited to 'config.mk')
| -rw-r--r-- | config.mk | 23 |
1 files changed, 11 insertions, 12 deletions
@@ -6,27 +6,26 @@ PKG_CONFIG ?= pkg-config # paths PREFIX = /usr MANPREFIX = $(PREFIX)/share/man -LIBPREFIX = $(PREFIX)/lib/surf +LIBPREFIX = $(PREFIX)/lib +LIBDIR = $(LIBPREFIX)/surf X11INC = $(shell $(PKG_CONFIG) --cflags x11) X11LIB = $(shell $(PKG_CONFIG) --libs x11) -GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gthread-2.0 gcr-3 webkit2gtk-4.0) -GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gthread-2.0 gcr-3 webkit2gtk-4.0) +GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0) +GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.0) +WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0) +WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0) # includes and libs INCS = $(X11INC) $(GTKINC) -LIBS = $(X11LIB) $(GTKLIB) +LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0 # flags -CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" \ +CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \ -D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE -SURF_CFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS) -SURF_LDFLAGS = $(LIBS) $(LDFLAGS) +SURFCFLAGS = $(INCS) $(CPPFLAGS) +WEBEXTCFLAGS = -fPIC $(WEBEXTINC) -# Solaris -#CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\" -#LDFLAGS = $(LIBS) - -# compiler and linker +# compiler #CC = c99 |