diff options
| author | Quentin Rameau <quinq@fifth.space> | 2019-02-06 10:27:01 +0100 |
|---|---|---|
| committer | Quentin Rameau <quinq@fifth.space> | 2019-02-06 10:53:05 +0100 |
| commit | 890b2fc3960b76086a9c2b645d0592135f7d5284 (patch) | |
| tree | 614db3dde51ce13335dfde04d6da6f10fe7d8d37 | |
| parent | Makefile: fix a typo for the webext CFLAGS (diff) | |
| download | surf-890b2fc3960b76086a9c2b645d0592135f7d5284.tar.gz surf-890b2fc3960b76086a9c2b645d0592135f7d5284.tar.bz2 surf-890b2fc3960b76086a9c2b645d0592135f7d5284.zip | |
Makefile: include common to webext
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | config.mk | 2 |
2 files changed, 14 insertions, 9 deletions
diff --git a/Makefile b/Makefile index 90df791..0e322d6 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,11 @@ include config.mk -SRC = surf.c common.c -OBJ = $(SRC:.c=.o) +SRC = surf.c +CSRC = common.c WEBEXTSRC = libsurf-webext.c +OBJ = $(SRC:.c=.o) +COBJ = $(CSRC:.c=.o) 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 +$(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) -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: - rm -f surf $(OBJ) + rm -f surf $(OBJ) $(OBJ) rm -f libsurf-webext.so $(WEBEXTOBJ) distclean: clean diff --git a/config.mk b/config.mk index fa22f30..5e68e38 100644 --- 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 -SURFCFLAGS = $(INCS) $(CPPFLAGS) +SURFCFLAGS = $(INCS) $(CPPFLAGS) -fPIC WEBEXTCFLAGS = -fPIC $(WEBEXTINC) # compiler |