From b9cd3bb0bc3e897a44c8637b0da0fe0e28fa21c6 Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Wed, 6 Feb 2019 10:22:15 +0100 Subject: Makefile: fix a typo for the webext CFLAGS Thanks to Justin Keogh for spotting this --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cdbd8ad..90df791 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ libsurf-webext.so: $(WEBEXTOBJ) $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS) -lc surf: $(OBJ) - $(CC) $(SURFLDLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) + $(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) clean: rm -f surf $(OBJ) -- cgit v1.2.3 From 890b2fc3960b76086a9c2b645d0592135f7d5284 Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Wed, 6 Feb 2019 10:27:01 +0100 Subject: Makefile: include common to webext --- Makefile | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'Makefile') 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 -- cgit v1.2.3 From bf46e40f3ac3ce6007f9f5c1cf482dde2ae35589 Mon Sep 17 00:00:00 2001 From: Leonardo Taccari Date: Thu, 7 Feb 2019 21:22:48 +0100 Subject: Makefile: fix a typo in clean: target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0e322d6..4f5253a 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ surf: $(OBJ) $(COBJ) $(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(COBJ) $(LIBS) clean: - rm -f surf $(OBJ) $(OBJ) + rm -f surf $(OBJ) $(COBJ) rm -f libsurf-webext.so $(WEBEXTOBJ) distclean: clean -- cgit v1.2.3