pinosaur
/
surf.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b9cd3bb
)
Makefile: include common to webext
author
Quentin Rameau
<quinq@fifth.space>
Wed, 6 Feb 2019 09:27:01 +0000
(10:27 +0100)
committer
Quentin Rameau
<quinq@fifth.space>
Wed, 6 Feb 2019 09:53:05 +0000
(10:53 +0100)
Makefile
patch
|
blob
|
history
config.mk
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
90df791
..
0e322d6
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-4,9
+4,11
@@
include config.mk
include config.mk
-SRC = surf.c
common.c
-OBJ = $(SRC:.c=.o)
+SRC = surf.c
+CSRC = common.c
WEBEXTSRC = libsurf-webext.c
WEBEXTSRC = libsurf-webext.c
+OBJ = $(SRC:.c=.o)
+COBJ = $(CSRC:.c=.o)
WEBEXTOBJ = $(WEBEXTSRC:.c=.o)
all: options libsurf-webext.so surf
WEBEXTOBJ = $(WEBEXTSRC:.c=.o)
all: options libsurf-webext.so surf
@@
-25,18
+27,21
@@
config.h:
cp config.def.h $@
$(OBJ): config.h common.h config.mk
cp config.def.h $@
$(OBJ): config.h common.h config.mk
+$(COBJ): config.h common.h config.mk
+$(WEBEXTOBJ): config.h common.h config.mk
-$(WEBEXTOBJ): $(WEBEXTSRC)
config.h common.h config.mk
+$(WEBEXTOBJ): $(WEBEXTSRC)
$(CC) $(WEBEXTCFLAGS) $(CFLAGS) -c $(WEBEXTSRC)
$(CC) $(WEBEXTCFLAGS) $(CFLAGS) -c $(WEBEXTSRC)
-libsurf-webext.so: $(WEBEXTOBJ)
- $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS) -lc
+libsurf-webext.so: $(WEBEXTOBJ) $(COBJ)
+ $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ \
+ $(WEBEXTOBJ) $(COBJ) $(WEBEXTLIBS)
-surf: $(OBJ)
- $(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+surf: $(OBJ)
$(COBJ)
+ $(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(
COBJ) $(
LIBS)
clean:
clean:
- rm -f surf $(OBJ)
+ rm -f surf $(OBJ)
$(OBJ)
rm -f libsurf-webext.so $(WEBEXTOBJ)
distclean: clean
rm -f libsurf-webext.so $(WEBEXTOBJ)
distclean: clean
diff --git
a/config.mk
b/config.mk
index
fa22f30
..
5e68e38
100644
(file)
--- a/
config.mk
+++ b/
config.mk
@@
-24,7
+24,7
@@
LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0
# flags
CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
-D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
# flags
CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
-D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
-SURFCFLAGS = $(INCS) $(CPPFLAGS)
+SURFCFLAGS = $(INCS) $(CPPFLAGS)
-fPIC
WEBEXTCFLAGS = -fPIC $(WEBEXTINC)
# compiler
WEBEXTCFLAGS = -fPIC $(WEBEXTINC)
# compiler