summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Quentin Rameau 2019-02-06 10:27:01 +0100
committerGravatar Quentin Rameau 2019-02-06 10:53:05 +0100
commit890b2fc3960b76086a9c2b645d0592135f7d5284 (patch)
tree614db3dde51ce13335dfde04d6da6f10fe7d8d37
parentMakefile: fix a typo for the webext CFLAGS (diff)
Makefile: include common to webext
-rw-r--r--Makefile21
-rw-r--r--config.mk2
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
='nohover-highlight'> 2024-09-25added ; chaining operatorGravatar BanceDev 1-14/+14 2024-09-25added || chaining operatorGravatar BanceDev 1-2/+9 2024-09-25Update README.mdGravatar Lance Borden 1-0/+3 2024-09-23fixed lua api exit status issueGravatar BanceDev 1-1/+1 2024-09-23fixed splitting within quoted stringGravatar BanceDev 1-5/+10 2024-09-23made and operator actually conditionalGravatar BanceDev 2-17/+27 2024-09-23fixed operator chaining to handle commands terminating with an operatorGravatar BanceDev 1-14/+5 2024-09-23implemented background process operatorGravatar BanceDev 6-154/+238 2024-09-23implemented piping into new chaining methodGravatar BanceDev 1-10/+30 2024-09-18fixed && chaining for builtinsGravatar BanceDev 2-23/+31 2024-09-18added basic && chainingGravatar BanceDev 2-8/+73 2024-09-17changed tokenizer to handle all the chaining operatorsGravatar BanceDev 3-20/+78 2024-09-17Update README.mdGravatar Lance Borden 1-0/+1 2024-09-13added better clarification to help menuGravatar BanceDev 1-1/+2 2024-09-13improved installation instructionsGravatar BanceDev 1-3/+3 2024-09-12v0.1.1Gravatar BanceDev 1-1/+1 2024-09-12fixed bug in input buffer handling due to misplaced printGravatar BanceDev 2-5/+8 2024-09-12Update build.yml checkout v4Gravatar Lance Borden 1-1/+1 2024-09-12Update build.yml to artifact v4Gravatar Lance Borden 1-1/+1 2024-09-12fixed exit status issue with non interative modeGravatar BanceDev 1-1/+1 2024-09-12added non interative mode for running lua scriptsGravatar BanceDev 2-4/+28 2024-09-12temporary github action fix until non-interactive mode is implementedGravatar BanceDev 1-2/+2 2024-09-12attempt to update build script to accept input into lush shellGravatar BanceDev 2-4/+6 2024-09-12prevent lush workflow from getting stuck in testsGravatar Lance Borden 1-1/+4 2024-09-12removed chsh in workflowGravatar Lance Borden 1-4/+1