make BSD's make work, 2nd try

pobrn · Apr 22, 2009 · cba970a · cba970a
1 parent 49e52d4
commit cba970a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/BSDmakefile b/BSDmakefile
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-.include Makefile
+.include "Makefile"
 
 CC      ?= cc
 CFLAGS  ?= -O2 -Wall
@@ -52,4 +52,12 @@ DEFINES += -DDEBUG
 
 OBJS = $(SRCS:.c=.o)
 
-.include rules.mk
+all: $(program)
+
+.SUFFIXES: .o .c
+.c.o:
+	$(CC) $(CFLAGS) $(DEFINES) -DVERSION="\"$(version)\"" -c $(.IMPSRC)
+
+$(OBJS): $(HEADERS)
+
+.include "rules.mk"
diff --git a/GNUmakefile b/GNUmakefile
@@ -52,4 +52,9 @@ endif
 
 OBJS = $(SRCS:.c=.o)
 
+all: $(program)
+
+%.o: %.c $(HEADERS)
+	$(CC) $(CFLAGS) $(DEFINES) -DVERSION="\"$(version)\"" -c $<
+
 include rules.mk
diff --git a/rules.mk b/rules.mk
@@ -15,12 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-.PHONY: all strip indent clean install uninstall
-
-all: $(program)
-
-%.o : %.c $(HEADERS)
-	$(CC) $(CFLAGS) $(DEFINES) -DVERSION="\"$(version)\"" -c $<
+.PHONY: strip indent clean install uninstall
 
 $(program): $(OBJS)
 	$(CC) $(CFLAGS) $(OBJS) -o $(program) $(LDFLAGS) $(LIBS)