- Clean up Makefile.am

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5136 82007160-df01-0410-b94d-b575c5fd34c7

diff --git a/src/Makefile.am b/src/Makefile.am
index bd723ca580dba4ce90f2ad9a5b5f3a86ed6b4e4c..575fa487e4bdc697604ba2ad4456e2430281403b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,45 @@
 SUBDIRS = libopm .
-
 bin_PROGRAMS = hopm
 
 AM_CPPFLAGS = -DHOPM_ETCDIR="\"$(sysconfdir)\"" -DHOPM_LOGDIR="\"$(localstatedir)\""
 AM_YFLAGS = -d
 
-hopm_SOURCES = compat.c compat.h config-parser.y config-lexer.l config.c config.h \
-    dnsbl.c dnsbl.h extern.h inet.c inet.h irc.c irc.h log.c log.h main.c match.c \
-    match.h misc.c misc.h malloc.c malloc.h list.c list.h negcache.c negcache.h \
-    opercmd.c opercmd.h options.h scan.c scan.h setup.h stats.c stats.h firedns.c \
-        firedns.h main.h
+hopm_SOURCES = compat.c        \
+               compat.h        \
+               config.c        \
+               config.h        \
+               config-lexer.l  \
+               config-parser.y \
+               dnsbl.c         \
+               dnsbl.h         \
+               extern.h        \
+               firedns.c       \
+               firedns.h       \
+               inet.c          \
+               inet.h          \
+               irc.c           \
+               irc.h           \
+               list.c          \
+               list.h          \
+               log.c           \
+               log.h           \
+               main.c          \
+               main.h          \
+               malloc.c        \
+               malloc.h        \
+               match.c         \
+               match.h         \
+               misc.c          \
+               misc.h          \
+               negcache.c      \
+               negcache.h      \
+               opercmd.c       \
+               opercmd.h       \
+               options.h       \
+               patchlevel.h    \
+               scan.c          \
+               scan.h          \
+               stats.c         \
+               stats.h
 
 hopm_LDADD = libopm/src/.libs/libopm.a @LIBOBJS@

diff --git a/src/Makefile.in b/src/Makefile.in
index 52d775babf3892dfb4174b2576f4eced6c8ae8f6..db4321ef4155b683f96fb1331ad0616969d7e94d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -82,7 +82,7 @@ bin_PROGRAMS = hopm$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(srcdir)/setup.h.in $(top_srcdir)/mkinstalldirs \
-       config-parser.h config-parser.c config-lexer.c \
+       config-lexer.c config-parser.h config-parser.c \
        $(top_srcdir)/depcomp $(top_srcdir)/ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -94,12 +94,12 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_hopm_OBJECTS = compat.$(OBJEXT) config-parser.$(OBJEXT) \
-       config-lexer.$(OBJEXT) config.$(OBJEXT) dnsbl.$(OBJEXT) \
-       inet.$(OBJEXT) irc.$(OBJEXT) log.$(OBJEXT) main.$(OBJEXT) \
-       match.$(OBJEXT) misc.$(OBJEXT) malloc.$(OBJEXT) list.$(OBJEXT) \
-       negcache.$(OBJEXT) opercmd.$(OBJEXT) scan.$(OBJEXT) \
-       stats.$(OBJEXT) firedns.$(OBJEXT)
+am_hopm_OBJECTS = compat.$(OBJEXT) config.$(OBJEXT) \
+       config-lexer.$(OBJEXT) config-parser.$(OBJEXT) dnsbl.$(OBJEXT) \
+       firedns.$(OBJEXT) inet.$(OBJEXT) irc.$(OBJEXT) list.$(OBJEXT) \
+       log.$(OBJEXT) main.$(OBJEXT) malloc.$(OBJEXT) match.$(OBJEXT) \
+       misc.$(OBJEXT) negcache.$(OBJEXT) opercmd.$(OBJEXT) \
+       scan.$(OBJEXT) stats.$(OBJEXT)
 hopm_OBJECTS = $(am_hopm_OBJECTS)
 hopm_DEPENDENCIES = libopm/src/.libs/libopm.a @LIBOBJS@
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -353,11 +353,43 @@ top_srcdir = @top_srcdir@
 SUBDIRS = libopm .
 AM_CPPFLAGS = -DHOPM_ETCDIR="\"$(sysconfdir)\"" -DHOPM_LOGDIR="\"$(localstatedir)\""
 AM_YFLAGS = -d
