gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-30 02:12:30 +01:00
Code Issues Projects Releases Wiki Activity

replaced CPPFLAGS with AM_CPPFLAGS in some Makefile.am's to avoid overwriting the user's CPPFLAGS environment variable

Browse Source
This commit is contained in:
dan
2004-02-25 21:26:49 +00:00
parent a018eff89d
commit 791bb6a444
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WINGs/Makefile.am
View File

@@ -107,7 +107,7 @@ libWUtil_a_SOURCES = \
wutil.c wutil.c
CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\" AM_CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG

2
WINGs/connection.c
View File

@@ -174,6 +174,8 @@ sendTimeout(void *cdata)
clearOutputQueue(cPtr); clearOutputQueue(cPtr);
cPtr->state = WCTimedOut; cPtr->state = WCTimedOut;
cPtr->timeoutState = WCTWhileSending; cPtr->timeoutState = WCTWhileSending;
// should we close it no matter what (after calling the didTimeout
// delegate)? -Dan
if (cPtr->delegate && cPtr->delegate->didTimeout) { if (cPtr->delegate && cPtr->delegate->didTimeout) {
(*cPtr->delegate->didTimeout)(cPtr->delegate, cPtr); (*cPtr->delegate->didTimeout)(cPtr->delegate, cPtr);
} else { } else {

2
WPrefs.app/Makefile.am
View File

@@ -42,7 +42,7 @@ WPrefs_SOURCES = \
imagebrowser.h \ imagebrowser.h \
xmodifier.c xmodifier.c
CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\" AM_CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@

2
src/Makefile.am
View File

@@ -104,7 +104,7 @@ wmaker_SOURCES = \
text.h text.h
CPPFLAGS = @CPPFLAGS@ $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\" AM_CPPFLAGS = @CPPFLAGS@ $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\"
INCLUDES = \ INCLUDES = \