[GRASS-SVN] r62432 - in grass/trunk/lib: cairodriver htmldriver pngdriver psdriver

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-10-28 06:17:40 -0700 (Tue, 28 Oct 2014)
New Revision: 62432

Added:
   grass/trunk/lib/cairodriver/Makefile
   grass/trunk/lib/htmldriver/Makefile
   grass/trunk/lib/pngdriver/Makefile
   grass/trunk/lib/psdriver/Makefile
Removed:
   grass/trunk/lib/cairodriver/makefile
   grass/trunk/lib/htmldriver/makefile
   grass/trunk/lib/pngdriver/makefile
   grass/trunk/lib/psdriver/makefile
Log:
fix r62431, revert renaming for Makefiles


Copied: grass/trunk/lib/cairodriver/Makefile (from rev 62431, grass/trunk/lib/cairodriver/makefile)
===================================================================
--- grass/trunk/lib/cairodriver/Makefile	                        (rev 0)
+++ grass/trunk/lib/cairodriver/Makefile	2014-10-28 13:17:40 UTC (rev 62432)
@@ -0,0 +1,18 @@
+MODULE_TOPDIR = ../..
+
+EXTRA_CFLAGS=-I../driver $(CAIROINC) $(FTINC)
+
+# added constant to /include/Make/Grass.make.in
+LIB = CAIRODRIVER
+PGM = cairodriver
+
+include $(MODULE_TOPDIR)/include/Make/Lib.make
+
+ifneq ($(USE_X11),)
+EXTRA_CFLAGS += $(XCFLAGS) -DUSE_X11=1
+endif
+
+ifneq ($(USE_CAIRO),)
+default: lib
+endif
+

Deleted: grass/trunk/lib/cairodriver/makefile
===================================================================
--- grass/trunk/lib/cairodriver/makefile	2014-10-28 13:15:16 UTC (rev 62431)
+++ grass/trunk/lib/cairodriver/makefile	2014-10-28 13:17:40 UTC (rev 62432)
@@ -1,18 +0,0 @@
-MODULE_TOPDIR = ../..
-
-EXTRA_CFLAGS=-I../driver $(CAIROINC) $(FTINC)
-
-# added constant to /include/Make/Grass.make.in
-LIB = CAIRODRIVER
-PGM = cairodriver
-
-include $(MODULE_TOPDIR)/include/Make/Lib.make
-
-ifneq ($(USE_X11),)
-EXTRA_CFLAGS += $(XCFLAGS) -DUSE_X11=1
-endif
-
-ifneq ($(USE_CAIRO),)
-default: lib
-endif
-

Copied: grass/trunk/lib/htmldriver/Makefile (from rev 62431, grass/trunk/lib/htmldriver/makefile)
===================================================================
--- grass/trunk/lib/htmldriver/Makefile	                        (rev 0)
+++ grass/trunk/lib/htmldriver/Makefile	2014-10-28 13:17:40 UTC (rev 62432)
@@ -0,0 +1,10 @@
+MODULE_TOPDIR = ../..
+
+EXTRA_CFLAGS=-I../driver
+
+LIB = HTMLDRIVER
+PGM = htmldriver
+
+include $(MODULE_TOPDIR)/include/Make/Lib.make
+
+default: lib

Deleted: grass/trunk/lib/htmldriver/makefile
===================================================================
--- grass/trunk/lib/htmldriver/makefile	2014-10-28 13:15:16 UTC (rev 62431)
+++ grass/trunk/lib/htmldriver/makefile	2014-10-28 13:17:40 UTC (rev 62432)
@@ -1,10 +0,0 @@
-MODULE_TOPDIR = ../..
-
-EXTRA_CFLAGS=-I../driver
-
-LIB = HTMLDRIVER
-PGM = htmldriver
-
-include $(MODULE_TOPDIR)/include/Make/Lib.make
-
-default: lib

Copied: grass/trunk/lib/pngdriver/Makefile (from rev 62431, grass/trunk/lib/pngdriver/makefile)
===================================================================
--- grass/trunk/lib/pngdriver/Makefile	                        (rev 0)
+++ grass/trunk/lib/pngdriver/Makefile	2014-10-28 13:17:40 UTC (rev 62432)
@@ -0,0 +1,18 @@
+MODULE_TOPDIR = ../..
+
+include $(MODULE_TOPDIR)/include/Make/Vars.make
+
+ifeq ($(USE_PNG),)
+  MOD_OBJS := $(filter-out read_png.o write_png.o,$(AUTO_OBJS))
+endif
+
+LIB = PNGDRIVER
+PGM = pngdriver
+include $(MODULE_TOPDIR)/include/Make/Lib.make
+include $(MODULE_TOPDIR)/include/Make/Doxygen.make
+
+EXTRA_CFLAGS=$(ZLIBINCPATH) $(PNGINC) -I../driver
+
+default: lib
+
+DOXNAME = pngdriver

Deleted: grass/trunk/lib/pngdriver/makefile
===================================================================
--- grass/trunk/lib/pngdriver/makefile	2014-10-28 13:15:16 UTC (rev 62431)
+++ grass/trunk/lib/pngdriver/makefile	2014-10-28 13:17:40 UTC (rev 62432)
@@ -1,18 +0,0 @@
-MODULE_TOPDIR = ../..
-
-include $(MODULE_TOPDIR)/include/Make/Vars.make
-
-ifeq ($(USE_PNG),)
-  MOD_OBJS := $(filter-out read_png.o write_png.o,$(AUTO_OBJS))
-endif
-
-LIB = PNGDRIVER
-PGM = pngdriver
-include $(MODULE_TOPDIR)/include/Make/Lib.make
-include $(MODULE_TOPDIR)/include/Make/Doxygen.make
-
-EXTRA_CFLAGS=$(ZLIBINCPATH) $(PNGINC) -I../driver
-
-default: lib
-
-DOXNAME = pngdriver

Copied: grass/trunk/lib/psdriver/Makefile (from rev 62431, grass/trunk/lib/psdriver/makefile)
===================================================================
--- grass/trunk/lib/psdriver/Makefile	                        (rev 0)
+++ grass/trunk/lib/psdriver/Makefile	2014-10-28 13:17:40 UTC (rev 62432)
@@ -0,0 +1,16 @@
+MODULE_TOPDIR = ../..
+
+EXTRA_CFLAGS = -I../driver
+
+LIB = PSDRIVER
+PGM = psdriver
+
+include $(MODULE_TOPDIR)/include/Make/Lib.make
+include $(MODULE_TOPDIR)/include/Make/Doxygen.make
+
+default: lib $(ETC)/psdriver.ps
+
+$(ETC)/psdriver.ps: psdriver.ps
+	$(INSTALL_DATA) $< $@
+
+DOXNAME = psdriver

Deleted: grass/trunk/lib/psdriver/makefile
===================================================================
--- grass/trunk/lib/psdriver/makefile	2014-10-28 13:15:16 UTC (rev 62431)
+++ grass/trunk/lib/psdriver/makefile	2014-10-28 13:17:40 UTC (rev 62432)
@@ -1,16 +0,0 @@
-MODULE_TOPDIR = ../..
-
-EXTRA_CFLAGS = -I../driver
-
-LIB = PSDRIVER
-PGM = psdriver
-
-include $(MODULE_TOPDIR)/include/Make/Lib.make
-include $(MODULE_TOPDIR)/include/Make/Doxygen.make
-
-default: lib $(ETC)/psdriver.ps
-
-$(ETC)/psdriver.ps: psdriver.ps
-	$(INSTALL_DATA) $< $@
-
-DOXNAME = psdriver