autofoo: Deal a bit more consistently with C[PP]FLAGS and LDADD
This commit is contained in:
parent
672f787eaf
commit
750a973b5e
|
@ -4,12 +4,11 @@ EXTRA_DIST = README
|
||||||
|
|
||||||
bin_PROGRAMS = edox
|
bin_PROGRAMS = edox
|
||||||
|
|
||||||
|
AM_CPPFLAGS = -I$(top_builddir) $(IMLIB2_CFLAGS) $(X_CFLAGS) \
|
||||||
|
-D ENLIGHTENMENT_ROOT=\"$(pkgdatadir)\"
|
||||||
|
|
||||||
|
AM_CFLAGS = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
|
||||||
|
|
||||||
edox_SOURCES = dox.c dox.h file.c format.c text.c ttfont.c
|
edox_SOURCES = dox.c dox.h file.c format.c text.c ttfont.c
|
||||||
|
|
||||||
edox_CPPFLAGS = -I$(top_builddir) $(IMLIB2_CFLAGS) $(X_CFLAGS) \
|
edox_LDADD = $(IMLIB2_LIBS) $(X_LIBS) $(XINERAMA_LIBS) -lX11 -lm
|
||||||
$(CFLAGS_WARNINGS) -D ENLIGHTENMENT_ROOT=\"$(pkgdatadir)\"
|
|
||||||
|
|
||||||
edox_CFLAGS = $(CFLAGS_ASAN)
|
|
||||||
|
|
||||||
LDADD = $(IMLIB2_LIBS) $(X_LIBS) $(XINERAMA_LIBS) -lX11 -lm
|
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
|
|
||||||
bin_PROGRAMS = eesh
|
bin_PROGRAMS = eesh
|
||||||
|
|
||||||
|
AM_CPPFLAGS = -I$(top_builddir) $(X_CFLAGS)
|
||||||
|
|
||||||
|
AM_CFLAGS = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
|
||||||
|
|
||||||
eesh_SOURCES = E.h comms.c main.c
|
eesh_SOURCES = E.h comms.c main.c
|
||||||
|
|
||||||
eesh_CPPFLAGS = -I$(top_builddir) $(X_CFLAGS) $(CFLAGS_WARNINGS)
|
eesh_LDADD = $(X_LIBS) -lX11
|
||||||
|
|
||||||
eesh_CFLAGS = $(CFLAGS_ASAN)
|
|
||||||
|
|
||||||
LDADD = $(X_LIBS) -lX11
|
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,10 @@
|
||||||
|
|
||||||
bin_PROGRAMS = epp
|
bin_PROGRAMS = epp
|
||||||
|
|
||||||
|
AM_CPPFLAGS = -I$(top_builddir)
|
||||||
|
|
||||||
|
AM_CFLAGS = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
|
||||||
|
|
||||||
epp_SOURCES = \
|
epp_SOURCES = \
|
||||||
cpplib.h \
|
cpplib.h \
|
||||||
cpphash.h \
|
cpphash.h \
|
||||||
|
@ -29,8 +33,6 @@ epp_SOURCES = \
|
||||||
cpplib.c \
|
cpplib.c \
|
||||||
cppmain.c
|
cppmain.c
|
||||||
|
|
||||||
epp_CPPFLAGS = -I$(top_builddir) $(CFLAGS_WARNINGS)
|
|
||||||
|
|
||||||
DEFS= \
|
DEFS= \
|
||||||
-DHAVE_STRERROR \
|
-DHAVE_STRERROR \
|
||||||
-DFATAL_EXIT_CODE=1 \
|
-DFATAL_EXIT_CODE=1 \
|
||||||
|
@ -49,4 +51,3 @@ DEFS= \
|
||||||
-DTARGET_CR=13 \
|
-DTARGET_CR=13 \
|
||||||
-DTARGET_TAB=9 \
|
-DTARGET_TAB=9 \
|
||||||
-DTARGET_VT=11
|
-DTARGET_VT=11
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,9 @@ libe16dir = $(pkglibdir)
|
||||||
|
|
||||||
libe16_LTLIBRARIES = $(LIB_HACK) $(LIB_TRIP)
|
libe16_LTLIBRARIES = $(LIB_HACK) $(LIB_TRIP)
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/src $(X_CFLAGS) \
|
AM_CPPFLAGS = -I$(top_srcdir)/src $(X_CFLAGS)
|
||||||
$(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY)
|
|
||||||
|
|
||||||
AM_CFLAGS = $(CFLAGS_ASAN)
|
AM_CFLAGS = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
|
||||||
|
|
||||||
if BUILD_LIBHACK
|
if BUILD_LIBHACK
|
||||||
|
|
||||||
|
|
|
@ -115,12 +115,9 @@ e16_SOURCES = \
|
||||||
$(SRCS_ECOMPMGR) \
|
$(SRCS_ECOMPMGR) \
|
||||||
$(SRCS_DBUS)
|
$(SRCS_DBUS)
|
||||||
|
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = $(CFLAGS_WARNINGS) $(CFLAGS_VISIBILITY) $(CFLAGS_ASAN)
|
||||||
$(CFLAGS_ASAN)
|
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
$(CFLAGS_WARNINGS) \
|
|
||||||
$(CFLAGS_VISIBILITY) \
|
|
||||||
-D LOCALEDIR=\"$(datadir)/locale\" \
|
-D LOCALEDIR=\"$(datadir)/locale\" \
|
||||||
-D ENLIGHTENMENT_BIN=\"$(bindir)\" \
|
-D ENLIGHTENMENT_BIN=\"$(bindir)\" \
|
||||||
-D ENLIGHTENMENT_LIB=\"$(pkglibdir)\" \
|
-D ENLIGHTENMENT_LIB=\"$(pkglibdir)\" \
|
||||||
|
@ -139,7 +136,7 @@ e16_CPPFLAGS = \
|
||||||
$(XPRESENT_CFLAGS) \
|
$(XPRESENT_CFLAGS) \
|
||||||
$(X_CFLAGS)
|
$(X_CFLAGS)
|
||||||
|
|
||||||
LDADD = \
|
e16_LDADD = \
|
||||||
$(LTLIBINTL) \
|
$(LTLIBINTL) \
|
||||||
$(LTLIBICONV) \
|
$(LTLIBICONV) \
|
||||||
$(IMLIB2_LIBS) \
|
$(IMLIB2_LIBS) \
|
||||||
|
|
Loading…
Reference in New Issue