Mercurial > dwindows

diff Makefile.in @ 1594:6baf177f335c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename compat.c/h dwcompat.c/h and configure option to --with-dwcompat. There are several other projects that include compat.c and compat.h... To avoid conflicts make sure the header and source files match the library.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 23 Feb 2012 12:44:15 +0000
parents 960ea1ec245e
children 080b764e8982
line wrap: on
line diff
--- a/Makefile.in	Sat Feb 18 20:45:51 2012 +0000
+++ b/Makefile.in	Thu Feb 23 12:44:15 2012 +0000
@@ -17,7 +17,7 @@
 COMPAT_OBJECT=@COMPAT_OBJECT@
 INSTALL_COMPAT=@INSTALL_COMPAT@
 OBJECTS	=	dw.o $(BROWSER_OBJECT)
-SRCS2	=	$(srcdir)compat.c
+SRCS2	=	$(srcdir)dwcompat.c
 OBJECTS2=	$(COMPAT_OBJECT)
 TARGET2=	@TARGET2@
 TARGETS = @TARGETS@
@@ -99,10 +99,10 @@
 	ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX); \
 	ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX).$(VER_MAJ)
 
-installcompat: $(SYSCONF_LINK_TARGET2)
+installdwcompat: $(SYSCONF_LINK_TARGET2)
 	$(INSTALL) -d $(prefix)/lib; \
 	$(INSTALL) $(SYSCONF_LINK_TARGET2) $(prefix)/lib; \
-	$(INSTALL) $(srcdir)/compat.h $(prefix)/include; \
+	$(INSTALL) $(srcdir)/dwcompat.h $(prefix)/include; \
 	cd $(prefix)/lib; \
 	rm -f lib$(TARGET2).$(SOSUFFIX) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ); \
 	ln -sf $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX); \
@@ -116,7 +116,7 @@
 	rm -f $(prefix)/lib/lib$(TARGET).$(SOSUFFIX)
 	rm -f $(prefix)/lib/lib$(TARGET).$(SOSUFFIX).$(VER_MAJ).$(VER_MIN)
 	rm -f $(prefix)/bin/dwindows-config
-	rm -f $(prefix)/include/compat.h
+	rm -f $(prefix)/include/dwcompat.h
 	rm -f $(prefix)/include/dw.h
 	rm -f $(prefix)/share/man/man1/dwindows-config.1.gz
 
@@ -152,8 +152,8 @@
 browser.o: $(srcdir)/$(DW_DIR)/browser.cpp $(srcdir)/dw.h
 	$(CXX) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/$(DW_DIR)/browser.cpp
 
-compat.o: $(srcdir)/compat.c
-	$(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/compat.c
+dwcompat.o: $(srcdir)/dwcompat.c
+	$(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/dwcompat.c
 
 dwtest.o: $(srcdir)/dwtest.c $(srcdir)/dw.h
 	$(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/dwtest.c
@@ -164,7 +164,7 @@
 	-$(srcdir)/mac/finishup.sh $(srcdir)
 
 zip:
-	zip dwindows$(VER_MAJ)$(VER_MIN).zip $(srcdir)/license.txt $(srcdir)/makefile.* $(srcdir)/readme $(srcdir)/*.c $(srcdir)/dw.h  $(srcdir)/compat.h \
+	zip dwindows$(VER_MAJ)$(VER_MIN).zip $(srcdir)/license.txt $(srcdir)/makefile.* $(srcdir)/readme $(srcdir)/*.c $(srcdir)/dw.h  $(srcdir)/dwcompat.h \
 	$(srcdir)/win/*.def $(srcdir)/os2/*.def $(srcdir)/install.sh $(srcdir)/*.in $(srcdir)/configure \
 	$(srcdir)/ac*.m4 $(srcdir)/dwindows-config.1 $(srcdir)/Version \
 	$(srcdir)/gtk/*.c $(srcdir)/gtk/*.cpp $(srcdir)/win/*.c $(srcdir)/os2/*.c $(srcdir)/win/*.txt $(srcdir)/os2/*.txt \
@@ -175,7 +175,7 @@
 
 dist:
 	(cd $(srcdir)/..;ln -sf dwindows $(SRCDIR))
-	(cd $(srcdir)/..;tar -cvf - $(SRCDIR)/license.txt $(SRCDIR)/makefile.* $(SRCDIR)/readme $(SRCDIR)/*.c $(SRCDIR)/dw.h $(SRCDIR)/compat.h \
+	(cd $(srcdir)/..;tar -cvf - $(SRCDIR)/license.txt $(SRCDIR)/makefile.* $(SRCDIR)/readme $(SRCDIR)/*.c $(SRCDIR)/dw.h $(SRCDIR)/dwcompat.h \
 	$(SRCDIR)/install.sh $(SRCDIR)/*.in $(SRCDIR)/configure $(SRCDIR)/Version \
 	$(SRCDIR)/ac*.m4 $(SRCDIR)/dwindows-config.1 $(SRCDIR)/config.sub $(SRCDIR)/config.guess \
 	$(SRCDIR)/gtk/*.c $(SRCDIR)/gtk/*.cpp $(SRCDIR)/win/*.c $(SRCDIR)/win/*.cpp $(SRCDIR)/os2/*.c  $(SRCDIR)/win/*.txt $(SRCDIR)/os2/*.txt \