diff options
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | plugins/Makefile | 4 | ||||
-rw-r--r-- | weechat/Makefile | 5 |
3 files changed, 3 insertions, 11 deletions
@@ -10,7 +10,7 @@ PLUGINDIR = plugins PLUGINS = $(filter-out _%,$(patsubst $(PLUGINDIR)/%,%,$(shell find $(PLUGINDIR)/ -maxdepth 1 -type d))) -.PHONY: all clean remake +.PHONY: all clean # Clear all implicit suffix rules .SUFFIXES: @@ -25,9 +25,6 @@ clean: rm -f $(TARGETS) *.o *.sql.h for pl in $(PLUGINS); do make --no-print-directory -C $(PLUGINDIR) $@ PLUGINNAME=$$pl; done -remake: clean - $(MAKE) all - $(TARGETS): $(patsubst %.c,%.o,$(wildcard *.c)) $(CC) -o $@ $^ $(LDFLAGS) diff --git a/plugins/Makefile b/plugins/Makefile index 26d3047..a87e798 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -13,15 +13,13 @@ SO_FLAGS += -fPIC TARGET = $(PLUGINNAME)/$(PLUGINNAME).$(SO_EXT) -.PHONY: all clean remake warning +.PHONY: all clean warning all: warning $(TARGET) clean: warning rm -rf $(TARGET) $(PLUGINNAME)/*.{o,dSYM} -remake: clean all - warning: ifndef PLUGINNAME $(error "PLUGINNAME not set! Please run root Makefile instead.") diff --git a/weechat/Makefile b/weechat/Makefile index 0973efe..650bbf2 100644 --- a/weechat/Makefile +++ b/weechat/Makefile @@ -20,16 +20,13 @@ endif .SECONDARY: -.PHONY: all clean remake dynamiclib +.PHONY: all clean dynamiclib all: dynamiclib clean: rm -f *.$(DYLIB_EXT) *.o -remake: clean - $(MAKE) all - dynamiclib: tomsg.$(DYLIB_EXT) |