git.ucc.asn.au
/
tpg
/
opendispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move Regex functions into common code and header
[tpg/opendispense2.git]
/
src
/
server
/
Makefile
diff --git
a/src/server/Makefile
b/src/server/Makefile
index
a773eb2
..
5034bf9
100644
(file)
--- a/
src/server/Makefile
+++ b/
src/server/Makefile
@@
-1,30
+1,45
@@
# OpenDispense 2
#
# OpenDispense 2
#
-OBJ := main.o server.o logging.o
+INSTALLDIR := /usr/local/opendispense2
+
+OBJ := main.o server.o logging.o
OBJ += dispense.o itemdb.o
OBJ += handler_coke.o handler_snack.o handler_door.o
OBJ += dispense.o itemdb.o
OBJ += handler_coke.o handler_snack.o handler_door.o
+OBJ += config.o doregex.o
BIN := ../../dispsrv
BIN := ../../dispsrv
-DEPFILES := $(OBJ:%.o=%.d)
+OBJ := $(OBJ:%=obj/%)
+DEPFILES := $(OBJ:%=%.d)
-LINKFLAGS := -g ../../cokebank.so
+LINKFLAGS := -g ../../cokebank.so
-lutil -lident -lmodbus -lsqlite3 -lpthread -Wl,-rpath,. -Wl,-rpath,$(INSTALLDIR)
CPPFLAGS :=
CPPFLAGS :=
-CFLAGS := -Wall -Wextra -Werror -g
+CFLAGS := -Wall -Wextra -Werror -g
-std=gnu99
.PHONY: all clean
all: $(BIN)
clean:
.PHONY: all clean
all: $(BIN)
clean:
- $(RM) $(BIN) $(OBJ)
+ $(RM) $(BIN) $(OBJ) $(DEPFILES)
+
+install: $(BIN)
+ mkdir -p $(INSTALLDIR)
+ cp $(BIN) $(INSTALLDIR)
$(BIN): $(OBJ)
$(BIN): $(OBJ)
- $(CC) -o $(BIN) $(
LINKFLAGS) $(OBJ
)
+ $(CC) -o $(BIN) $(
OBJ) $(LINKFLAGS
)
-%.o: %.c
+obj/%.o: %.c
+ @mkdir -p $(dir $@)
$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
- @cpp $< -MM -MF $
*
.d
+ @cpp $< -MM -MF $
@
.d
+
+obj/%.o: ../common/%.c
+ @mkdir -p $(dir $@)
+ $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+ @cpp $< -MM -MF
[email protected]
+
-include $(DEPFILES)
-include $(DEPFILES)
UCC
git Repository :: git.ucc.asn.au