From 13d4822a0f88163de6ec2be5f4704dfc4aa6adab Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 5 May 2005 16:33:16 +0000 Subject: [PATCH] rules.mk: Support assembly and Qt Plugins - Add assembler stuff - Add support for qt plugin stuff --- make/rules.mk | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/make/rules.mk b/make/rules.mk index daaf2c1e..aa4628ff 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -76,6 +76,9 @@ $(TOPDIR)/bin/%.sh: %.sh %.o: %.c $(CC) $(CFLAGS) -c $< +%.o: %.S + $(CC) $(CFLAGS) -c $< + timers_%.h: %.h $(GENERATE_FUNC_TIMERS) sh $(GENERATE_FUNC_TIMERS) $< $@ @@ -96,6 +99,19 @@ endif mkdir -p $(BUILD_BINDIR) install -m 755 $@ $(BUILD_BINDIR) +ifeq ($(USE_PROJECT_LIB),true) + ifeq ($(LIBTYPE),shared) + $(PLUGIN) $(PLUGIN_BIN): $(OBJ) $(LIB_SO) + else + $(PLUGIN) $(PLUGIN_BIN): $(OBJ) $(LIB_A) + endif +else + $(PLUGIN) $(PLUGIN_BIN): $(OBJ) +endif + $(CC) -shared $(sort $(OBJ)) $(LDFLAGS) -o $@ + mkdir -p $(BUILD_BINDIR) + install -m 755 $@ $(BUILD_BINDIR) + $(LIBS): make -$(MAKEFLAGS) -C $(LIBDIR) all @@ -211,7 +227,7 @@ doneclean: rm -rf *.done $(PREREQ_DONE) execlean: allclean objclean textclean - rm -rf $(EXE) + rm -rf $(EXE) $(PLUGIN) distclean: clean objclean textclean tmpclean vcdistclean profclean timerclean rm -rf $(CLEAN) $(DISTCLEAN) $(AC_FILES)