-hopm_SOURCES = compat.c compat.h config-parser.y config-lexer.l config.c config.h \
-    dnsbl.c dnsbl.h extern.h inet.c inet.h irc.c irc.h log.c log.h main.c match.c \
-    match.h misc.c misc.h malloc.c malloc.h list.c list.h negcache.c negcache.h \
-    opercmd.c opercmd.h options.h scan.c scan.h setup.h stats.c stats.h firedns.c \
-        firedns.h main.h
+hopm_SOURCES = compat.c        \
+               compat.h        \
+               config.c        \
+               config.h        \
+               config-lexer.l  \
+               config-parser.y \
+               dnsbl.c         \
+               dnsbl.h         \
+               extern.h        \
+               firedns.c       \
+               firedns.h       \
+               inet.c          \
+               inet.h          \
+               irc.c           \
+               irc.h           \
+               list.c          \
+               list.h          \
+               log.c           \
+               log.h           \
+               main.c          \
+               main.h          \
+               malloc.c        \
+               malloc.h        \
+               match.c         \
+               match.h         \
+               misc.c          \
+               misc.h          \
+               negcache.c      \
+               negcache.h      \
+               opercmd.c       \
+               opercmd.h       \
+               options.h       \
+               patchlevel.h    \
+               scan.c          \
+               scan.h          \
+               stats.c         \
+               stats.h
 
 hopm_LDADD = libopm/src/.libs/libopm.a @LIBOBJS@
 all: setup.h

diff --git a/src/libopm/src/Makefile.am b/src/libopm/src/Makefile.am
index 14b1d6469565e9bb5c1f982a884910cbdb7678d8..16a7921ec0a74567fde9d7ab405229ec419917dd 100644 (file)
--- a/src/libopm/src/Makefile.am
+++ b/src/libopm/src/Makefile.am
@@ -1,8 +1,23 @@
 lib_LTLIBRARIES = libopm.la
 
-libopm_la_SOURCES = compat.c compat.h config.c config.h inet.c inet.h \
-    libopm.c libopm.h list.c list.h malloc.c malloc.h opm_common.h \
-    opm_error.h opm.h opm_types.h proxy.c proxy.h setup.h
+libopm_la_SOURCES = compat.c     \
+                    compat.h     \
+                    config.c     \
+                    config.h     \
+                    inet.c       \
+                    inet.h       \
+                    libopm.c     \
+                    libopm.h     \
+                    list.c       \
+                    list.h       \
+                    malloc.c     \
+                    malloc.h     \
+                    opm_common.h \
+                    opm_error.h  \
+                    opm.h        \
+                    opm_types.h  \
+                    proxy.c      \
+                    proxy.h
 
 libopm_la_LIBADD = @LTLIBOBJS@
 

diff --git a/src/libopm/src/Makefile.in b/src/libopm/src/Makefile.in
index c10c603d6125a9b8285fd17ddea21586fd57bf68..8dbc956ac4339a1816c0665ea796eb0899f053d4 100644 (file)
--- a/src/libopm/src/Makefile.in
+++ b/src/libopm/src/Makefile.in
@@ -319,9 +319,24 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 lib_LTLIBRARIES = libopm.la
-libopm_la_SOURCES = compat.c compat.h config.c config.h inet.c inet.h \
-    libopm.c libopm.h list.c list.h malloc.c malloc.h opm_common.h \
-    opm_error.h opm.h opm_types.h proxy.c proxy.h setup.h
+libopm_la_SOURCES = compat.c     \
+                    compat.h     \
+                    config.c     \
+                    config.h     \
+                    inet.c       \
+                    inet.h       \
+                    libopm.c     \
+                    libopm.h     \
+                    list.c       \
+                    list.h       \
+                    malloc.c     \
+                    malloc.h     \
+                    opm_common.h \
+                    opm_error.h  \
+                    opm.h        \
+                    opm_types.h  \
+                    proxy.c      \
+                    proxy.h
 
 libopm_la_LIBADD = @LTLIBOBJS@
 test_SOURCES = test.c