git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explicitly initialize base class in copy ctors of notifiers
[stg.git]
/
projects
/
sgconf_xml
/
Makefile
diff --git
a/projects/sgconf_xml/Makefile
b/projects/sgconf_xml/Makefile
index 60288877bd731f729920e83d9707ccfd106c54ff..671833eda2a1b3d53aedc71c1136c6e82b5671d3 100644
(file)
--- a/
projects/sgconf_xml/Makefile
+++ b/
projects/sgconf_xml/Makefile
@@
-9,22
+9,23
@@
PROG = sgconf_xml
SRCS = ./main.cpp \
./parser.cpp
SRCS = ./main.cpp \
./parser.cpp
-
LIBS = -l
conffiles \
-
-lstg_crypto
\
-
-lstg_common
\
- -lsrvconf
+
STGLIBS =
conffiles \
+
srvconf
\
+
crypto
\
+ common
-LIBS += -lexpat \
- $(LIB_THREAD)
+STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS)))
+STGLIBS_LIBS = $(addprefix -L ../../stglibs/,$(addsuffix .lib,$(STGLIBS)))
+
+LIBS += -lexpat $(LIB_THREAD) $(addprefix -lstg,$(STGLIBS))
ifeq ($(OS),linux)
ifeq ($(OS),linux)
-LIBS += -ldl
else
LIBS += -lc \
-liconv
endif
else
LIBS += -lc \
-liconv
endif
-SEARCH_DIRS = -I
$(DIR_INCLUDE)
+SEARCH_DIRS = -I
../../include
ifeq ($(OS),bsd)
SEARCH_DIRS += -I/usr/local/include
ifeq ($(OS),bsd)
SEARCH_DIRS += -I/usr/local/include
@@
-38,10
+39,9
@@
endif
OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
OBJS = $(notdir $(patsubst %.cpp, %.o, $(patsubst %.c, %.o, $(SRCS))))
-CXXFLAGS += -Wall
-LDFLAGS += -Wl,-E -L$(DIR_LIB) -Wl,-rpath,$(PREFIX)/usr/lib/stg -Wl,-rpath-link,$(DIR_LIB)
-
-vpath %.so $(DIR_LIB)
+CXXFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+CFLAGS += $(DEFS) $(STGLIBS_INCS) $(SEARCH_DIRS)
+LDFLAGS += -Wl,-E $(STGLIBS_LIBS)
.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
@@
-49,8
+49,8
@@
all: libs $(PROG) ../../Makefile.conf
libs:
$(MAKE) -C $(DIR_LIBSRC)
libs:
$(MAKE) -C $(DIR_LIBSRC)
-$(PROG): $(OBJS)
$(STGLIBS)
- $(C
C
) $^ $(LIBS) $(LDFLAGS) -o $(PROG)
+$(PROG): $(OBJS)
+ $(C
XX
) $^ $(LIBS) $(LDFLAGS) -o $(PROG)
clean:
rm -f deps $(PROG) *.o tags *.*~ .OS
clean:
rm -f deps $(PROG) *.o tags *.*~ .OS
@@
-69,19
+69,11
@@
install-bin:
install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
$(MAKE) -C $(DIR_LIBSRC) install
install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
$(MAKE) -C $(DIR_LIBSRC) install
-install-data:
- # Install etc
- install -m $(DATA_MODE) -o $(OWNER) -D $(ETC_DIR)/sgconf.conf $(PREFIX)/etc/stargazer/sgconf.conf
-
uninstall: uninstall-bin uninstall-data
uninstall-bin:
rm -f $(PREFIX)/usr/sbin/$(PROG)
uninstall: uninstall-bin uninstall-data
uninstall-bin:
rm -f $(PREFIX)/usr/sbin/$(PROG)
-uninstall-data:
- # Uninstall etc
- rm -f $(PREFIX)/etc/stargazer/sgconf.conf
-
ifneq ($(MAKECMDGOALS),distclean)
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),distclean)
ifneq ($(MAKECMDGOALS),clean)
@@
-92,11
+84,11
@@
endif
endif
deps: $(SRCS) ../../Makefile.conf
endif
deps: $(SRCS) ../../Makefile.conf
- $(MAKE) -C $(DIR_LIBSRC)
includes
+ $(MAKE) -C $(DIR_LIBSRC)
@>deps ;\
for file in $(SRCS); do\
@>deps ;\
for file in $(SRCS); do\
- echo "`$(CC) $(CXXFLAGS)
$(SEARCH_DIRS)
-MM $$file` Makefile" >> deps ;\
- echo -e '\t$$(CC) -c $$< $(CXXFLAGS)
$(SEARCH_DIRS) $(DEFS)
' >> deps ;\
+ echo "`$(CC) $(CXXFLAGS) -MM $$file` Makefile" >> deps ;\
+ echo -e '\t$$(CC) -c $$< $(CXXFLAGS)' >> deps ;\
done
done