diff Makefile.in @ 662:d7badd5606ca

Removed the Carbon source file, and changes to configure to build the Cocoa version. Mac GTK version should still work. Carbon was unfinished, Cocoa version is more complete.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 25 Feb 2011 15:25:54 +0000
parents 5ea195fd28da
children 39d848c20c05
line wrap: on
line diff
--- a/Makefile.in	Fri Feb 25 03:45:44 2011 +0000
+++ b/Makefile.in	Fri Feb 25 15:25:54 2011 +0000
@@ -6,9 +6,10 @@
 LFLAGS	=	@LIBS@ @ARCH@
 INSTALL =	@INSTALL@
 DW_SRC  =	@DW_SRC@
+DW_DIR  =	@DW_DIR@
 INCPATH	=	-I.. -I. -I$(srcdir)
 TARGET	=	@TARGET@
-SRCS	=	$(srcdir)/$(DW_SRC)/dw.c $(DW_SRC)rel2abs.c
+SRCS	=	$(srcdir)/$(DW_DIR)/$(DW_SRC) $(DW_DIR)rel2abs.c
 BROWSER_OBJECT=@BROWSER_OBJECT@
 COMPAT_OBJECT=@COMPAT_OBJECT@
 INSTALL_COMPAT=@INSTALL_COMPAT@
@@ -114,7 +115,7 @@
 	rm -f *.o
 	rm -f *~
 	rm -f *.a
-	rm -f $(DW_SRC)/*.o
+	rm -f $(DW_DIR)/*.o
 	rm -f dwtest
 
 $(SYSCONF_LINK_TARGET2): $(OBJECTS2)
@@ -123,11 +124,11 @@
 $(SYSCONF_LINK_TARGET): $(OBJECTS)
 	$(SYSCONF_LINK_LIB)
 
-dw.o: $(srcdir)/$(DW_SRC)/dw.c
-	$(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/$(DW_SRC)/dw.c
+dw.o: $(srcdir)/$(DW_DIR)/$(DW_SRC)
+	$(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/$(DW_DIR)/$(DW_SRC)
 
-browser.o: $(srcdir)/$(DW_SRC)/browser.cpp
-	$(CXX) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/$(DW_SRC)/browser.cpp
+browser.o: $(srcdir)/$(DW_DIR)/browser.cpp
+	$(CXX) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/$(DW_DIR)/browser.cpp
 
 compat.o: $(srcdir)/compat.c
 	$(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/compat.c