[cairo-commit] CairoJava/jni Makefile,1.5,1.6

Charles Tuckey commit at pdx.freedesktop.org
Wed Dec 8 19:38:42 PST 2004


Committed by: ctuckey

Update of /cvs/cairo/CairoJava/jni
In directory gabe:/tmp/cvs-serv23096

Modified Files:
	Makefile 
Log Message:
Clean up Makefile. Remove rules that were not being used.


Index: Makefile
===================================================================
RCS file: /cvs/cairo/CairoJava/jni/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	11 May 2004 19:51:45 -0000	1.5
+++ Makefile	9 Dec 2004 03:38:40 -0000	1.6
@@ -24,17 +24,13 @@
 	CairoGlitzSurface.cpp \
 	utils.cpp
 
-
-OBJS = $(patsubst %.cpp,%.o,$(SRCS))
+OBJS = $(patsubst %.cpp,%.o,$(SRCS)) 
 HEADERS = $(patsubst %.cpp,%.h,$(SRCS))
-DEPS = $(patsubst %.cpp,%.dep,$(SRCS))
 
 all:	$(LIBDIR)/libcairoJni.so
 
 headers:	$(HEADERS)
 
-depend:	headers $(DEPS)
-
 $(LIBDIR)/libcairoJni.so:	headers $(OBJS)
 	mkdir -p $(LIBDIR)
 	gcc -shared -O3 $(DEBUG) -ffloat-store -o $@ $(OBJS) $(LDFLAGS) -lstdc++
@@ -42,13 +38,5 @@
 %.h:	%.class
 	$(JAVA_HOME)/bin/javah -o $@ -classpath $(CLASSDIR) $(subst /,.,$(subst $(CLASSDIR)/,,$(patsubst %.class,%,$<)))
 
-%.dep: %.cpp
-	@mkdir -p .deps
-	gcc $(CXXFLAGS) -M -MF .deps/$@ $<
-
 clean:
-	rm -fr $(OBJS) Cairo*.h .deps $(LIBDIR)/libcairoJni.so
-
-
-# Include automatically-generated dependency list:
--include .deps/*.dep
+	rm -fr $(OBJS) Cairo*.h $(LIBDIR)/libcairoJni.so




More information about the cairo-commit mailing list