git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added template specification.
[stg.git]
/
projects
/
sgconf
/
Makefile
diff --git
a/projects/sgconf/Makefile
b/projects/sgconf/Makefile
index 096991221d761977ddd36c10897a4ff922d8ac55..3a64cb6147e9358101bedeed0d8616975233054a 100644
(file)
--- a/
projects/sgconf/Makefile
+++ b/
projects/sgconf/Makefile
@@
-7,11
+7,19
@@
include ../../Makefile.conf
PROG = sgconf
SRCS = ./main.cpp \
PROG = sgconf
SRCS = ./main.cpp \
- ./common_sg.cpp
-
-STGLIBS = conffiles \
- srvconf \
- crypto \
+ ./options.cpp \
+ ./api_action.cpp \
+ ./actions.cpp \
+ ./admins.cpp \
+ ./tariffs.cpp \
+ ./users.cpp \
+ ./services.cpp \
+ ./corps.cpp \
+ ./info.cpp \
+ ./xml.cpp
+
+STGLIBS = srvconf \
+ crypto \
common
STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
common
STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
@@
-22,7
+30,7
@@
LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD)
ifeq ($(OS),linux)
else
LIBS += -lc \
ifeq ($(OS),linux)
else
LIBS += -lc \
- -liconv
+
-liconv
endif
SEARCH_DIRS = -I ../../include
endif
SEARCH_DIRS = -I ../../include
@@
-57,11
+65,7
@@
$(PROG): $(OBJS)
$(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
clean:
$(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
clean:
- rm -f deps $(PROG) *.o tags *.*~ .OS
- rm -f .OS
- rm -f .store
- rm -f .db.sql
- rm -f core*
+ rm -f deps $(PROG) *.o
$(MAKE) -C $(DIR_LIBSRC) clean
distclean: clean
$(MAKE) -C $(DIR_LIBSRC) clean
distclean: clean
@@
-71,9
+75,11
@@
install: install-bin
install-bin:
ifeq ($(DEBUG), yes)
install-bin:
ifeq ($(DEBUG), yes)
- install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
+ mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+ install -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
else
else
- install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
+ mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/sbin
+ install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
endif
$(MAKE) -C $(DIR_LIBSRC) install
endif
$(MAKE) -C $(DIR_LIBSRC) install
@@
-91,7
+97,7
@@
endif
endif
endif
endif
endif
-deps:
$(SRCS) ../../Makefile.conf
+deps: $(SRCS) ../../Makefile.conf
$(MAKE) -C $(DIR_LIBSRC)
@>deps ;\
for file in $(SRCS); do\
$(MAKE) -C $(DIR_LIBSRC)
@>deps ;\
for file in $(SRCS); do\