[myserver-commit] [2866] Don't use the `MYSERVER_HEADERS' configure time variable.

[Giuseppe Scrivano]

Revision: 2866
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2866
Author:   gscrivano
Date:     2008-10-04 20:57:12 +0000 (Sat, 04 Oct 2008)

Log Message:
-----------
Don't use the `MYSERVER_HEADERS' configure time variable.

Modified Paths:
--------------
    trunk/myserver/binaries/plugins/Makefile.am
    trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am
    trunk/myserver/binaries/web/cgi-src/post/Makefile.am

Modified: trunk/myserver/binaries/plugins/Makefile.am
===================================================================
--- trunk/myserver/binaries/plugins/Makefile.am 2008-10-04 20:35:08 UTC (rev 
2865)
+++ trunk/myserver/binaries/plugins/Makefile.am 2008-10-04 20:57:12 UTC (rev 
2866)
@@ -1,21 +1 @@
 all:
-       @echo "CXX=$(CXX)" > modules.template
-       @echo "CFLAGS=$(CFLAGS)" >> modules.template
-       @echo "CXXFLAGS=$(CXXFLAGS)" >> modules.template
-       @echo "LDFLAGS=$(LDFLAGS)" >> modules.template
-       @echo "XML_CFLAGS=$(XML_CFLAGS)" >> modules.template
-       @echo "PTHREAD_LIB=$(PTHREAD_LIB)" >> modules.template
-       @echo "AM_CPPFLAGS=$(AM_CPPFLAGS)" >> modules.template
-       @echo "CPPFLAGS=$(CPPFLAGS)" >> modules.template
-       @echo "AM_CXXFLAGS=$(AM_CXXFLAGS)" >> modules.template
-       @echo "IDN_LIB=$(IDN_LIB)" >> modules.template
-       @echo "XNET_LIB=$(XNET_LIB)" >> modules.template
-       @echo "DL_LIB=$(DL_LIB)" >> modules.template
-       @echo "OPENSSL_LIB=$(OPENSSL_LIB)" >> modules.template
-       @echo "ZLIB_LIB=$(ZLIB_LIB)" >> modules.template
-       @echo "XML_LIBS=$(XML_LIBS)" >> modules.template
-       @echo "LIBPNG_LIBS=$(LIBPNG_LIBS)" >> modules.template
-       @echo "LIBPNG_CFLAGS=$(LIBPNG_CFLAGS)" >> modules.template
-       @echo "MYSERVER_HEADERS=$(MYSERVER_HEADERS)" >> modules.template
-
-

Modified: trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am
===================================================================
--- trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am    2008-10-04 
20:35:08 UTC (rev 2865)
+++ trunk/myserver/binaries/web/cgi-src/math_sum/Makefile.am    2008-10-04 
20:57:12 UTC (rev 2866)
@@ -2,8 +2,6 @@
 lib_LIBRARIES = libmath_sum.a
 libmath_sum_a_SOURCES = math_sum.cpp
 
-libmath_sum_a_CXXFLAGS = $(CXXFLAGS) $(XML_CFLAGS) -I$(MYSERVER_HEADERS)
-
 all : all-am math_sum.mscgi
        cp math_sum.mscgi ../../cgi-bin/
 
@@ -11,7 +9,7 @@
 
 math_sum.mscgi : $(libmath_sum_a_OBJECTS) $(libmath_sum_a_DEPENDENCIES)
        -rm -f math_sum.mscgi
-       $(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a 
$(libmath_sum_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o math_sum.mscgi 
-shared
+       $(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a 
$(libmath_sum_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o math_sum.mscgi 
-shared $(CXXFLAGS) $(XML_CFLAGS)
 
 install : math_sum.mscgi
        $(INSTALL) -D 'math_sum.mscgi' 
'$(root_prefix)/var/web/cgi-bin/math_sum.mscgi'

Modified: trunk/myserver/binaries/web/cgi-src/post/Makefile.am
===================================================================
--- trunk/myserver/binaries/web/cgi-src/post/Makefile.am        2008-10-04 
20:35:08 UTC (rev 2865)
+++ trunk/myserver/binaries/web/cgi-src/post/Makefile.am        2008-10-04 
20:57:12 UTC (rev 2866)
@@ -2,8 +2,6 @@
 lib_LIBRARIES = libpost.a
 libpost_a_SOURCES = post.cpp
 
-libpost_a_CXXFLAGS = $(CXXFLAGS) $(XML_CFLAGS) -I$(MYSERVER_HEADERS)
-
 all : all-am post.mscgi
        cp post.mscgi ../../cgi-bin/
 
@@ -12,7 +10,7 @@
 
 post.mscgi : $(libpost_a_OBJECTS) $(libpost_a_DEPENDENCIES)
        -rm -f post.mscgi
-       $(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a 
$(libpost_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o post.mscgi 
-shared
+       $(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a 
$(libpost_a_LIBADD)  $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) 
$(DL_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS) -o post.mscgi 
-shared $(CXXFLAGS) $(XML_CFLAGS)
 
 install : post.mscgi
        $(INSTALL) -D 'post.mscgi' '$(root_prefix)/var/web/cgi-bin/post.mscgi'