git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved plugin-related things into a separate file.
[stg.git]
/
projects
/
sgconf
/
Makefile
diff --git
a/projects/sgconf/Makefile
b/projects/sgconf/Makefile
index 4d62bb536c998b0d29752f88148cb6f4fa14753c..52a70ae8fdc49d569985f02500cc188c2d36c2e0 100644
(file)
--- a/
projects/sgconf/Makefile
+++ b/
projects/sgconf/Makefile
@@
-7,11
+7,18
@@
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 \
+ ./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
+29,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
@@
-41,7
+48,11
@@
OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
-LDFLAGS += -Wl,-E $(STGLIBS_LIBS)
+LDFLAGS += $(STGLIBS_LIBS)
+
+ifneq ($(OS),darwin)
+LDFLAGS += -Wl,-E
+endif
.PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
all: libs $(PROG) ../../Makefile.conf
.PHONY: all clean distclean libs install uninstall install-bin install-data uninstall-bin uninstall-data
all: libs $(PROG) ../../Makefile.conf
@@
-53,11
+64,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
@@
-66,7
+73,11
@@
distclean: clean
install: install-bin
install-bin:
install: install-bin
install-bin:
- install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
+ifeq ($(DEBUG), yes)
+ install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
+else
+ install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
+endif
$(MAKE) -C $(DIR_LIBSRC) install
uninstall: uninstall-bin
$(MAKE) -C $(DIR_LIBSRC) install
uninstall: uninstall-bin
@@
-83,7
+94,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\